commit 6c16dacc28d975cf3f78ac6b34612f1900c43e74
author Albert Astals Cid <aacid@kde.org> Fri Mar 29 17:44:12 2019 +0100
committer Albert Astals Cid <aacid@kde.org> Wed Jun 05 20:48:05 2019 +0200
tree 98c45029421d3fd475081a2c855cd00ee36351e0
parent 42b417547e963d150e1e786e2fa503130ff72184

StructElement::parseAttributes: Fix shadow warning

poppler/StructElement.cc

diff --git a/poppler/StructElement.cc b/poppler/StructElement.cc
index ccfa468..19bac49 100644
--- a/poppler/StructElement.cc
+++ b/poppler/StructElement.cc
@@ -1297,13 +1297,13 @@
       for (int i = 0; i < attributes->getLength(); i++) {
         const char *key = attributes->getKey(i);
         if (strcmp(key, "O") != 0) {
-          Attribute::Type type = Attribute::getTypeForName(key, this);
+          Attribute::Type t = Attribute::getTypeForName(key, this);
 
           // Check if the attribute is already defined.
           if (keepExisting) {
             bool exists = false;
             for (unsigned j = 0; j < getNumAttributes(); j++) {
-              if (getAttribute(j)->getType() == type) {
+              if (getAttribute(j)->getType() == t) {
                 exists = true;
                 break;
               }
@@ -1312,10 +1312,10 @@
               continue;
           }
 
-          if (type != Attribute::Unknown) {
+          if (t != Attribute::Unknown) {
             Object value = attributes->getVal(i);
             bool typeCheckOk = true;
-            Attribute *attribute = new Attribute(type, &value);
+            Attribute *attribute = new Attribute(t, &value);
 
             if (attribute->isOk() && (typeCheckOk = attribute->checkType(this))) {
               appendAttribute(attribute);