From f3b3d937ae274d0eec4a737d11ba19a7f4ceef03 Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Tue, 1 Sep 2015 14:47:57 +0200
Subject: =?UTF-8?q?Use=20unique=5Fptr=20to=20store=20the=20XmlNode?=
 =?UTF-8?q?=E2=80=99s=20children?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also fix some constness things
---
 louloulibs/xmpp/xmpp_stanza.cpp | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

(limited to 'louloulibs/xmpp/xmpp_stanza.cpp')

diff --git a/louloulibs/xmpp/xmpp_stanza.cpp b/louloulibs/xmpp/xmpp_stanza.cpp
index aec91a7..3ba8483 100644
--- a/louloulibs/xmpp/xmpp_stanza.cpp
+++ b/louloulibs/xmpp/xmpp_stanza.cpp
@@ -103,17 +103,8 @@ XmlNode::XmlNode(const std::string& name):
 {
 }
 
-XmlNode::~XmlNode()
-{
-  this->delete_all_children();
-}
-
 void XmlNode::delete_all_children()
 {
-  for (auto& child: this->children)
-    {
-      delete child;
-    }
   this->children.clear();
 }
 
@@ -152,43 +143,44 @@ std::string XmlNode::get_tail() const
   return this->tail;
 }
 
-XmlNode* XmlNode::get_child(const std::string& name, const std::string& xmlns) const
+const XmlNode* XmlNode::get_child(const std::string& name, const std::string& xmlns) const
 {
-  for (auto& child: this->children)
+  for (const auto& child: this->children)
     {
       if (child->name == name && child->get_tag("xmlns") == xmlns)
-        return child;
+        return child.get();
     }
   return nullptr;
 }
 
-std::vector<XmlNode*> XmlNode::get_children(const std::string& name, const std::string& xmlns) const
+std::vector<const XmlNode*> XmlNode::get_children(const std::string& name, const std::string& xmlns) const
 {
-  std::vector<XmlNode*> res;
-  for (auto& child: this->children)
+  std::vector<const XmlNode*> res;
+  for (const auto& child: this->children)
     {
       if (child->name == name && child->get_tag("xmlns") == xmlns)
-        res.push_back(child);
+        res.push_back(child.get());
     }
   return res;
 }
 
-XmlNode* XmlNode::add_child(XmlNode* child)
+XmlNode* XmlNode::add_child(std::unique_ptr<XmlNode> child)
 {
   child->parent = this;
-  this->children.push_back(child);
-  return child;
+  auto ret = child.get();
+  this->children.push_back(std::move(child));
+  return ret;
 }
 
 XmlNode* XmlNode::add_child(XmlNode&& child)
 {
-  XmlNode* new_node = new XmlNode(std::move(child));
-  return this->add_child(new_node);
+  auto new_node = std::make_unique<XmlNode>(std::move(child));
+  return this->add_child(std::move(new_node));
 }
 
 XmlNode* XmlNode::get_last_child() const
 {
-  return this->children.back();
+  return this->children.back().get();
 }
 
 XmlNode* XmlNode::get_parent() const
-- 
cgit v1.2.3