revert incorrect include path changes and removal of export macros for two libardour...

[ardour.git] / libs / pbd / pbd / xml++.h

diff --git a/libs/pbd/pbd/xml++.h b/libs/pbd/pbd/xml++.h
index 65ab0f2c03ac4d2eb105f893482678df9d70c8a8..e6795e5d455a0b2b9697322d8de57608ff562d64 100644 (file)
--- a/libs/pbd/pbd/xml++.h
+++ b/libs/pbd/pbd/xml++.h
@@ -1,3 +1,25 @@
+/*
+    Copyright (C) 2012 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __XML_H
+#define __XML_H
+
 /* xml++.h
  * libxml++ and this file are copyright (C) 2000 by Ari Johnson, and
  * are covered by the GNU Lesser General Public License, which should be
@@ -15,8 +37,7 @@
 #include <libxml/tree.h>
 #include <boost/shared_ptr.hpp>
 
-#ifndef __XML_H
-#define __XML_H
+#include "pbd/libpbd_visibility.h"
 
 class XMLTree;
 class XMLNode;
@@ -31,7 +52,7 @@ typedef XMLPropertyList::iterator              XMLPropertyIterator;
 typedef XMLPropertyList::const_iterator        XMLPropertyConstIterator;
 typedef std::map<std::string, XMLProperty*>    XMLPropertyMap;
 
-class XMLTree {
+class LIBPBD_API XMLTree {
 public:
        XMLTree();
        XMLTree(const std::string& fn, bool validate = false);
@@ -60,21 +81,26 @@ public:
 
        const std::string& write_buffer() const;
 
+       boost::shared_ptr<XMLSharedNodeList> find(const std::string xpath, XMLNode* = 0) const;
+
 private:
        bool read_internal(bool validate);
        
        std::string _filename;
        XMLNode*    _root;
+       xmlDocPtr   _doc;
        int         _compression;
 };
 
-class XMLNode {
+class LIBPBD_API XMLNode {
 public:
        XMLNode(const std::string& name);
        XMLNode(const std::string& name, const std::string& content);
        XMLNode(const XMLNode& other);
        ~XMLNode();
 
+       XMLNode& operator= (const XMLNode& other);
+
        const std::string& name() const { return _name; }
 
        bool          is_content() const { return _is_content; }
@@ -88,20 +114,20 @@ public:
        XMLNode* add_child_copy(const XMLNode&);
        void     add_child_nocopy(XMLNode&);
 
-       boost::shared_ptr<XMLSharedNodeList> find(const std::string xpath) const;
        std::string attribute_value();
 
        const XMLPropertyList& properties() const { return _proplist; }
        XMLProperty*       property(const char*);
        XMLProperty*       property(const std::string&);
-       const XMLProperty* property(const char* n)   const { return ((XMLNode*)this)->property(n); }
-       const XMLProperty* property(const std::string& n) const { return ((XMLNode*)this)->property(n); }
+        const XMLProperty* property(const char* n)   const { return const_cast<XMLNode*>(this)->property(n); }
+        const XMLProperty* property(const std::string& n) const { return const_cast<XMLNode*>(this)->property(n); }
        
        XMLProperty* add_property(const char* name, const std::string& value);
        XMLProperty* add_property(const char* name, const char* value = "");
        XMLProperty* add_property(const char* name, const long value);
 
        void remove_property(const std::string&);
+       void remove_property_recursively(const std::string&);
 
        /** Remove all nodes with the name passed to remove_nodes */
        void remove_nodes(const std::string&);
@@ -110,6 +136,8 @@ public:
        /** Remove and delete all nodes with property prop matching val */
        void remove_nodes_and_delete(const std::string& propname, const std::string& val);
 
+       void dump (std::ostream &, std::string p = "") const;
+
 private:
        std::string         _name;
        bool                _is_content;
@@ -118,9 +146,11 @@ private:
        XMLPropertyList     _proplist;
        XMLPropertyMap      _propmap;
        mutable XMLNodeList _selected_children;
+
+       void clear_lists ();
 };
 
-class XMLProperty {
+class LIBPBD_API XMLProperty {
 public:
        XMLProperty(const std::string& n, const std::string& v = std::string());
        ~XMLProperty();
@@ -134,7 +164,7 @@ private:
        std::string _value;
 };
 
-class XMLException: public std::exception {
+class LIBPBD_API XMLException: public std::exception {
 public:
        explicit XMLException(const std::string msg) : _message(msg) {}
        virtual ~XMLException() throw() {}