From 92d3cbecd4ea375d8de95bffc0fe8651c698f568 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Thu, 16 Apr 2020 11:43:37 -0400
Subject: Fix warnings reported by -Wshadow=local (fixes #431)

---
 libqpdf/QPDFPageObjectHelper.cc | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'libqpdf/QPDFPageObjectHelper.cc')

diff --git a/libqpdf/QPDFPageObjectHelper.cc b/libqpdf/QPDFPageObjectHelper.cc
index 8e0aac06..b7da816e 100644
--- a/libqpdf/QPDFPageObjectHelper.cc
+++ b/libqpdf/QPDFPageObjectHelper.cc
@@ -76,10 +76,8 @@ InlineImageTracker::convertIIDict(QPDFObjectHandle odict)
     dict.replaceKey("/Type", QPDFObjectHandle::newName("/XObject"));
     dict.replaceKey("/Subtype", QPDFObjectHandle::newName("/Image"));
     std::set<std::string> keys = odict.getKeys();
-    for (std::set<std::string>::iterator iter = keys.begin();
-         iter != keys.end(); ++iter)
+    for (auto key: keys)
     {
-        std::string key = *iter;
         QPDFObjectHandle value = odict.getKey(key);
         if (key == "/BPC")
         {
@@ -176,14 +174,12 @@ InlineImageTracker::convertIIDict(QPDFObjectHandle odict)
             {
                 filters = value.getArrayAsVector();
             }
-            for (std::vector<QPDFObjectHandle>::iterator iter =
-                     filters.begin();
-                 iter != filters.end(); ++iter)
+            for (auto& iter: filters)
             {
                 std::string name;
-                if ((*iter).isName())
+                if (iter.isName())
                 {
-                    name = (*iter).getName();
+                    name = iter.getName();
                 }
                 if (name == "/AHx")
                 {
@@ -219,7 +215,7 @@ InlineImageTracker::convertIIDict(QPDFObjectHandle odict)
                 }
                 if (! name.empty())
                 {
-                    *iter = QPDFObjectHandle::newName(name);
+                    iter = QPDFObjectHandle::newName(name);
                 }
             }
             if (value.isName() && (filters.size() == 1))
-- 
cgit v1.2.3-54-g00ecf