Use nullptr instead of 0 at missing places - C++-11

ya1gaurav · murraycu · commit a96e5fa354cb · 2015-10-08T11:24:11.000+02:00
diff --git a/libxml++/document.cc b/libxml++/document.cc
@@ -201,7 +201,7 @@ Dtd* Document::get_internal_subset() const
 {
   auto dtd = xmlGetIntSubset(impl_);
   if(!dtd)
-    return 0;
+    return nullptr;
 
   if(!dtd->_private)
     dtd->_private = new Dtd(dtd);
@@ -226,7 +226,7 @@ Element* Document::get_root_node()
 {
   auto root = xmlDocGetRootElement(impl_);
   if(root == nullptr)
-    return 0;
+    return nullptr;
   else
   {
     Node::create_wrapper(root);
@@ -270,7 +270,7 @@ Element* Document::create_root_node_by_import(const Node* node,
 					      bool recursive)
 {
   if (!node)
-    return 0;
+    return nullptr;
 
   //Create the node, by copying:
   auto imported_node = xmlDocCopyNode(const_cast<xmlNode*>(node->cobj()), impl_, recursive);
diff --git a/libxml++/nodes/element.cc b/libxml++/nodes/element.cc
@@ -67,7 +67,7 @@ Attribute* Element::get_attribute(const Glib::ustring& name,
   {
     ns_uri = get_namespace_uri_for_prefix(ns_prefix);
     if (ns_uri.empty())
-      return 0; // No such prefix.
+      return nullptr; // No such prefix.
   }
 
   // The return value of xmlHasNsProp() may be either an xmlAttr*, pointing to an
@@ -82,7 +82,7 @@ Attribute* Element::get_attribute(const Glib::ustring& name,
     return reinterpret_cast<Attribute*>(attr->_private);
   }
 
-  return 0;
+  return nullptr;
 }
 
 const Attribute* Element::get_attribute(const Glib::ustring& name,
@@ -128,7 +128,7 @@ Attribute* Element::set_attribute(const Glib::ustring& name, const Glib::ustring
     return reinterpret_cast<Attribute*>(attr->_private);
   }
   else
-    return 0;
+    return nullptr;
 }
 
 void Element::remove_attribute(const Glib::ustring& name, const Glib::ustring& ns_prefix)
@@ -155,7 +155,7 @@ Element* Element::add_child_element(xmlpp::Node* previous_sibling,
   const Glib::ustring& name, const Glib::ustring& ns_prefix)
 {
   if (!previous_sibling)
-    return 0;
+    return nullptr;
 
   auto child = create_new_child_element_node(name, ns_prefix);
   auto node = xmlAddNextSibling(previous_sibling->cobj(), child);
@@ -166,7 +166,7 @@ Element* Element::add_child_element_before(xmlpp::Node* next_sibling,
   const Glib::ustring& name, const Glib::ustring& ns_prefix)
 {
   if (!next_sibling)
-    return 0;
+    return nullptr;
 
   auto child = create_new_child_element_node(name, ns_prefix);
   auto node = xmlAddPrevSibling(next_sibling->cobj(), child);
@@ -186,7 +186,7 @@ Element* Element::add_child_element_with_new_ns(xmlpp::Node* previous_sibling,
   const Glib::ustring& ns_uri, const Glib::ustring& ns_prefix)
 {
   if (!previous_sibling)
-    return 0;
+    return nullptr;
 
   auto child = create_new_child_element_node_with_new_ns(name, ns_uri, ns_prefix);
   auto node = xmlAddNextSibling(previous_sibling->cobj(), child);
@@ -198,7 +198,7 @@ Element* Element::add_child_element_before_with_new_ns(xmlpp::Node* next_sibling
   const Glib::ustring& ns_uri, const Glib::ustring& ns_prefix)
 {
   if (!next_sibling)
-    return 0;
+    return nullptr;
 
   auto child = create_new_child_element_node_with_new_ns(name, ns_uri, ns_prefix);
   auto node = xmlAddPrevSibling(next_sibling->cobj(), child);
@@ -302,13 +302,13 @@ TextNode* Element::add_child_text(const Glib::ustring& content)
     Node::create_wrapper(node);
     return static_cast<TextNode*>(node->_private);
   }
-  return 0;
+  return nullptr;
 }
 
 TextNode* Element::add_child_text(xmlpp::Node* previous_sibling, const Glib::ustring& content)
 {
   if(!previous_sibling)
-    return 0;
+    return nullptr;
 
   if(cobj()->type == XML_ELEMENT_NODE)
   {
@@ -324,13 +324,13 @@ TextNode* Element::add_child_text(xmlpp::Node* previous_sibling, const Glib::ust
     Node::create_wrapper(node);
     return static_cast<TextNode*>(node->_private);
   }
-  return 0;
+  return nullptr;
 }
 
 TextNode* Element::add_child_text_before(xmlpp::Node* next_sibling, const Glib::ustring& content)
 {
   if(!next_sibling)
-    return 0;
+    return nullptr;
 
   if(cobj()->type == XML_ELEMENT_NODE)
   {
@@ -346,7 +346,7 @@ TextNode* Element::add_child_text_before(xmlpp::Node* next_sibling, const Glib::
     Node::create_wrapper(node);
     return static_cast<TextNode*>(node->_private);
   }
-  return 0;
+  return nullptr;
 }
 
 bool Element::has_child_text() const
diff --git a/libxml++/nodes/node.cc b/libxml++/nodes/node.cc
@@ -238,7 +238,7 @@ const Element* Node::get_parent() const
 Element* Node::get_parent()
 {
   if(!(cobj()->parent && cobj()->parent->type == XML_ELEMENT_NODE))
-    return 0;
+    return nullptr;
 
   Node::create_wrapper(cobj()->parent);
   return static_cast<Element*>(cobj()->parent->_private);
@@ -252,7 +252,7 @@ const Node* Node::get_next_sibling() const
 Node* Node::get_next_sibling()
 {
   if(!cobj()->next)
-    return 0;
+    return nullptr;
 
   Node::create_wrapper(cobj()->next);
   return static_cast<Node*>(cobj()->next->_private);
@@ -266,7 +266,7 @@ const Node* Node::get_previous_sibling() const
 Node* Node::get_previous_sibling()
 {
   if(!cobj()->prev)
-    return 0;
+    return nullptr;
 
   Node::create_wrapper(cobj()->prev);
   return static_cast<Node*>(cobj()->prev->_private);
@@ -276,7 +276,7 @@ Node* Node::get_first_child(const Glib::ustring& name)
 {
   auto child = impl_->children;
   if(!child)
-    return 0;
+    return nullptr;
 
   do
   {
@@ -285,7 +285,7 @@ Node* Node::get_first_child(const Glib::ustring& name)
   }
   while((child = child->next));
    
-  return 0;
+  return nullptr;
 }
 
 const Node* Node::get_first_child(const Glib::ustring& name) const
@@ -320,7 +320,7 @@ void Node::remove_node(Node* node)
 Node* Node::import_node(const Node* node, bool recursive)
 {
   if (!node)
-    return 0;
+    return nullptr;
 
   //Create the node, by copying:
   auto imported_node = xmlDocCopyNode(const_cast<xmlNode*>(node->cobj()), impl_->doc, recursive);
diff --git a/libxml++/parsers/textreader.cc b/libxml++/parsers/textreader.cc
@@ -301,7 +301,7 @@ Node* TextReader::get_current_node()
   }
     
   check_for_exceptions();
-  return 0;
+  return nullptr;
 }
 
 const Node* TextReader::get_current_node() const
@@ -329,7 +329,7 @@ Node* TextReader::expand()
   }
     
   check_for_exceptions();
-  return 0;
+  return nullptr;
 }
 
 bool TextReader::next()

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ Dtd* Document::get_internal_subset() const`
`201`	`201`	`{`
`202`	`202`	`auto dtd = xmlGetIntSubset(impl_);`
`203`	`203`	`if(!dtd)`
`204`		`- return 0;`
	`204`	`+ return nullptr;`
`205`	`205`
`206`	`206`	`if(!dtd->_private)`
`207`	`207`	`dtd->_private = new Dtd(dtd);`
`@@ -226,7 +226,7 @@ Element* Document::get_root_node()`
`226`	`226`	`{`
`227`	`227`	`auto root = xmlDocGetRootElement(impl_);`
`228`	`228`	`if(root == nullptr)`
`229`		`- return 0;`
	`229`	`+ return nullptr;`
`230`	`230`	`else`
`231`	`231`	`{`
`232`	`232`	`Node::create_wrapper(root);`
`@@ -270,7 +270,7 @@ Element* Document::create_root_node_by_import(const Node* node,`
`270`	`270`	`bool recursive)`
`271`	`271`	`{`
`272`	`272`	`if (!node)`
`273`		`- return 0;`
	`273`	`+ return nullptr;`
`274`	`274`
`275`	`275`	`//Create the node, by copying:`
`276`	`276`	`auto imported_node = xmlDocCopyNode(const_cast<xmlNode*>(node->cobj()), impl_, recursive);`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ Attribute* Element::get_attribute(const Glib::ustring& name,`
`67`	`67`	`{`
`68`	`68`	`ns_uri = get_namespace_uri_for_prefix(ns_prefix);`
`69`	`69`	`if (ns_uri.empty())`
`70`		`- return 0; // No such prefix.`
	`70`	`+ return nullptr; // No such prefix.`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// The return value of xmlHasNsProp() may be either an xmlAttr*, pointing to an`
`@@ -82,7 +82,7 @@ Attribute* Element::get_attribute(const Glib::ustring& name,`
`82`	`82`	`return reinterpret_cast<Attribute*>(attr->_private);`
`83`	`83`	`}`
`84`	`84`
`85`		`- return 0;`
	`85`	`+ return nullptr;`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`const Attribute* Element::get_attribute(const Glib::ustring& name,`
`@@ -128,7 +128,7 @@ Attribute* Element::set_attribute(const Glib::ustring& name, const Glib::ustring`
`128`	`128`	`return reinterpret_cast<Attribute*>(attr->_private);`
`129`	`129`	`}`
`130`	`130`	`else`
`131`		`- return 0;`
	`131`	`+ return nullptr;`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`void Element::remove_attribute(const Glib::ustring& name, const Glib::ustring& ns_prefix)`
`@@ -155,7 +155,7 @@ Element* Element::add_child_element(xmlpp::Node* previous_sibling,`
`155`	`155`	`const Glib::ustring& name, const Glib::ustring& ns_prefix)`
`156`	`156`	`{`
`157`	`157`	`if (!previous_sibling)`
`158`		`- return 0;`
	`158`	`+ return nullptr;`
`159`	`159`
`160`	`160`	`auto child = create_new_child_element_node(name, ns_prefix);`
`161`	`161`	`auto node = xmlAddNextSibling(previous_sibling->cobj(), child);`
`@@ -166,7 +166,7 @@ Element* Element::add_child_element_before(xmlpp::Node* next_sibling,`
`166`	`166`	`const Glib::ustring& name, const Glib::ustring& ns_prefix)`
`167`	`167`	`{`
`168`	`168`	`if (!next_sibling)`
`169`		`- return 0;`
	`169`	`+ return nullptr;`
`170`	`170`
`171`	`171`	`auto child = create_new_child_element_node(name, ns_prefix);`
`172`	`172`	`auto node = xmlAddPrevSibling(next_sibling->cobj(), child);`
`@@ -186,7 +186,7 @@ Element* Element::add_child_element_with_new_ns(xmlpp::Node* previous_sibling,`
`186`	`186`	`const Glib::ustring& ns_uri, const Glib::ustring& ns_prefix)`
`187`	`187`	`{`
`188`	`188`	`if (!previous_sibling)`
`189`		`- return 0;`
	`189`	`+ return nullptr;`
`190`	`190`
`191`	`191`	`auto child = create_new_child_element_node_with_new_ns(name, ns_uri, ns_prefix);`
`192`	`192`	`auto node = xmlAddNextSibling(previous_sibling->cobj(), child);`
`@@ -198,7 +198,7 @@ Element* Element::add_child_element_before_with_new_ns(xmlpp::Node* next_sibling`
`198`	`198`	`const Glib::ustring& ns_uri, const Glib::ustring& ns_prefix)`
`199`	`199`	`{`
`200`	`200`	`if (!next_sibling)`
`201`		`- return 0;`
	`201`	`+ return nullptr;`
`202`	`202`
`203`	`203`	`auto child = create_new_child_element_node_with_new_ns(name, ns_uri, ns_prefix);`
`204`	`204`	`auto node = xmlAddPrevSibling(next_sibling->cobj(), child);`
`@@ -302,13 +302,13 @@ TextNode* Element::add_child_text(const Glib::ustring& content)`
`302`	`302`	`Node::create_wrapper(node);`
`303`	`303`	`return static_cast<TextNode*>(node->_private);`
`304`	`304`	`}`
`305`		`- return 0;`
	`305`	`+ return nullptr;`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`TextNode* Element::add_child_text(xmlpp::Node* previous_sibling, const Glib::ustring& content)`
`309`	`309`	`{`
`310`	`310`	`if(!previous_sibling)`
`311`		`- return 0;`
	`311`	`+ return nullptr;`
`312`	`312`
`313`	`313`	`if(cobj()->type == XML_ELEMENT_NODE)`
`314`	`314`	`{`
`@@ -324,13 +324,13 @@ TextNode* Element::add_child_text(xmlpp::Node* previous_sibling, const Glib::ust`
`324`	`324`	`Node::create_wrapper(node);`
`325`	`325`	`return static_cast<TextNode*>(node->_private);`
`326`	`326`	`}`
`327`		`- return 0;`
	`327`	`+ return nullptr;`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`TextNode* Element::add_child_text_before(xmlpp::Node* next_sibling, const Glib::ustring& content)`
`331`	`331`	`{`
`332`	`332`	`if(!next_sibling)`
`333`		`- return 0;`
	`333`	`+ return nullptr;`
`334`	`334`
`335`	`335`	`if(cobj()->type == XML_ELEMENT_NODE)`
`336`	`336`	`{`
`@@ -346,7 +346,7 @@ TextNode* Element::add_child_text_before(xmlpp::Node* next_sibling, const Glib::`
`346`	`346`	`Node::create_wrapper(node);`
`347`	`347`	`return static_cast<TextNode*>(node->_private);`
`348`	`348`	`}`
`349`		`- return 0;`
	`349`	`+ return nullptr;`
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`bool Element::has_child_text() const`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ const Element* Node::get_parent() const`
`238`	`238`	`Element* Node::get_parent()`
`239`	`239`	`{`
`240`	`240`	`if(!(cobj()->parent && cobj()->parent->type == XML_ELEMENT_NODE))`
`241`		`- return 0;`
	`241`	`+ return nullptr;`
`242`	`242`
`243`	`243`	`Node::create_wrapper(cobj()->parent);`
`244`	`244`	`return static_cast<Element*>(cobj()->parent->_private);`
`@@ -252,7 +252,7 @@ const Node* Node::get_next_sibling() const`
`252`	`252`	`Node* Node::get_next_sibling()`
`253`	`253`	`{`
`254`	`254`	`if(!cobj()->next)`
`255`		`- return 0;`
	`255`	`+ return nullptr;`
`256`	`256`
`257`	`257`	`Node::create_wrapper(cobj()->next);`
`258`	`258`	`return static_cast<Node*>(cobj()->next->_private);`
`@@ -266,7 +266,7 @@ const Node* Node::get_previous_sibling() const`
`266`	`266`	`Node* Node::get_previous_sibling()`
`267`	`267`	`{`
`268`	`268`	`if(!cobj()->prev)`
`269`		`- return 0;`
	`269`	`+ return nullptr;`
`270`	`270`
`271`	`271`	`Node::create_wrapper(cobj()->prev);`
`272`	`272`	`return static_cast<Node*>(cobj()->prev->_private);`
`@@ -276,7 +276,7 @@ Node* Node::get_first_child(const Glib::ustring& name)`
`276`	`276`	`{`
`277`	`277`	`auto child = impl_->children;`
`278`	`278`	`if(!child)`
`279`		`- return 0;`
	`279`	`+ return nullptr;`
`280`	`280`
`281`	`281`	`do`
`282`	`282`	`{`
`@@ -285,7 +285,7 @@ Node* Node::get_first_child(const Glib::ustring& name)`
`285`	`285`	`}`
`286`	`286`	`while((child = child->next));`
`287`	`287`
`288`		`- return 0;`
	`288`	`+ return nullptr;`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`const Node* Node::get_first_child(const Glib::ustring& name) const`
`@@ -320,7 +320,7 @@ void Node::remove_node(Node* node)`
`320`	`320`	`Node* Node::import_node(const Node* node, bool recursive)`
`321`	`321`	`{`
`322`	`322`	`if (!node)`
`323`		`- return 0;`
	`323`	`+ return nullptr;`
`324`	`324`
`325`	`325`	`//Create the node, by copying:`
`326`	`326`	`auto imported_node = xmlDocCopyNode(const_cast<xmlNode*>(node->cobj()), impl_->doc, recursive);`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ Node* TextReader::get_current_node()`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`check_for_exceptions();`
`304`		`- return 0;`
	`304`	`+ return nullptr;`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`const Node* TextReader::get_current_node() const`
`@@ -329,7 +329,7 @@ Node* TextReader::expand()`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`check_for_exceptions();`
`332`		`- return 0;`
	`332`	`+ return nullptr;`
`333`	`333`	`}`
`334`	`334`
`335`	`335`	`bool TextReader::next()`