Fix warnings reported by -Wshadow=local (fixes #431)

2 files changed, 29 insertions, 41 deletions

diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc
index 02a95c73..b685d2e5 100644
--- a/qpdf/qpdf.cc
+++ b/qpdf/qpdf.cc
@@ -3610,13 +3610,10 @@ static void do_show_pages(QPDF& pdf, Options& o)
             if (! images.empty())
             {
                 std::cout << "  images:" << std::endl;
-                for (std::map<std::string,
-                         QPDFObjectHandle>::iterator
-                         iter = images.begin();
-                     iter != images.end(); ++iter)
+                for (auto const& iter2: images)
                 {
-                    std::string const& name = (*iter).first;
-                    QPDFObjectHandle image = (*iter).second;
+                    std::string const& name = iter2.first;
+                    QPDFObjectHandle image = iter2.second;
                     QPDFObjectHandle dict = image.getDict();
                     int width =
                         dict.getKey("/Width").getIntValueAsInt();
@@ -3633,11 +3630,9 @@ static void do_show_pages(QPDF& pdf, Options& o)
         std::cout << "  content:" << std::endl;
         std::vector<QPDFObjectHandle> content =
             ph.getPageContents();
-        for (std::vector<QPDFObjectHandle>::iterator iter =
-                 content.begin();
-             iter != content.end(); ++iter)
+        for (auto& iter2: content)
         {
-            std::cout << "    " << (*iter).unparse() << std::endl;
+            std::cout << "    " << iter2.unparse() << std::endl;
         }
     }
 }
@@ -3738,14 +3733,12 @@ static void do_json_pages(QPDF& pdf, Options& o, JSON& j)
             "images", JSON::makeArray());
         std::map<std::string, QPDFObjectHandle> images =
             ph.getPageImages();
-        for (std::map<std::string, QPDFObjectHandle>::iterator iter =
-                 images.begin();
-             iter != images.end(); ++iter)
+        for (auto const& iter2: images)
         {
             JSON j_image = j_images.addArrayElement(JSON::makeDictionary());
             j_image.addDictionaryMember(
-                "name", JSON::makeString((*iter).first));
-            QPDFObjectHandle image = (*iter).second;
+                "name", JSON::makeString(iter2.first));
+            QPDFObjectHandle image = iter2.second;
             QPDFObjectHandle dict = image.getDict();
             j_image.addDictionaryMember("object", image.getJSON());
             j_image.addDictionaryMember(
@@ -3783,10 +3776,9 @@ static void do_json_pages(QPDF& pdf, Options& o, JSON& j)
         JSON j_contents = j_page.addDictionaryMember(
             "contents", JSON::makeArray());
         std::vector<QPDFObjectHandle> content = ph.getPageContents();
-        for (std::vector<QPDFObjectHandle>::iterator iter = content.begin();
-             iter != content.end(); ++iter)
+        for (auto& iter2: content)
         {
-            j_contents.addArrayElement((*iter).getJSON());
+            j_contents.addArrayElement(iter2.getJSON());
         }
         j_page.addDictionaryMember(
             "label", pldh.getLabelForPage(pageno).getJSON());
@@ -4761,12 +4753,10 @@ static void handle_transformations(QPDF& pdf, Options& o)
             QPDFObjectHandle page = ph.getObjectHandle();
             std::map<std::string, QPDFObjectHandle> images =
                 ph.getPageImages();
-            for (std::map<std::string, QPDFObjectHandle>::iterator iter =
-                     images.begin();
-                 iter != images.end(); ++iter)
+            for (auto& iter2: images)
             {
-                std::string name = (*iter).first;
-                QPDFObjectHandle& image = (*iter).second;
+                std::string name = iter2.first;
+                QPDFObjectHandle& image = iter2.second;
                 ImageOptimizer* io = new ImageOptimizer(o, image);
                 PointerHolder<QPDFObjectHandle::StreamDataProvider> sdp(io);
                 if (io->evaluate("image " + name + " on page " +
diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc
index 74aa7c26..07445dea 100644
--- a/qpdf/test_driver.cc
+++ b/qpdf/test_driver.cc
@@ -347,10 +347,10 @@ void runtest(int n, char const* filename1, char const* arg2)
 	else if (qtest.isArray())
 	{
 	    QTC::TC("qpdf", "main QTest array");
-	    int n = qtest.getArrayNItems();
+	    int nitems = qtest.getArrayNItems();
 	    std::cout << "/QTest is an array with "
-		      << n << " items" << std::endl;
-	    for (int i = 0; i < n; ++i)
+		      << nitems << " items" << std::endl;
+	    for (int i = 0; i < nitems; ++i)
 	    {
 		QTC::TC("qpdf", "main QTest array indirect",
 			qtest.getArrayItem(i).isIndirect() ? 1 : 0);
@@ -510,11 +510,10 @@ void runtest(int n, char const* filename1, char const* arg2)
 	    std::cout << "  images:" << std::endl;
 	    std::map<std::string, QPDFObjectHandle> images =
 		page.getPageImages();
-	    for (std::map<std::string, QPDFObjectHandle>::iterator iter =
-		     images.begin(); iter != images.end(); ++iter)
+	    for (auto const& iter2: images)
 	    {
-		std::string const& name = (*iter).first;
-		QPDFObjectHandle image = (*iter).second;
+		std::string const& name = iter2.first;
+		QPDFObjectHandle image = iter2.second;
 		QPDFObjectHandle dict = image.getDict();
 		long long width = dict.getKey("/Width").getIntValue();
 		long long height = dict.getKey("/Height").getIntValue();
@@ -525,10 +524,9 @@ void runtest(int n, char const* filename1, char const* arg2)
 
 	    std::cout << "  content:" << std::endl;
 	    std::vector<QPDFObjectHandle> content = page.getPageContents();
-	    for (std::vector<QPDFObjectHandle>::iterator iter = content.begin();
-		 iter != content.end(); ++iter)
+	    for (auto& iter2: content)
 	    {
-		std::cout << "    " << (*iter).unparse() << std::endl;
+		std::cout << "    " << iter2.unparse() << std::endl;
 	    }
 
 	    std::cout << "end page " << pageno << std::endl;
@@ -539,8 +537,8 @@ void runtest(int n, char const* filename1, char const* arg2)
 	if (qstrings.isArray())
 	{
 	    std::cout << "QStrings:" << std::endl;
-	    int n = qstrings.getArrayNItems();
-	    for (int i = 0; i < n; ++i)
+	    int nitems = qstrings.getArrayNItems();
+	    for (int i = 0; i < nitems; ++i)
 	    {
 		std::cout << qstrings.getArrayItem(i).getUTF8Value()
 			  << std::endl;
@@ -551,8 +549,8 @@ void runtest(int n, char const* filename1, char const* arg2)
 	if (qnumbers.isArray())
 	{
 	    std::cout << "QNumbers:" << std::endl;
-	    int n = qnumbers.getArrayNItems();
-	    for (int i = 0; i < n; ++i)
+	    int nitems = qnumbers.getArrayNItems();
+	    for (int i = 0; i < nitems; ++i)
 	    {
 		std::cout << QUtil::double_to_string(
 		    qnumbers.getArrayItem(i).getNumericValue(), 3)
@@ -1853,8 +1851,8 @@ void runtest(int n, char const* filename1, char const* arg2)
         // button-set*.pdf are designed for this test case.
         QPDFObjectHandle acroform = pdf.getRoot().getKey("/AcroForm");
         QPDFObjectHandle fields = acroform.getKey("/Fields");
-        int n = fields.getArrayNItems();
-        for (int i = 0; i < n; ++i)
+        int nitems = fields.getArrayNItems();
+        for (int i = 0; i < nitems; ++i)
         {
             QPDFObjectHandle field = fields.getArrayItem(i);
             QPDFObjectHandle T = field.getKey("/T");
@@ -1900,8 +1898,8 @@ void runtest(int n, char const* filename1, char const* arg2)
         // generating testing.
         QPDFObjectHandle acroform = pdf.getRoot().getKey("/AcroForm");
         QPDFObjectHandle fields = acroform.getKey("/Fields");
-        int n = fields.getArrayNItems();
-        for (int i = 0; i < n; ++i)
+        int nitems = fields.getArrayNItems();
+        for (int i = 0; i < nitems; ++i)
         {
             QPDFObjectHandle field = fields.getArrayItem(i);
             QPDFObjectHandle T = field.getKey("/T");