clang-tidy: use auto

neheb · neheb · commit c235caaacc11 · 2022-07-05T16:34:37.000-07:00
Found with modernize-use-auto

Signed-off-by: Rosen Penev &lt;rosenp@gmail.com&gt;
diff --git a/examples/dom_parser/main.cc b/examples/dom_parser/main.cc
@@ -65,9 +65,8 @@ void print_node(const xmlpp::Node* node, unsigned int indentation = 0)
   else if(nodeContent)
   {
     std::cout << indent << "content = " << nodeContent->get_content() << std::endl;
-  }
-  else if(const xmlpp::Element* nodeElement = dynamic_cast<const xmlpp::Element*>(node))
-  {
+  } else if (const auto nodeElement =
+                 dynamic_cast<const xmlpp::Element *>(node)) {
     //A normal Element node:
 
     //line() works only for ElementNodes.
diff --git a/examples/dom_xinclude/main.cc b/examples/dom_xinclude/main.cc
@@ -64,9 +64,8 @@ void print_node(const xmlpp::Node* node, unsigned int indentation = 0)
   else if (nodeContent)
   {
     std::cout << indent << "content = " << nodeContent->get_content() << std::endl;
-  }
-  else if (const xmlpp::Element* nodeElement = dynamic_cast<const xmlpp::Element*>(node))
-  {
+  } else if (const auto nodeElement =
+                 dynamic_cast<const xmlpp::Element *>(node)) {
     //A normal Element node:
     std::cout << indent << "     Element line = " << node->get_line() << std::endl;
 
@@ -86,13 +85,9 @@ void print_node(const xmlpp::Node* node, unsigned int indentation = 0)
     {
       std::cout << indent << "title = " << attribute->get_value() << std::endl;
     }
-  }
-  else if (dynamic_cast<const xmlpp::XIncludeStart*>(node))
-  {
+  } else if (dynamic_cast<const xmlpp::XIncludeStart *>(node)) {
     std::cout << indent << "     " << "XIncludeStart line = " << node->get_line() << std::endl;
-  }
-  else if (dynamic_cast<const xmlpp::XIncludeEnd*>(node))
-  {
+  } else if (dynamic_cast<const xmlpp::XIncludeEnd *>(node)) {
     std::cout << indent << "     " << "XIncludeEnd" << std::endl;
   }
 
diff --git a/libxml++/nodes/node.cc b/libxml++/nodes/node.cc
@@ -463,7 +463,7 @@ ustring Node::get_namespace_prefix() const
   else if (impl_->type == XML_ATTRIBUTE_DECL)
   {
     //impl_ is actually of type xmlAttribute, instead of just xmlNode.
-    const xmlAttribute* const attr = reinterpret_cast<const xmlAttribute*>(impl_);
+    const auto attr = reinterpret_cast<const xmlAttribute *>(impl_);
     return attr->prefix ? (const char*)attr->prefix : "";
   }
   else if(impl_->ns && impl_->ns->prefix)
diff --git a/libxml++/parsers/domparser.cc b/libxml++/parsers/domparser.cc
@@ -180,7 +180,7 @@ namespace {
                                  char * buffer,
                                  int len)
     {
-      std::istream *in = static_cast<std::istream*>(context);
+      auto in = static_cast<std::istream *>(context);
       in->read(buffer, len);
       return in->gcount();
     }
diff --git a/libxml++/parsers/saxparser.cc b/libxml++/parsers/saxparser.cc
@@ -215,7 +215,7 @@ namespace {
                                  char * buffer,
                                  int len)
     {
-      std::istream *in = static_cast<std::istream*>(context);
+      auto in = static_cast<std::istream *>(context);
       in->read(buffer, len);
       return in->gcount();
     }
diff --git a/libxml++/validators/dtdvalidator.cc b/libxml++/validators/dtdvalidator.cc
@@ -164,8 +164,8 @@ void DtdValidator::validate(const Document* document)
   xmlResetLastError();
   initialize_context();
 
-  const bool res = (bool)xmlValidateDtd(pimpl_->context, (xmlDoc*)document->cobj(),
-                   pimpl_->dtd->cobj());
+  const auto res = (bool)xmlValidateDtd(
+      pimpl_->context, (xmlDoc *)document->cobj(), pimpl_->dtd->cobj());
 
   if (!res)
   {

Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ ustring Node::get_namespace_prefix() const`
`463`	`463`	`else if (impl_->type == XML_ATTRIBUTE_DECL)`
`464`	`464`	`{`
`465`	`465`	`//impl_ is actually of type xmlAttribute, instead of just xmlNode.`
`466`		`- const xmlAttribute* const attr = reinterpret_cast<const xmlAttribute*>(impl_);`
	`466`	`+ const auto attr = reinterpret_cast<const xmlAttribute *>(impl_);`
`467`	`467`	`return attr->prefix ? (const char*)attr->prefix : "";`
`468`	`468`	`}`
`469`	`469`	`else if(impl_->ns && impl_->ns->prefix)`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ namespace {`
`180`	`180`	`char * buffer,`
`181`	`181`	`int len)`
`182`	`182`	`{`
`183`		`- std::istream in = static_cast<std::istream>(context);`
	`183`	`+ auto in = static_cast<std::istream *>(context);`
`184`	`184`	`in->read(buffer, len);`
`185`	`185`	`return in->gcount();`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ namespace {`
`215`	`215`	`char * buffer,`
`216`	`216`	`int len)`
`217`	`217`	`{`
`218`		`- std::istream in = static_cast<std::istream>(context);`
	`218`	`+ auto in = static_cast<std::istream *>(context);`
`219`	`219`	`in->read(buffer, len);`
`220`	`220`	`return in->gcount();`
`221`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,8 +164,8 @@ void DtdValidator::validate(const Document* document)`
`164`	`164`	`xmlResetLastError();`
`165`	`165`	`initialize_context();`
`166`	`166`
`167`		`- const bool res = (bool)xmlValidateDtd(pimpl_->context, (xmlDoc*)document->cobj(),`
`168`		`- pimpl_->dtd->cobj());`
	`167`	`+ const auto res = (bool)xmlValidateDtd(`
	`168`	`+ pimpl_->context, (xmlDoc *)document->cobj(), pimpl_->dtd->cobj());`
`169`	`169`
`170`	`170`	`if (!res)`
`171`	`171`	`{`