diff options
Diffstat (limited to 'include/plist')
| -rw-r--r-- | include/plist/Array.h | 4 | ||||
| -rw-r--r-- | include/plist/Boolean.h | 4 | ||||
| -rw-r--r-- | include/plist/Data.h | 4 | ||||
| -rw-r--r-- | include/plist/Date.h | 4 | ||||
| -rw-r--r-- | include/plist/Dictionary.h | 4 | ||||
| -rw-r--r-- | include/plist/Integer.h | 4 | ||||
| -rw-r--r-- | include/plist/Node.h | 9 | ||||
| -rw-r--r-- | include/plist/Real.h | 4 | ||||
| -rw-r--r-- | include/plist/String.h | 4 | ||||
| -rw-r--r-- | include/plist/Structure.h | 4 | ||||
| -rw-r--r-- | include/plist/Utils.h | 1 |
11 files changed, 25 insertions, 21 deletions
diff --git a/include/plist/Array.h b/include/plist/Array.h index de4860e..8fd07cd 100644 --- a/include/plist/Array.h +++ b/include/plist/Array.h | |||
| @@ -31,8 +31,8 @@ namespace PList | |||
| 31 | class Array : public Structure | 31 | class Array : public Structure |
| 32 | { | 32 | { |
| 33 | public : | 33 | public : |
| 34 | Array(); | 34 | Array(Node* parent = NULL); |
| 35 | Array(plist_t node); | 35 | Array(plist_t node, Node* parent = NULL); |
| 36 | Array(Array& a); | 36 | Array(Array& a); |
| 37 | Array& operator=(Array& a); | 37 | Array& operator=(Array& a); |
| 38 | virtual ~Array(); | 38 | virtual ~Array(); |
diff --git a/include/plist/Boolean.h b/include/plist/Boolean.h index b902171..149f8da 100644 --- a/include/plist/Boolean.h +++ b/include/plist/Boolean.h | |||
| @@ -30,8 +30,8 @@ namespace PList | |||
| 30 | class Boolean : public Node | 30 | class Boolean : public Node |
| 31 | { | 31 | { |
| 32 | public : | 32 | public : |
| 33 | Boolean(); | 33 | Boolean(Node* parent = NULL); |
| 34 | Boolean(plist_t node); | 34 | Boolean(plist_t node, Node* parent = NULL); |
| 35 | Boolean(Boolean& b); | 35 | Boolean(Boolean& b); |
| 36 | Boolean& operator=(Boolean& b); | 36 | Boolean& operator=(Boolean& b); |
| 37 | Boolean(bool b); | 37 | Boolean(bool b); |
diff --git a/include/plist/Data.h b/include/plist/Data.h index 3db98f7..59a0096 100644 --- a/include/plist/Data.h +++ b/include/plist/Data.h | |||
| @@ -31,8 +31,8 @@ namespace PList | |||
| 31 | class Data : public Node | 31 | class Data : public Node |
| 32 | { | 32 | { |
| 33 | public : | 33 | public : |
| 34 | Data(); | 34 | Data(Node* parent = NULL); |
| 35 | Data(plist_t node); | 35 | Data(plist_t node, Node* parent = NULL); |
| 36 | Data(Data& d); | 36 | Data(Data& d); |
| 37 | Data& operator=(Data& d); | 37 | Data& operator=(Data& d); |
| 38 | Data(const std::vector<char>& buff); | 38 | Data(const std::vector<char>& buff); |
diff --git a/include/plist/Date.h b/include/plist/Date.h index d3cd605..22565ef 100644 --- a/include/plist/Date.h +++ b/include/plist/Date.h | |||
| @@ -31,8 +31,8 @@ namespace PList | |||
| 31 | class Date : public Node | 31 | class Date : public Node |
| 32 | { | 32 | { |
| 33 | public : | 33 | public : |
| 34 | Date(); | 34 | Date(Node* parent = NULL); |
| 35 | Date(plist_t node); | 35 | Date(plist_t node, Node* parent = NULL); |
| 36 | Date(Date& d); | 36 | Date(Date& d); |
| 37 | Date& operator=(Date& d); | 37 | Date& operator=(Date& d); |
| 38 | Date(timeval t); | 38 | Date(timeval t); |
diff --git a/include/plist/Dictionary.h b/include/plist/Dictionary.h index dbb27d1..38604c8 100644 --- a/include/plist/Dictionary.h +++ b/include/plist/Dictionary.h | |||
| @@ -32,8 +32,8 @@ namespace PList | |||
| 32 | class Dictionary : public Structure | 32 | class Dictionary : public Structure |
| 33 | { | 33 | { |
| 34 | public : | 34 | public : |
| 35 | Dictionary(); | 35 | Dictionary(Node* parent = NULL); |
| 36 | Dictionary(plist_t node); | 36 | Dictionary(plist_t node, Node* parent = NULL); |
| 37 | Dictionary(Dictionary& d); | 37 | Dictionary(Dictionary& d); |
| 38 | Dictionary& operator=(Dictionary& d); | 38 | Dictionary& operator=(Dictionary& d); |
| 39 | virtual ~Dictionary(); | 39 | virtual ~Dictionary(); |
diff --git a/include/plist/Integer.h b/include/plist/Integer.h index a86d0ca..fefcea1 100644 --- a/include/plist/Integer.h +++ b/include/plist/Integer.h | |||
| @@ -30,8 +30,8 @@ namespace PList | |||
| 30 | class Integer : public Node | 30 | class Integer : public Node |
| 31 | { | 31 | { |
| 32 | public : | 32 | public : |
| 33 | Integer(); | 33 | Integer(Node* parent = NULL); |
| 34 | Integer(plist_t node); | 34 | Integer(plist_t node, Node* parent = NULL); |
| 35 | Integer(Integer& i); | 35 | Integer(Integer& i); |
| 36 | Integer& operator=(Integer& i); | 36 | Integer& operator=(Integer& i); |
| 37 | Integer(uint64_t i); | 37 | Integer(uint64_t i); |
diff --git a/include/plist/Node.h b/include/plist/Node.h index 702d018..6e5411a 100644 --- a/include/plist/Node.h +++ b/include/plist/Node.h | |||
| @@ -33,15 +33,18 @@ class Node | |||
| 33 | virtual ~Node(); | 33 | virtual ~Node(); |
| 34 | 34 | ||
| 35 | virtual Node* Clone() = 0; | 35 | virtual Node* Clone() = 0; |
| 36 | Node * GetParent(); | ||
| 37 | void SetParent(Node* parent); | ||
| 36 | 38 | ||
| 37 | plist_type GetType(); | 39 | plist_type GetType(); |
| 38 | plist_t GetPlist(); | 40 | plist_t GetPlist(); |
| 39 | 41 | ||
| 40 | protected: | 42 | protected: |
| 41 | Node(); | 43 | Node(Node* parent = NULL); |
| 42 | Node(plist_t node); | 44 | Node(plist_t node, Node* parent = NULL); |
| 43 | Node(plist_type type); | 45 | Node(plist_type type, Node* parent = NULL); |
| 44 | plist_t _node; | 46 | plist_t _node; |
| 47 | Node* _parent; | ||
| 45 | }; | 48 | }; |
| 46 | 49 | ||
| 47 | }; | 50 | }; |
diff --git a/include/plist/Real.h b/include/plist/Real.h index b011c7a..755842e 100644 --- a/include/plist/Real.h +++ b/include/plist/Real.h | |||
| @@ -30,8 +30,8 @@ namespace PList | |||
| 30 | class Real : public Node | 30 | class Real : public Node |
| 31 | { | 31 | { |
| 32 | public : | 32 | public : |
| 33 | Real(); | 33 | Real(Node* parent = NULL); |
| 34 | Real(plist_t node); | 34 | Real(plist_t node, Node* parent = NULL); |
| 35 | Real(Real& d); | 35 | Real(Real& d); |
| 36 | Real& operator=(Real& d); | 36 | Real& operator=(Real& d); |
| 37 | Real(double d); | 37 | Real(double d); |
diff --git a/include/plist/String.h b/include/plist/String.h index 64181f3..58b8619 100644 --- a/include/plist/String.h +++ b/include/plist/String.h | |||
| @@ -31,8 +31,8 @@ namespace PList | |||
| 31 | class String : public Node | 31 | class String : public Node |
| 32 | { | 32 | { |
| 33 | public : | 33 | public : |
| 34 | String(); | 34 | String(Node* parent = NULL); |
| 35 | String(plist_t node); | 35 | String(plist_t node, Node* parent = NULL); |
| 36 | String(String& s); | 36 | String(String& s); |
| 37 | String& operator=(String& s); | 37 | String& operator=(String& s); |
| 38 | String(const std::string& s); | 38 | String(const std::string& s); |
diff --git a/include/plist/Structure.h b/include/plist/Structure.h index 4910439..6f100cc 100644 --- a/include/plist/Structure.h +++ b/include/plist/Structure.h | |||
| @@ -40,8 +40,8 @@ class Structure : public Node | |||
| 40 | std::vector<char> ToBin(); | 40 | std::vector<char> ToBin(); |
| 41 | 41 | ||
| 42 | protected: | 42 | protected: |
| 43 | Structure(); | 43 | Structure(Node* parent = NULL); |
| 44 | Structure(plist_type type); | 44 | Structure(plist_type type, Node* parent = NULL); |
| 45 | 45 | ||
| 46 | private: | 46 | private: |
| 47 | Structure(Structure& s); | 47 | Structure(Structure& s); |
diff --git a/include/plist/Utils.h b/include/plist/Utils.h index 54baf02..65bec7e 100644 --- a/include/plist/Utils.h +++ b/include/plist/Utils.h | |||
| @@ -30,6 +30,7 @@ namespace PList | |||
| 30 | class Utils | 30 | class Utils |
| 31 | { | 31 | { |
| 32 | public: | 32 | public: |
| 33 | static Node* FromPlist(plist_t node, Node* parent = NULL); | ||
| 33 | static Structure* FromXml(const std::string& in); | 34 | static Structure* FromXml(const std::string& in); |
| 34 | static Structure* FromBin(const std::vector<char>& in); | 35 | static Structure* FromBin(const std::vector<char>& in); |
| 35 | 36 | ||
