Commit e91836fb authored by Jonathan Beck's avatar Jonathan Beck

Fix removal of the Utils class.

parent 8c6a809f
...@@ -40,7 +40,7 @@ Array::Array(plist_t node, Node* parent) : Structure(parent) ...@@ -40,7 +40,7 @@ Array::Array(plist_t node, Node* parent) : Structure(parent)
for (uint32_t i = 0; i < size; i++) for (uint32_t i = 0; i < size; i++)
{ {
plist_t subnode = plist_array_get_item(_node, i); plist_t subnode = plist_array_get_item(_node, i);
_array.push_back( Utils::FromPlist(subnode, this) ); _array.push_back( Node::FromPlist(subnode, this) );
} }
} }
...@@ -53,7 +53,7 @@ Array::Array(PList::Array& a) : Structure() ...@@ -53,7 +53,7 @@ Array::Array(PList::Array& a) : Structure()
for (uint32_t i = 0; i < size; i++) for (uint32_t i = 0; i < size; i++)
{ {
plist_t subnode = plist_array_get_item(_node, i); plist_t subnode = plist_array_get_item(_node, i);
_array.push_back( Utils::FromPlist(subnode, this) ); _array.push_back( Node::FromPlist(subnode, this) );
} }
} }
...@@ -72,7 +72,7 @@ Array& Array::operator=(PList::Array& a) ...@@ -72,7 +72,7 @@ Array& Array::operator=(PList::Array& a)
for (uint32_t i = 0; i < size; i++) for (uint32_t i = 0; i < size; i++)
{ {
plist_t subnode = plist_array_get_item(_node, i); plist_t subnode = plist_array_get_item(_node, i);
_array.push_back( Utils::FromPlist(subnode, this) ); _array.push_back( Node::FromPlist(subnode, this) );
} }
return *this; return *this;
} }
......
...@@ -40,7 +40,7 @@ Dictionary::Dictionary(plist_t node, Node* parent) : Structure(parent) ...@@ -40,7 +40,7 @@ Dictionary::Dictionary(plist_t node, Node* parent) : Structure(parent)
plist_dict_next_item(_node, it, &key, &subnode); plist_dict_next_item(_node, it, &key, &subnode);
while (subnode) while (subnode)
{ {
_map[std::string(key)] = Utils::FromPlist(subnode, this); _map[std::string(key)] = Node::FromPlist(subnode, this);
subnode = NULL; subnode = NULL;
free(key); free(key);
...@@ -68,7 +68,7 @@ Dictionary::Dictionary(PList::Dictionary& d) : Structure() ...@@ -68,7 +68,7 @@ Dictionary::Dictionary(PList::Dictionary& d) : Structure()
plist_dict_next_item(_node, it, &key, &subnode); plist_dict_next_item(_node, it, &key, &subnode);
while (subnode) while (subnode)
{ {
_map[std::string(key)] = Utils::FromPlist(subnode, this); _map[std::string(key)] = Node::FromPlist(subnode, this);
subnode = NULL; subnode = NULL;
free(key); free(key);
...@@ -96,7 +96,7 @@ Dictionary& Dictionary::operator=(PList::Dictionary& d) ...@@ -96,7 +96,7 @@ Dictionary& Dictionary::operator=(PList::Dictionary& d)
plist_dict_next_item(_node, it, &key, &subnode); plist_dict_next_item(_node, it, &key, &subnode);
while (subnode) while (subnode)
{ {
_map[std::string(key)] = Utils::FromPlist(subnode, this); _map[std::string(key)] = Node::FromPlist(subnode, this);
subnode = NULL; subnode = NULL;
free(key); free(key);
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <plist/Node.h> #include <plist/Node.h>
#include <plist/Structure.h> #include <plist/Structure.h>
#include <plist/Utils.h>
#include <plist/Dictionary.h> #include <plist/Dictionary.h>
#include <plist/Array.h> #include <plist/Array.h>
#include <plist/Boolean.h> #include <plist/Boolean.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment