summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jonathan Beck2009-11-11 21:40:26 +0100
committerGravatar Jonathan Beck2009-11-11 21:40:26 +0100
commite91836fb3169cbca7c58c2680b591ec7f081b6b3 (patch)
tree88f81ef95e830fac10a7906dcd278f1d9a23a687
parent8c6a809fafa6befff7e2b1adc3df2bdb47042dd1 (diff)
downloadlibplist-e91836fb3169cbca7c58c2680b591ec7f081b6b3.tar.gz
libplist-e91836fb3169cbca7c58c2680b591ec7f081b6b3.tar.bz2
Fix removal of the Utils class.
-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)
40 for (uint32_t i = 0; i < size; i++) 40 for (uint32_t i = 0; i < size; i++)
41 { 41 {
42 plist_t subnode = plist_array_get_item(_node, i); 42 plist_t subnode = plist_array_get_item(_node, i);
43 _array.push_back( Utils::FromPlist(subnode, this) ); 43 _array.push_back( Node::FromPlist(subnode, this) );
44 } 44 }
45} 45}
46 46
@@ -53,7 +53,7 @@ Array::Array(PList::Array& a) : Structure()
53 for (uint32_t i = 0; i < size; i++) 53 for (uint32_t i = 0; i < size; i++)
54 { 54 {
55 plist_t subnode = plist_array_get_item(_node, i); 55 plist_t subnode = plist_array_get_item(_node, i);
56 _array.push_back( Utils::FromPlist(subnode, this) ); 56 _array.push_back( Node::FromPlist(subnode, this) );
57 } 57 }
58} 58}
59 59
@@ -72,7 +72,7 @@ Array& Array::operator=(PList::Array& a)
72 for (uint32_t i = 0; i < size; i++) 72 for (uint32_t i = 0; i < size; i++)
73 { 73 {
74 plist_t subnode = plist_array_get_item(_node, i); 74 plist_t subnode = plist_array_get_item(_node, i);
75 _array.push_back( Utils::FromPlist(subnode, this) ); 75 _array.push_back( Node::FromPlist(subnode, this) );
76 } 76 }
77 return *this; 77 return *this;
78} 78}
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)
40 plist_dict_next_item(_node, it, &key, &subnode); 40 plist_dict_next_item(_node, it, &key, &subnode);
41 while (subnode) 41 while (subnode)
42 { 42 {
43 _map[std::string(key)] = Utils::FromPlist(subnode, this); 43 _map[std::string(key)] = Node::FromPlist(subnode, this);
44 44
45 subnode = NULL; 45 subnode = NULL;
46 free(key); 46 free(key);
@@ -68,7 +68,7 @@ Dictionary::Dictionary(PList::Dictionary& d) : Structure()
68 plist_dict_next_item(_node, it, &key, &subnode); 68 plist_dict_next_item(_node, it, &key, &subnode);
69 while (subnode) 69 while (subnode)
70 { 70 {
71 _map[std::string(key)] = Utils::FromPlist(subnode, this); 71 _map[std::string(key)] = Node::FromPlist(subnode, this);
72 72
73 subnode = NULL; 73 subnode = NULL;
74 free(key); 74 free(key);
@@ -96,7 +96,7 @@ Dictionary& Dictionary::operator=(PList::Dictionary& d)
96 plist_dict_next_item(_node, it, &key, &subnode); 96 plist_dict_next_item(_node, it, &key, &subnode);
97 while (subnode) 97 while (subnode)
98 { 98 {
99 _map[std::string(key)] = Utils::FromPlist(subnode, this); 99 _map[std::string(key)] = Node::FromPlist(subnode, this);
100 100
101 subnode = NULL; 101 subnode = NULL;
102 free(key); 102 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 @@
21#include <stdlib.h> 21#include <stdlib.h>
22#include <plist/Node.h> 22#include <plist/Node.h>
23#include <plist/Structure.h> 23#include <plist/Structure.h>
24#include <plist/Utils.h>
25#include <plist/Dictionary.h> 24#include <plist/Dictionary.h>
26#include <plist/Array.h> 25#include <plist/Array.h>
27#include <plist/Boolean.h> 26#include <plist/Boolean.h>