summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Array.cpp6
-rw-r--r--src/Dictionary.cpp6
-rw-r--r--src/Node.cpp1
3 files changed, 6 insertions, 7 deletions
diff --git a/src/Array.cpp b/src/Array.cpp
index 3069314..eb83ac4 100644
--- a/src/Array.cpp
+++ b/src/Array.cpp
@@ -40,7 +40,7 @@ Array::Array(plist_t node, Node* parent) : Structure(parent)
for (uint32_t i = 0; i < size; 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()
for (uint32_t i = 0; i < size; 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)
for (uint32_t i = 0; i < size; 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;
}
diff --git a/src/Dictionary.cpp b/src/Dictionary.cpp
index 2a86d59..1829e9a 100644
--- a/src/Dictionary.cpp
+++ b/src/Dictionary.cpp
@@ -40,7 +40,7 @@ Dictionary::Dictionary(plist_t node, Node* parent) : Structure(parent)
plist_dict_next_item(_node, it, &key, &subnode);
while (subnode)
{
- _map[std::string(key)] = Utils::FromPlist(subnode, this);
+ _map[std::string(key)] = Node::FromPlist(subnode, this);
subnode = NULL;
free(key);
@@ -68,7 +68,7 @@ Dictionary::Dictionary(PList::Dictionary& d) : Structure()
plist_dict_next_item(_node, it, &key, &subnode);
while (subnode)
{
- _map[std::string(key)] = Utils::FromPlist(subnode, this);
+ _map[std::string(key)] = Node::FromPlist(subnode, this);
subnode = NULL;
free(key);
@@ -96,7 +96,7 @@ Dictionary& Dictionary::operator=(PList::Dictionary& d)
plist_dict_next_item(_node, it, &key, &subnode);
while (subnode)
{
- _map[std::string(key)] = Utils::FromPlist(subnode, this);
+ _map[std::string(key)] = Node::FromPlist(subnode, this);
subnode = NULL;
free(key);
diff --git a/src/Node.cpp b/src/Node.cpp
index 3122322..9bf50ee 100644
--- a/src/Node.cpp
+++ b/src/Node.cpp
@@ -21,7 +21,6 @@
#include <stdlib.h>
#include <plist/Node.h>
#include <plist/Structure.h>
-#include <plist/Utils.h>
#include <plist/Dictionary.h>
#include <plist/Array.h>
#include <plist/Boolean.h>