Use auto.

diff --git a/src/cxml.cc b/src/cxml.cc
index fac787fd45ae1a809f88f526386be9c8564b14bd..356e1df5546908711ca4245c3825c16007aeaf83 100644 (file)
--- a/src/cxml.cc
+++ b/src/cxml.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libcxml.
 
@@ -53,7 +53,7 @@ cxml::Node::name () const
 shared_ptr<cxml::Node>
 cxml::Node::node_child (string name) const
 {
-       list<shared_ptr<cxml::Node> > n = node_children (name);
+       auto const n = node_children (name);
        if (n.size() > 1) {
                throw cxml::Error ("duplicate XML tag " + name);
        } else if (n.empty ()) {
@@ -66,7 +66,7 @@ cxml::Node::node_child (string name) const
 shared_ptr<cxml::Node>
 cxml::Node::optional_node_child (string name) const
 {
-       list<shared_ptr<cxml::Node> > n = node_children (name);
+       auto const n = node_children (name);
        if (n.size() > 1) {
                throw cxml::Error ("duplicate XML tag " + name);
        } else if (n.empty ()) {
@@ -76,35 +76,32 @@ cxml::Node::optional_node_child (string name) const
        return n.front ();
 }
 
-list<shared_ptr<cxml::Node> >
+list<shared_ptr<cxml::Node>>
 cxml::Node::node_children () const
 {
        if (!_node) {
                throw Error ("No node to read children from");
        }
-       xmlpp::Node::NodeList c = _node->get_children ();
 
        list<shared_ptr<cxml::Node> > n;
-       for (xmlpp::Node::NodeList::iterator i = c.begin (); i != c.end(); ++i) {
-               n.push_back (shared_ptr<Node> (new Node (*i)));
+       for (auto i: _node->get_children()) {
+               n.push_back (shared_ptr<Node> (new Node (i)));
        }
 
        return n;
 }
 
-list<shared_ptr<cxml::Node> >
+list<shared_ptr<cxml::Node>>
 cxml::Node::node_children (string name) const
 {
        /* XXX: using find / get_path should work here, but I can't follow
           how get_path works.
        */
 
-       xmlpp::Node::NodeList c = _node->get_children ();
-
        list<shared_ptr<cxml::Node> > n;
-       for (xmlpp::Node::NodeList::iterator i = c.begin (); i != c.end(); ++i) {
-               if ((*i)->get_name() == name) {
-                       n.push_back (shared_ptr<Node> (new Node (*i)));
+       for (auto i: _node->get_children()) {
+               if (i->get_name() == name) {
+                       n.push_back (shared_ptr<Node> (new Node (i)));
                }
        }
 
@@ -121,7 +118,7 @@ cxml::Node::string_child (string c) const
 optional<string>
 cxml::Node::optional_string_child (string c) const
 {
-       list<shared_ptr<Node> > nodes = node_children (c);
+       auto const nodes = node_children (c);
        if (nodes.size() > 1) {
                throw cxml::Error ("duplicate XML tag " + c);
        }
@@ -136,14 +133,14 @@ cxml::Node::optional_string_child (string c) const
 bool
 cxml::Node::bool_child (string c) const
 {
-       string const s = string_child (c);
+       auto const s = string_child (c);
        return (s == "1" || s == "yes" || s == "True");
 }
 
 optional<bool>
 cxml::Node::optional_bool_child (string c) const
 {
-       optional<string> s = optional_string_child (c);
+       auto const s = optional_string_child (c);
        if (!s) {
                return optional<bool> ();
        }
@@ -160,12 +157,12 @@ cxml::Node::ignore_child (string name) const
 string
 cxml::Node::string_attribute (string name) const
 {
-       xmlpp::Element const * e = dynamic_cast<const xmlpp::Element *> (_node);
+       auto e = dynamic_cast<const xmlpp::Element *> (_node);
        if (!e) {
                throw cxml::Error ("missing attribute " + name);
        }
 
-       xmlpp::Attribute* a = e->get_attribute (name);
+       auto a = e->get_attribute (name);
        if (!a) {
                throw cxml::Error ("missing attribute " + name);
        }
@@ -176,12 +173,12 @@ cxml::Node::string_attribute (string name) const
 optional<string>
 cxml::Node::optional_string_attribute (string name) const
 {
-       xmlpp::Element const * e = dynamic_cast<const xmlpp::Element *> (_node);
+       auto e = dynamic_cast<const xmlpp::Element *> (_node);
        if (!e) {
                return optional<string> ();
        }
 
-       xmlpp::Attribute* a = e->get_attribute (name);
+       auto a = e->get_attribute (name);
        if (!a) {
                return optional<string> ();
        }
@@ -192,14 +189,14 @@ cxml::Node::optional_string_attribute (string name) const
 bool
 cxml::Node::bool_attribute (string name) const
 {
-       string const s = string_attribute (name);
+       auto const s = string_attribute (name);
        return (s == "1" || s == "yes");
 }
 
 optional<bool>
 cxml::Node::optional_bool_attribute (string name) const
 {
-       optional<string> s = optional_string_attribute (name);
+       auto s = optional_string_attribute (name);
        if (!s) {
                return optional<bool> ();
        }
@@ -210,10 +207,9 @@ cxml::Node::optional_bool_attribute (string name) const
 void
 cxml::Node::done () const
 {
-       xmlpp::Node::NodeList c = _node->get_children ();
-       for (xmlpp::Node::NodeList::iterator i = c.begin(); i != c.end(); ++i) {
-               if (dynamic_cast<xmlpp::Element *> (*i) && find (_taken.begin(), _taken.end(), (*i)->get_name()) == _taken.end ()) {
-                       throw cxml::Error ("unexpected XML node " + (*i)->get_name());
+       for (auto i: _node->get_children()) {
+               if (dynamic_cast<xmlpp::Element *> (i) && find (_taken.begin(), _taken.end(), i->get_name()) == _taken.end ()) {
+                       throw cxml::Error ("unexpected XML node " + i->get_name());
                }
        }
 }
@@ -223,9 +219,8 @@ cxml::Node::content () const
 {
        string content;
 
-        xmlpp::Node::NodeList c = _node->get_children ();
-       for (xmlpp::Node::NodeList::const_iterator i = c.begin(); i != c.end(); ++i) {
-               xmlpp::ContentNode const * v = dynamic_cast<xmlpp::ContentNode const *> (*i);
+       for (auto i: _node->get_children()) {
+               auto v = dynamic_cast<xmlpp::ContentNode const *> (i);
                if (v && dynamic_cast<xmlpp::TextNode const *>(v)) {
                        content += v->get_content ();
                }
@@ -306,7 +301,7 @@ static
 string
 make_local (string v)
 {
-       struct lconv* lc = localeconv ();
+       auto lc = localeconv ();
        boost::algorithm::replace_all (v, ".", lc->decimal_point);
        /* We hope it's ok not to add in thousands separators here */
        return v;

diff --git a/src/cxml.h b/src/cxml.h
index d9c8ef6e5e930d55c5b773b322c231de6fb9e70b..2bdde74709cda7e6f1ff90d70de4921f77060e74 100644 (file)
--- a/src/cxml.h
+++ b/src/cxml.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libcxml.
 
@@ -21,7 +21,6 @@
 #ifndef LIBCXML_CXML_H
 #define LIBCXML_CXML_H
 
-#include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string/erase.hpp>
@@ -155,7 +154,7 @@ public:
        template <class T>
        T number_child (std::string c) const
        {
-               std::string s = string_child (c);
+               auto s = string_child (c);
                boost::erase_all (s, " ");
                return raw_convert<T> (s);
        }
@@ -163,12 +162,12 @@ public:
        template <class T>
        boost::optional<T> optional_number_child (std::string c) const
        {
-               boost::optional<std::string> s = optional_string_child (c);
+               auto s = optional_string_child (c);
                if (!s) {
                        return boost::optional<T> ();
                }
 
-               std::string t = s.get ();
+               auto t = s.get ();
                boost::erase_all (t, " ");
                return raw_convert<T> (t);
        }
@@ -202,12 +201,12 @@ public:
        template <class T>
        boost::optional<T> optional_number_attribute (std::string c) const
        {
-               boost::optional<std::string> s = optional_string_attribute (c);
+               auto s = optional_string_attribute (c);
                if (!s) {
                        return boost::optional<T> ();
                }
 
-               std::string t = s.get ();
+               auto t = s.get ();
                boost::erase_all (t, " ");
                return raw_convert<T> (t);
        }