From aa68d8e9769b1f0dd189ee887015ba6055f71074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
Date: Fri, 10 Jan 2020 13:46:28 +0100
Subject: [PATCH] cleanup

---
 Zip/testsuite/src/CompressTest.cpp |  3 ++-
 Zip/testsuite/src/ZipTest.cpp      | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Zip/testsuite/src/CompressTest.cpp b/Zip/testsuite/src/CompressTest.cpp
index eff1791db..cb4439d45 100644
--- a/Zip/testsuite/src/CompressTest.cpp
+++ b/Zip/testsuite/src/CompressTest.cpp
@@ -156,7 +156,8 @@ void CompressTest::createDataFile(const std::string& path, Poco::UInt64 size)
 
 void CompressTest::testZip64()
 {
-	typedef std::map<std::string, Poco::UInt64> FileMap;
+	using FileMap = std::map<std::string, Poco::UInt64>;
+
 	std::cout << std::endl;
 	FileMap files;
 	files["data1.bin"] = static_cast<Poco::UInt64>(KB)*4096+1;
diff --git a/Zip/testsuite/src/ZipTest.cpp b/Zip/testsuite/src/ZipTest.cpp
index 96b464abe..e16f3da15 100644
--- a/Zip/testsuite/src/ZipTest.cpp
+++ b/Zip/testsuite/src/ZipTest.cpp
@@ -131,9 +131,9 @@ void ZipTest::testCrcAndSizeAfterData()
 	Poco::FileInputStream inp(testFile);
 	assertTrue (inp.good());
 	Decompress dec(inp, Poco::Path::temp());
-	dec.EError += Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
+	dec.EError += Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string>>(this, &ZipTest::onDecompressError);
 	dec.decompressAllFiles();
-	dec.EError -= Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
+	dec.EError -= Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string>>(this, &ZipTest::onDecompressError);
 	assertTrue (_errCnt == 0);
 	assertTrue (!dec.mapping().empty());
 }
@@ -192,9 +192,9 @@ void ZipTest::testDecompress()
 	Poco::FileInputStream inp(testFile);
 	assertTrue (inp.good());
 	Decompress dec(inp, Poco::Path::temp());
-	dec.EError += Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
+	dec.EError += Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string>>(this, &ZipTest::onDecompressError);
 	dec.decompressAllFiles();
-	dec.EError -= Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
+	dec.EError -= Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string>>(this, &ZipTest::onDecompressError);
 	assertTrue (_errCnt == 0);
 	assertTrue (!dec.mapping().empty());
 }
@@ -206,9 +206,9 @@ void ZipTest::testDecompressFlat()
 	Poco::FileInputStream inp(testFile);
 	assertTrue (inp.good());
 	Decompress dec(inp, Poco::Path::temp(), true);
-	dec.EError += Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
+	dec.EError += Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string>>(this, &ZipTest::onDecompressError);
 	dec.decompressAllFiles();
-	dec.EError -= Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
+	dec.EError -= Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string>>(this, &ZipTest::onDecompressError);
 	assertTrue (_errCnt == 0);
 	assertTrue (!dec.mapping().empty());
 }
@@ -220,9 +220,9 @@ void ZipTest::testDecompressVuln()
 	Poco::FileInputStream inp(testFile);
 	assertTrue (inp.good());
 	Decompress dec(inp, Poco::Path::temp());
-	dec.EError += Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
+	dec.EError += Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string>>(this, &ZipTest::onDecompressError);
 	dec.decompressAllFiles();
-	dec.EError -= Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
+	dec.EError -= Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string>>(this, &ZipTest::onDecompressError);
 	assertTrue (_errCnt == 1);
 	assertTrue (dec.mapping().empty());
 }
@@ -234,9 +234,9 @@ void ZipTest::testDecompressFlatVuln()
 	Poco::FileInputStream inp(testFile);
 	assertTrue (inp.good());
 	Decompress dec(inp, Poco::Path::temp(), true);
-	dec.EError += Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
+	dec.EError += Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string>>(this, &ZipTest::onDecompressError);
 	dec.decompressAllFiles();
-	dec.EError -= Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string> >(this, &ZipTest::onDecompressError);
+	dec.EError -= Poco::Delegate<ZipTest, std::pair<const Poco::Zip::ZipLocalFileHeader, const std::string>>(this, &ZipTest::onDecompressError);
 	assertTrue (_errCnt == 0);
 	assertTrue (!dec.mapping().empty());
 }