X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fpbd%2Fxml%2B%2B.h;h=e6795e5d455a0b2b9697322d8de57608ff562d64;hb=e3329000557015ce54691235769db8821e75666b;hp=6a5097780e6894c95e2363112f91cd814cc90594;hpb=0c9c47086c49d27a38cef5f5cc819e1aec56857c;p=ardour.git

diff --git a/libs/pbd/pbd/xml++.h b/libs/pbd/pbd/xml++.h
index 6a5097780e..e6795e5d45 100644
--- 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,14 +114,13 @@ 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 = "");
@@ -121,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();
@@ -137,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() {}