Add cxml::add_child() and cxml::add_text_child().

[libcxml.git] / src / cxml.h

diff --git a/src/cxml.h b/src/cxml.h
index a2d5b88b3aeb423db5918d16dd50fa52e512157e..417662294497594b220d4776a05bcfec116f1a7e 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,13 +21,13 @@
 #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>
-#include <stdint.h>
+#include <exception>
+#include <memory>
 #include <string>
-#include <list>
+#include <vector>
 
 /* Hack for OS X compile failure; see https://bugs.launchpad.net/hugin/+bug/910160 */
 #ifdef check
@@ -35,8 +35,9 @@
 #endif
 
 namespace xmlpp {
-       class Node;
        class DomParser;
+       class Element;
+       class Node;
 }
 
 namespace cxml {
@@ -56,7 +57,7 @@ public:
        /** @return error message.  Caller must not free the returned
         *  value.
         */
-       char const * what () const throw () {
+       char const * what () const noexcept override {
                return _message.c_str ();
        }
 
@@ -70,7 +71,7 @@ private:
  */
 template <typename P, typename Q>
 P
-raw_convert (Q v)
+raw_convert (Q)
 {
        /* We can't write a generic version of raw_convert; all required
           versions must be specialised.
@@ -82,10 +83,26 @@ template <>
 int
 raw_convert (std::string v);
 
+template <>
+unsigned int
+raw_convert (std::string v);
+
 template <>
 long int
 raw_convert (std::string v);
 
+template <>
+long unsigned int
+raw_convert (std::string v);
+
+template <>
+long long
+raw_convert (std::string v);
+
+template <>
+long long unsigned
+raw_convert (std::string v);
+
 template <>
 float
 raw_convert (std::string v);
@@ -139,7 +156,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);
        }
@@ -147,12 +164,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> ();
+                       return {};
                }
 
-               std::string t = s.get ();
+               auto t = s.get ();
                boost::erase_all (t, " ");
                return raw_convert<T> (t);
        }
@@ -186,12 +203,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);
        }
@@ -205,33 +222,38 @@ public:
        /** @return namespace prefix of this node */
        std::string namespace_prefix () const;
 
-       boost::shared_ptr<Node> node_child (std::string) const;
-       boost::shared_ptr<Node> optional_node_child (std::string) const;
+       std::shared_ptr<Node> node_child (std::string) const;
+       std::shared_ptr<Node> optional_node_child (std::string) const;
 
-       std::list<boost::shared_ptr<Node> > node_children () const;
-       std::list<boost::shared_ptr<Node> > node_children (std::string) const;
+       std::vector<std::shared_ptr<Node>> node_children () const;
+       std::vector<std::shared_ptr<Node>> node_children (std::string) const;
 
        xmlpp::Node* node () const {
                return _node;
        }
 
+       bool is_text() const;
+
 protected:
        xmlpp::Node* _node;
 
 private:
-       mutable std::list<std::string> _taken;
+       mutable std::vector<std::string> _taken;
 };
 
-typedef boost::shared_ptr<cxml::Node> NodePtr;
-typedef boost::shared_ptr<const cxml::Node> ConstNodePtr;
+typedef std::shared_ptr<cxml::Node> NodePtr;
+typedef std::shared_ptr<const cxml::Node> ConstNodePtr;
 
 class Document : public Node
 {
 public:
        Document ();
-       Document (std::string root_name);
+       explicit Document(std::string root_name);
        Document (std::string root_name, boost::filesystem::path);
 
+       Document (Document const&) = delete;
+       Document& operator= (Document const&) = delete;
+
        virtual ~Document ();
 
        void read_file (boost::filesystem::path);
@@ -248,6 +270,11 @@ private:
        std::string _root_name;
 };
 
+
+xmlpp::Element* add_child(xmlpp::Element* parent, std::string const& name);
+void add_text_child(xmlpp::Element* parent, std::string const& name, std::string const& text);
+
+
 }
 
 #endif