Clean up xml++.h and xml++.cc in Ardour style.

No functional changes.
(We've diverged far enough for it to not matter, and are about to diverge even more, so might as well).


git-svn-id: svn://localhost/ardour2/branches/3.0@4649 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 96 insertions, 102 deletions

diff --git a/libs/pbd/pbd/xml++.h b/libs/pbd/pbd/xml++.h
index 83cc8ff91b..9427c7070c 100644
--- a/libs/pbd/pbd/xml++.h
+++ b/libs/pbd/pbd/xml++.h
@@ -2,6 +2,7 @@
  * libxml++ and this file are copyright (C) 2000 by Ari Johnson, and
  * are covered by the GNU Lesser General Public License, which should be
  * included with libxml++ as the file COPYING.
+ * Modified for Ardour and released under the same terms.
  */
 
 #include <string>
@@ -25,134 +26,127 @@ class XMLTree;
 class XMLNode;
 class XMLProperty;
 
-typedef list<XMLNode *> XMLNodeList;
+typedef list<XMLNode *>                   XMLNodeList;
 typedef list<boost::shared_ptr<XMLNode> > XMLSharedNodeList;
-typedef XMLNodeList::iterator XMLNodeIterator;
-typedef XMLNodeList::const_iterator XMLNodeConstIterator;
-typedef list<XMLProperty*> XMLPropertyList;
-typedef XMLPropertyList::iterator XMLPropertyIterator;
-typedef XMLPropertyList::const_iterator XMLPropertyConstIterator;
-typedef map<string, XMLProperty*> XMLPropertyMap;
+typedef XMLNodeList::iterator             XMLNodeIterator;
+typedef XMLNodeList::const_iterator       XMLNodeConstIterator;
+typedef list<XMLProperty*>                XMLPropertyList;
+typedef XMLPropertyList::iterator         XMLPropertyIterator;
+typedef XMLPropertyList::const_iterator   XMLPropertyConstIterator;
+typedef map<string, XMLProperty*>         XMLPropertyMap;
 
 class XMLTree {
-private:
-  string _filename;
-  XMLNode *_root;
-  int _compression;
-  bool read_internal(bool validate);
-  
 public:
-  XMLTree();
-  XMLTree(const string &fn, bool validate = false);
-  XMLTree(const XMLTree *);
-  ~XMLTree();
+	XMLTree();
+	XMLTree(const string& fn, bool validate = false);
+	XMLTree(const XMLTree*);
+	~XMLTree();
 
-  XMLNode *root() const { return _root; };
-  XMLNode *set_root(XMLNode *n) { return _root = n; };
+	XMLNode* root() const         { return _root; }
+	XMLNode* set_root(XMLNode* n) { return _root = n; }
 
-  const string & filename() const { return _filename; };
-  const string & set_filename(const string &fn) { return _filename = fn; };
+	const string& filename() const               { return _filename; }
+	const string& set_filename(const string& fn) { return _filename = fn; }
 
-  int compression() const { return _compression; };
-  int set_compression(int);
+	int compression() const { return _compression; }
+	int set_compression(int);
 
-  bool read() { return read_internal(false); };
-  bool read(const string &fn) { set_filename(fn); return read_internal(false); };
-  bool read_and_validate() { return read_internal(true); };
-  bool read_and_validate(const string &fn) { set_filename(fn); return read_internal(true); };
-  bool read_buffer(const string &);
+	bool read() { return read_internal(false); }
+	bool read(const string& fn) { set_filename(fn); return read_internal(false); }
+	bool read_and_validate() { return read_internal(true); }
+	bool read_and_validate(const string& fn) { set_filename(fn); return read_internal(true); }
+	bool read_buffer(const string&);
 
-  bool write() const;
-  bool write(const string &fn) { set_filename(fn); return write(); };
+	bool write() const;
+	bool write(const string& fn) { set_filename(fn); return write(); }
 
-  void debug (FILE*) const;
+	void debug (FILE*) const;
 
-  const string & write_buffer() const;
-};
+	const string& write_buffer() const;
 
-class XMLNode {
 private:
-  string _name;
-  bool _is_content;
-  string _content;
-  XMLNodeList _children;
-  XMLPropertyList _proplist;
-  XMLPropertyMap _propmap;
-  mutable XMLNodeList _selected_children;
+	bool read_internal(bool validate);
+	
+	string   _filename;
+	XMLNode* _root;
+	int      _compression;
+};
 
+class XMLNode {
 public:
-  XMLNode(const string& name);
-  XMLNode(const string& name, const string& content);
-  XMLNode(const XMLNode& other);
-  ~XMLNode();
-
-  const string name() const { return _name; };
-
-  bool is_content() const { return _is_content; };
-  const string & content() const { return _content; };
-  const string & set_content (const string &);
-  XMLNode *add_content(const string & = string());
-
-  const XMLNodeList & children (const string& str = string()) const;
-  XMLNode *add_child (const char *);
-  XMLNode *add_child_copy (const XMLNode&);
-  XMLNode *child (const char*) const;
-  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& ns) const
-	{ return ((XMLNode *) this)->property(ns); };
-  XMLProperty *add_property(const char *name, const string& value);
-  XMLProperty *add_property(const char *name, const char *value = "");
-  XMLProperty *add_property(const char *name, const long value);
-
-  void remove_property(const string &);
-
-  /** Remove all nodes with the name passed to remove_nodes */
-  void remove_nodes(const string &);
-  /** Remove and delete all nodes with the name passed to remove_nodes */
-  void remove_nodes_and_delete(const string &);
-  /** Remove and delete all nodes with property prop matching val */
-  void remove_nodes_and_delete(const string& propname, const string& val);
-};
+	XMLNode(const string& name);
+	XMLNode(const string& name, const string& content);
+	XMLNode(const XMLNode& other);
+	~XMLNode();
+
+	const string& name() const { return _name; }
+
+	bool          is_content() const { return _is_content; }
+	const string& content()    const { return _content; }
+	const string& set_content(const string&);
+	XMLNode*      add_content(const string& s = string());
+
+	const XMLNodeList& children(const string& str = string()) const;
+	XMLNode* child(const char*) const;
+	XMLNode* add_child(const char *);
+	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 string&);
+	const XMLProperty* property(const char* n)   const { return ((XMLNode*)this)->property(n); }
+	const XMLProperty* property(const string& n) const { return ((XMLNode*)this)->property(n); }
+	
+	XMLProperty* add_property(const char* name, const string& value);
+	XMLProperty* add_property(const char* name, const char* value = "");
+	XMLProperty* add_property(const char* name, const long value);
+
+	void remove_property(const string&);
+
+	/** Remove all nodes with the name passed to remove_nodes */
+	void remove_nodes(const string&);
+	/** Remove and delete all nodes with the name passed to remove_nodes */
+	void remove_nodes_and_delete(const string&);
+	/** Remove and delete all nodes with property prop matching val */
+	void remove_nodes_and_delete(const string& propname, const string& val);
 
-class XMLProperty {
 private:
-  string _name;
-  string _value;
+	string              _name;
+	bool                _is_content;
+	string              _content;
+	XMLNodeList         _children;
+	XMLPropertyList     _proplist;
+	XMLPropertyMap      _propmap;
+	mutable XMLNodeList _selected_children;
+};
 
+class XMLProperty {
 public:
-  XMLProperty(const string &n, const string &v = string());
-  ~XMLProperty();
+	XMLProperty(const string& n, const string& v = string());
+	~XMLProperty();
 
-  const string & name() const { return _name; };
-  const string & value() const { return _value; };
-  const string & set_value(const string &v) { return _value = v; };
+	const string& name() const { return _name; }
+	const string& value() const { return _value; }
+	const string& set_value(const string& v) { return _value = v; }
+
+private:
+	string _name;
+	string _value;
 };
 
-class XMLException: public std::exception
-{
+class XMLException: public std::exception {
 public:
-  explicit XMLException(const string message)
-  : message_(message)
-  {
-  }
-  
-  virtual ~XMLException() throw() {};
+	explicit XMLException(const string msg) : _message(msg) {}
+	virtual ~XMLException() throw() {}
 
-  virtual const char* what() const throw() { return message_.c_str(); }
-  virtual void Raise() const { throw *this; }
-  virtual exception * Clone() const { return new exception(*this); }
+	virtual const char* what() const throw() { return _message.c_str(); }
 
 private:
-  string message_;
+	string _message;
 };
 
 #endif /* __XML_H */