Merge pull request #3323 from tautschnig/vs-xml

Rename parameter hiding class member [blocks: #2310]

Author: Daniel Kroening

src/util/xml.cpp

@@ -150,23 +150,23 @@ void xmlt::do_indent(std::ostream &out, unsigned indent)
   out << std::string(indent, ' ');
 }
 
-xmlt::elementst::const_iterator xmlt::find(const std::string &name) const
+xmlt::elementst::const_iterator xmlt::find(const std::string &key) const
 {
   for(elementst::const_iterator it=elements.begin();
       it!=elements.end();
       it++)
-    if(it->name==name)
+    if(it->name == key)
       return it;
 
   return elements.end();
 }
 
-xmlt::elementst::iterator xmlt::find(const std::string &name)
+xmlt::elementst::iterator xmlt::find(const std::string &key)
 {
   for(elementst::iterator it=elements.begin();
       it!=elements.end();
       it++)
-    if(it->name==name)
+    if(it->name == key)
       return it;
 
   return elements.end();

src/util/xml.h

@@ -32,8 +32,8 @@ class xmlt
   attributest attributes;
   elementst elements;
 
-  elementst::const_iterator find(const std::string &name) const;
-  elementst::iterator find(const std::string &name);
+  elementst::const_iterator find(const std::string &key) const;
+  elementst::iterator find(const std::string &key);
 
   void set_attribute(
     const std::string &attribute,
@@ -83,10 +83,10 @@ class xmlt
     return "";
   }
 
-  xmlt &new_element(const std::string &name)
+  xmlt &new_element(const std::string &key)
   {
     elements.push_back(xmlt());
-    elements.back().name=name;
+    elements.back().name = key;
     return elements.back();
   }