C++11: More use of auto.

murraycu · murraycu · commit 9618504f2cbd · 2015-07-20T11:00:08.000+02:00
diff --git a/libxml++/document.cc b/libxml++/document.cc
@@ -41,7 +41,7 @@ void find_wrappers(xmlNode* node, NodeMap& node_map)
   if (node->type != XML_ENTITY_REF_NODE)
   {
     // Walk the children list.
-    for (xmlNode* child = node->children; child; child = child->next)
+    for (auto child = node->children; child; child = child->next)
       find_wrappers(child, node_map);
   }
 
@@ -74,7 +74,7 @@ void find_wrappers(xmlNode* node, NodeMap& node_map)
   //_xmlNode::properties would be a nonsense value, leading to crashes
   //(and shown as valgrind warnings), so we return above, to avoid 
   //checking it here.
-  for (xmlAttr* attr = node->properties; attr; attr = attr->next)
+  for (auto attr = node->properties; attr; attr = attr->next)
     find_wrappers(reinterpret_cast<xmlNode*>(attr), node_map);
 }
 
@@ -88,7 +88,7 @@ void remove_found_wrappers(xmlNode* node, NodeMap& node_map)
   if (node->type != XML_ENTITY_REF_NODE)
   {
     // Walk the children list.
-    for (xmlNode* child = node->children; child; child = child->next)
+    for (auto child = node->children; child; child = child->next)
       remove_found_wrappers(child, node_map);
   }
 
@@ -126,7 +126,7 @@ void remove_found_wrappers(xmlNode* node, NodeMap& node_map)
     return;
 
   // Walk the attributes list.
-  for (xmlAttr* attr = node->properties; attr; attr = attr->next)
+  for (auto attr = node->properties; attr; attr = attr->next)
     remove_found_wrappers(reinterpret_cast<xmlNode*>(attr), node_map);
 
 }
diff --git a/libxml++/nodes/element.cc b/libxml++/nodes/element.cc
@@ -23,7 +23,7 @@ Element::~Element()
 Element::AttributeList Element::get_attributes()
 {
   AttributeList attributes;
-  for(xmlAttr* attr = cobj()->properties; attr; attr = attr->next)
+  for(auto attr = cobj()->properties; attr; attr = attr->next)
   {
     Node::create_wrapper(reinterpret_cast<xmlNode*>(attr));
     attributes.push_back(reinterpret_cast<Attribute*>(attr->_private));
@@ -120,7 +120,7 @@ void Element::remove_attribute(const Glib::ustring& name, const Glib::ustring& n
 const TextNode* Element::get_child_text() const
 {
   // FIXME: return only the first content node
-  for(xmlNode* child = cobj()->children; child; child = child->next)
+  for(auto child = cobj()->children; child; child = child->next)
      if(child->type == XML_TEXT_NODE)
      {
        Node::create_wrapper(child);
@@ -134,7 +134,7 @@ TextNode* Element::get_child_text()
 {
   // TODO: This only returns the first content node.
   // What should we do instead? Update the documentation if we change this. murrayc.
-  for(xmlNode* child = cobj()->children; child; child = child->next)
+  for(auto child = cobj()->children; child; child = child->next)
      if(child->type == XML_TEXT_NODE)
      {
        Node::create_wrapper(child);
diff --git a/libxml++/nodes/node.cc b/libxml++/nodes/node.cc
@@ -739,7 +739,7 @@ void Node::free_wrappers(xmlNode* node)
   if (node->type != XML_ENTITY_REF_NODE)
   {
     //Walk the children list.
-    for (xmlNode* child = node->children; child; child = child->next)
+    for (auto child = node->children; child; child = child->next)
       free_wrappers(child);
   }
 
@@ -772,7 +772,7 @@ void Node::free_wrappers(xmlNode* node)
   //_xmlNode::properties would be a nonsense value, leading to crashes,
   //(and shown as valgrind warnings), so we return above, to avoid 
   //checking it here.
-  for(xmlAttr* attr = node->properties; attr; attr = attr->next)
+  for(auto attr = node->properties; attr; attr = attr->next)
     free_wrappers(reinterpret_cast<xmlNode*>(attr));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void find_wrappers(xmlNode* node, NodeMap& node_map)`
`41`	`41`	`if (node->type != XML_ENTITY_REF_NODE)`
`42`	`42`	`{`
`43`	`43`	`// Walk the children list.`
`44`		`- for (xmlNode* child = node->children; child; child = child->next)`
	`44`	`+ for (auto child = node->children; child; child = child->next)`
`45`	`45`	`find_wrappers(child, node_map);`
`46`	`46`	`}`
`47`	`47`
`@@ -74,7 +74,7 @@ void find_wrappers(xmlNode* node, NodeMap& node_map)`
`74`	`74`	`//_xmlNode::properties would be a nonsense value, leading to crashes`
`75`	`75`	`//(and shown as valgrind warnings), so we return above, to avoid`
`76`	`76`	`//checking it here.`
`77`		`- for (xmlAttr* attr = node->properties; attr; attr = attr->next)`
	`77`	`+ for (auto attr = node->properties; attr; attr = attr->next)`
`78`	`78`	`find_wrappers(reinterpret_cast<xmlNode*>(attr), node_map);`
`79`	`79`	`}`
`80`	`80`
`@@ -88,7 +88,7 @@ void remove_found_wrappers(xmlNode* node, NodeMap& node_map)`
`88`	`88`	`if (node->type != XML_ENTITY_REF_NODE)`
`89`	`89`	`{`
`90`	`90`	`// Walk the children list.`
`91`		`- for (xmlNode* child = node->children; child; child = child->next)`
	`91`	`+ for (auto child = node->children; child; child = child->next)`
`92`	`92`	`remove_found_wrappers(child, node_map);`
`93`	`93`	`}`
`94`	`94`
`@@ -126,7 +126,7 @@ void remove_found_wrappers(xmlNode* node, NodeMap& node_map)`
`126`	`126`	`return;`
`127`	`127`
`128`	`128`	`// Walk the attributes list.`
`129`		`- for (xmlAttr* attr = node->properties; attr; attr = attr->next)`
	`129`	`+ for (auto attr = node->properties; attr; attr = attr->next)`
`130`	`130`	`remove_found_wrappers(reinterpret_cast<xmlNode*>(attr), node_map);`
`131`	`131`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ Element::~Element()`
`23`	`23`	`Element::AttributeList Element::get_attributes()`
`24`	`24`	`{`
`25`	`25`	`AttributeList attributes;`
`26`		`- for(xmlAttr* attr = cobj()->properties; attr; attr = attr->next)`
	`26`	`+ for(auto attr = cobj()->properties; attr; attr = attr->next)`
`27`	`27`	`{`
`28`	`28`	`Node::create_wrapper(reinterpret_cast<xmlNode*>(attr));`
`29`	`29`	`attributes.push_back(reinterpret_cast<Attribute*>(attr->_private));`
`@@ -120,7 +120,7 @@ void Element::remove_attribute(const Glib::ustring& name, const Glib::ustring& n`
`120`	`120`	`const TextNode* Element::get_child_text() const`
`121`	`121`	`{`
`122`	`122`	`// FIXME: return only the first content node`
`123`		`- for(xmlNode* child = cobj()->children; child; child = child->next)`
	`123`	`+ for(auto child = cobj()->children; child; child = child->next)`
`124`	`124`	`if(child->type == XML_TEXT_NODE)`
`125`	`125`	`{`
`126`	`126`	`Node::create_wrapper(child);`
`@@ -134,7 +134,7 @@ TextNode* Element::get_child_text()`
`134`	`134`	`{`
`135`	`135`	`// TODO: This only returns the first content node.`
`136`	`136`	`// What should we do instead? Update the documentation if we change this. murrayc.`
`137`		`- for(xmlNode* child = cobj()->children; child; child = child->next)`
	`137`	`+ for(auto child = cobj()->children; child; child = child->next)`
`138`	`138`	`if(child->type == XML_TEXT_NODE)`
`139`	`139`	`{`
`140`	`140`	`Node::create_wrapper(child);`
Original file line number	Diff line number	Diff line change
`@@ -739,7 +739,7 @@ void Node::free_wrappers(xmlNode* node)`
`739`	`739`	`if (node->type != XML_ENTITY_REF_NODE)`
`740`	`740`	`{`
`741`	`741`	`//Walk the children list.`
`742`		`- for (xmlNode* child = node->children; child; child = child->next)`
	`742`	`+ for (auto child = node->children; child; child = child->next)`
`743`	`743`	`free_wrappers(child);`
`744`	`744`	`}`
`745`	`745`
`@@ -772,7 +772,7 @@ void Node::free_wrappers(xmlNode* node)`
`772`	`772`	`//_xmlNode::properties would be a nonsense value, leading to crashes,`
`773`	`773`	`//(and shown as valgrind warnings), so we return above, to avoid`
`774`	`774`	`//checking it here.`
`775`		`- for(xmlAttr* attr = node->properties; attr; attr = attr->next)`
	`775`	`+ for(auto attr = node->properties; attr; attr = attr->next)`
`776`	`776`	`free_wrappers(reinterpret_cast<xmlNode*>(attr));`
`777`	`777`	`}`
`778`	`778`