/*
- Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of libcxml.
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 ()) {
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 ()) {
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)));
}
}
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);
}
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> ();
}
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);
}
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> ();
}
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> ();
}
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());
}
}
}
{
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 ();
}
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;
/*
- Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of libcxml.
#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>
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);
}
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);
}
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);
}