1 files changed, 72 insertions, 56 deletions

diff --git a/src/Dictionary.cpp b/src/Dictionary.cpp
index 0030df6..b354945 100644
--- a/src/Dictionary.cpp
+++ b/src/Dictionary.cpp
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
+#include "plist.h"
 #include <plist/Dictionary.h>
 
 namespace PList
@@ -28,28 +29,29 @@ Dictionary::Dictionary(Node* parent) : Structure(PLIST_DICT, parent)
 {
 }
 
-Dictionary::Dictionary(plist_t node, Node* parent) : Structure(parent)
+static void dictionary_fill(Dictionary *_this, std::map<std::string,Node*> &map, plist_t node)
 {
-    _node = node;
     plist_dict_iter it = NULL;
-
-    char* key = NULL;
+    plist_dict_new_iter(node, &it);
     plist_t subnode = NULL;
-    plist_dict_new_iter(_node, &it);
-    plist_dict_next_item(_node, it, &key, &subnode);
-    while (subnode)
-    {
-        _map[std::string(key)] = Node::FromPlist(subnode, this);
-
+    do {
+        char *key = NULL;
         subnode = NULL;
+        plist_dict_next_item(node, it, &key, &subnode);
+        if (key && subnode)
+            map[std::string(key)] = Node::FromPlist(subnode, _this);
         free(key);
-        key = NULL;
-        plist_dict_next_item(_node, it, &key, &subnode);
-    }
+    } while (subnode);
     free(it);
 }
 
-Dictionary::Dictionary(PList::Dictionary& d) : Structure()
+Dictionary::Dictionary(plist_t node, Node* parent) : Structure(parent)
+{
+    _node = node;
+    dictionary_fill(this, _map, _node);
+}
+
+Dictionary::Dictionary(const PList::Dictionary& d) : Structure(d.GetParent())
 {
     for (Dictionary::iterator it = _map.begin(); it != _map.end(); it++)
     {
@@ -57,52 +59,22 @@ Dictionary::Dictionary(PList::Dictionary& d) : Structure()
         delete it->second;
     }
     _map.clear();
-
     _node = plist_copy(d.GetPlist());
-    plist_dict_iter it = NULL;
-
-    char* key = NULL;
-    plist_t subnode = NULL;
-    plist_dict_new_iter(_node, &it);
-    plist_dict_next_item(_node, it, &key, &subnode);
-    while (subnode)
-    {
-        _map[std::string(key)] = Node::FromPlist(subnode, this);
-
-        subnode = NULL;
-        free(key);
-        key = NULL;
-        plist_dict_next_item(_node, it, &key, &subnode);
-    }
-    free(it);
+    dictionary_fill(this, _map, _node);
 }
 
-Dictionary& Dictionary::operator=(PList::Dictionary& d)
+Dictionary& Dictionary::operator=(const PList::Dictionary& d)
 {
+    if (this == &d) return *this;
+
     for (Dictionary::iterator it = _map.begin(); it != _map.end(); it++)
     {
         plist_free(it->second->GetPlist());
         delete it->second;
     }
     _map.clear();
-
     _node = plist_copy(d.GetPlist());
-    plist_dict_iter it = NULL;
-
-    char* key = NULL;
-    plist_t subnode = NULL;
-    plist_dict_new_iter(_node, &it);
-    plist_dict_next_item(_node, it, &key, &subnode);
-    while (subnode)
-    {
-        _map[std::string(key)] = Node::FromPlist(subnode, this);
-
-        subnode = NULL;
-        free(key);
-        key = NULL;
-        plist_dict_next_item(_node, it, NULL, &subnode);
-    }
-    free(it);
+    dictionary_fill(this, _map, _node);
     return *this;
 }
 
@@ -115,7 +87,7 @@ Dictionary::~Dictionary()
     _map.clear();
 }
 
-Node* Dictionary::Clone()
+Node* Dictionary::Clone() const
 {
     return new Dictionary(*this);
 }
@@ -130,28 +102,72 @@ Dictionary::iterator Dictionary::Begin()
     return _map.begin();
 }
 
+Dictionary::iterator Dictionary::begin()
+{
+    return _map.begin();
+}
+
 Dictionary::iterator Dictionary::End()
 {
     return _map.end();
 }
 
+Dictionary::iterator Dictionary::end()
+{
+    return _map.end();
+}
+
+Dictionary::const_iterator Dictionary::Begin() const
+{
+    return _map.begin();
+}
+
+Dictionary::const_iterator Dictionary::begin() const
+{
+    return _map.begin();
+}
+
+Dictionary::const_iterator Dictionary::End() const
+{
+    return _map.end();
+}
+
+Dictionary::const_iterator Dictionary::end() const
+{
+    return _map.end();
+}
+
+size_t Dictionary::size() const {
+    return _map.size();
+}
+
 Dictionary::iterator Dictionary::Find(const std::string& key)
 {
     return _map.find(key);
 }
 
-Dictionary::iterator Dictionary::Insert(const std::string& key, Node* node)
+Dictionary::const_iterator Dictionary::Find(const std::string& key) const
+{
+    return _map.find(key);
+}
+
+Dictionary::iterator Dictionary::Set(const std::string& key, const Node* node)
 {
     if (node)
     {
         Node* clone = node->Clone();
         UpdateNodeParent(clone);
-        plist_dict_insert_item(_node, key.c_str(), clone->GetPlist());
+        plist_dict_set_item(_node, key.c_str(), clone->GetPlist());
         delete _map[key];
         _map[key] = clone;
         return _map.find(key);
     }
-    return iterator(NULL);
+    return iterator(this->_map.end());
+}
+
+Dictionary::iterator Dictionary::Set(const std::string& key, const Node& node)
+{
+    return Set(key, &node);
 }
 
 void Dictionary::Remove(Node* node)
@@ -164,7 +180,7 @@ void Dictionary::Remove(Node* node)
         std::string skey = key;
         free(key);
         _map.erase(skey);
-        delete node;
+        free(node);
     }
 }
 
@@ -185,4 +201,4 @@ std::string Dictionary::GetNodeKey(Node* node)
     return "";
 }
 
-};
+}  // namespace PList