From b7885ea84a82eae4df156c74e60e0a2535b068d5 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 6 Jan 2014 18:45:36 +0000 Subject: [PATCH] Simplify XML_Node::addChild implementations --- src/base/xml.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/base/xml.cpp b/src/base/xml.cpp index a25eb7aa3..30c73c0bf 100644 --- a/src/base/xml.cpp +++ b/src/base/xml.cpp @@ -415,24 +415,12 @@ XML_Node& XML_Node::mergeAsChild(XML_Node& node) XML_Node& XML_Node::addChild(const XML_Node& node) { - XML_Node* xx = new XML_Node(node); - m_children.push_back(xx); - m_nchildren = static_cast(m_children.size()); - m_childindex.insert(pair(xx->name(), xx)); - xx->setRoot(root()); - xx->setParent(this); - return *m_children.back(); + return mergeAsChild(*(new XML_Node(node))); } XML_Node& XML_Node::addChild(const std::string& sname) { - XML_Node* xxx = new XML_Node(sname, this); - m_children.push_back(xxx); - m_nchildren = m_children.size(); - m_childindex.insert(pair(sname, xxx)); - xxx->setRoot(root()); - xxx->setParent(this); - return *m_children.back(); + return mergeAsChild(*(new XML_Node(sname, this))); } XML_Node& XML_Node::addChild(const std::string& name_, const std::string& value_)