COMMON: Use PtrList to store the child nodes in XMLNode

xoreos · Oct 26, 2016 · 2ba2ee9 · 2ba2ee9
1 parent ceebc5f
commit 2ba2ee9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/src/common/xml.cpp b/src/common/xml.cpp
@@ -99,24 +99,10 @@ const XMLNode &XMLParser::getRoot() const {
 
 
 XMLNode::XMLNode(_xmlNode &node, bool makeLower, XMLNode *parent) : _parent(parent) {
-	try {
-
-		load(node, makeLower);
-
-	} catch (...) {
-		clean();
-
-		throw;
-	}
+	load(node, makeLower);
 }
 
 XMLNode::~XMLNode() {
-	clean();
-}
-
-void XMLNode::clean() {
-	for (Children::iterator c = _children.begin(); c != _children.end(); ++c)
-		delete *c;
 }
 
 const UString &XMLNode::getName() const {

diff --git a/src/common/xml.h b/src/common/xml.h
@@ -31,6 +31,7 @@
 #include <boost/noncopyable.hpp>
 
 #include "src/common/scopedptr.h"
+#include "src/common/ptrlist.h"
 #include "src/common/ustring.h"
 
 struct _xmlNode;
@@ -62,7 +63,7 @@ class XMLParser : boost::noncopyable {
 class XMLNode : boost::noncopyable {
 public:
 	typedef std::map<UString, UString> Properties;
-	typedef std::list<const XMLNode *> Children;
+	typedef PtrList<const XMLNode> Children;
 
 	const UString &getName() const;
 	const UString &getContent() const;
@@ -100,7 +101,7 @@ class XMLNode : boost::noncopyable {
 	~XMLNode();
 
 	void load(_xmlNode &node, bool makeLower);
-	void clean();
+
 
 	friend class XMLParser;