diff options
| author | 2014-08-15 21:59:01 -0400 | |
|---|---|---|
| committer | 2014-09-20 00:10:46 +0200 | |
| commit | ccd6f05fe1e6cd5a1611b0df78974fa39869013d (patch) | |
| tree | 3c9e2c431d85cfb683de1724b121819aa16d29aa /include/plist | |
| parent | bc147d80b5a608b8a0478041e5198093ecd767b8 (diff) | |
| download | libplist-ccd6f05fe1e6cd5a1611b0df78974fa39869013d.tar.gz libplist-ccd6f05fe1e6cd5a1611b0df78974fa39869013d.tar.bz2 | |
Change Clone() to be const, which required constructors with const references and a const GetValue().
Diffstat (limited to 'include/plist')
| -rw-r--r-- | include/plist/Array.h | 4 | ||||
| -rw-r--r-- | include/plist/Boolean.h | 6 | ||||
| -rw-r--r-- | include/plist/Data.h | 6 | ||||
| -rw-r--r-- | include/plist/Date.h | 6 | ||||
| -rw-r--r-- | include/plist/Dictionary.h | 7 | ||||
| -rw-r--r-- | include/plist/Integer.h | 6 | ||||
| -rw-r--r-- | include/plist/Key.h | 6 | ||||
| -rw-r--r-- | include/plist/Node.h | 8 | ||||
| -rw-r--r-- | include/plist/Real.h | 6 | ||||
| -rw-r--r-- | include/plist/String.h | 6 | ||||
| -rw-r--r-- | include/plist/Uid.h | 6 |
11 files changed, 34 insertions, 33 deletions
diff --git a/include/plist/Array.h b/include/plist/Array.h index 5c65588..69ff26f 100644 --- a/include/plist/Array.h +++ b/include/plist/Array.h | |||
| @@ -33,11 +33,11 @@ class Array : public Structure | |||
| 33 | public : | 33 | public : |
| 34 | Array(Node* parent = NULL); | 34 | Array(Node* parent = NULL); |
| 35 | Array(plist_t node, Node* parent = NULL); | 35 | Array(plist_t node, Node* parent = NULL); |
| 36 | Array(Array& a); | 36 | Array(const Array& a); |
| 37 | Array& operator=(Array& a); | 37 | Array& operator=(Array& a); |
| 38 | virtual ~Array(); | 38 | virtual ~Array(); |
| 39 | 39 | ||
| 40 | Node* Clone(); | 40 | Node* Clone() const; |
| 41 | 41 | ||
| 42 | Node* operator[](unsigned int index); | 42 | Node* operator[](unsigned int index); |
| 43 | void Append(Node* node); | 43 | void Append(Node* node); |
diff --git a/include/plist/Boolean.h b/include/plist/Boolean.h index 48489da..307a1ff 100644 --- a/include/plist/Boolean.h +++ b/include/plist/Boolean.h | |||
| @@ -32,15 +32,15 @@ class Boolean : public Node | |||
| 32 | public : | 32 | public : |
| 33 | Boolean(Node* parent = NULL); | 33 | Boolean(Node* parent = NULL); |
| 34 | Boolean(plist_t node, Node* parent = NULL); | 34 | Boolean(plist_t node, Node* parent = NULL); |
| 35 | Boolean(Boolean& b); | 35 | Boolean(const Boolean& b); |
| 36 | Boolean& operator=(Boolean& b); | 36 | Boolean& operator=(Boolean& b); |
| 37 | Boolean(bool b); | 37 | Boolean(bool b); |
| 38 | virtual ~Boolean(); | 38 | virtual ~Boolean(); |
| 39 | 39 | ||
| 40 | Node* Clone(); | 40 | Node* Clone() const; |
| 41 | 41 | ||
| 42 | void SetValue(bool b); | 42 | void SetValue(bool b); |
| 43 | bool GetValue(); | 43 | bool GetValue() const; |
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | }; | 46 | }; |
diff --git a/include/plist/Data.h b/include/plist/Data.h index 3eb6031..c9c089b 100644 --- a/include/plist/Data.h +++ b/include/plist/Data.h | |||
| @@ -33,15 +33,15 @@ class Data : public Node | |||
| 33 | public : | 33 | public : |
| 34 | Data(Node* parent = NULL); | 34 | Data(Node* parent = NULL); |
| 35 | Data(plist_t node, Node* parent = NULL); | 35 | Data(plist_t node, Node* parent = NULL); |
| 36 | Data(Data& d); | 36 | Data(const 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); |
| 39 | virtual ~Data(); | 39 | virtual ~Data(); |
| 40 | 40 | ||
| 41 | Node* Clone(); | 41 | Node* Clone() const; |
| 42 | 42 | ||
| 43 | void SetValue(const std::vector<char>& buff); | 43 | void SetValue(const std::vector<char>& buff); |
| 44 | std::vector<char> GetValue(); | 44 | std::vector<char> GetValue() const; |
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| 47 | }; | 47 | }; |
diff --git a/include/plist/Date.h b/include/plist/Date.h index e505b53..510a349 100644 --- a/include/plist/Date.h +++ b/include/plist/Date.h | |||
| @@ -34,15 +34,15 @@ class Date : public Node | |||
| 34 | public : | 34 | public : |
| 35 | Date(Node* parent = NULL); | 35 | Date(Node* parent = NULL); |
| 36 | Date(plist_t node, Node* parent = NULL); | 36 | Date(plist_t node, Node* parent = NULL); |
| 37 | Date(Date& d); | 37 | Date(const Date& d); |
| 38 | Date& operator=(Date& d); | 38 | Date& operator=(Date& d); |
| 39 | Date(timeval t); | 39 | Date(timeval t); |
| 40 | virtual ~Date(); | 40 | virtual ~Date(); |
| 41 | 41 | ||
| 42 | Node* Clone(); | 42 | Node* Clone() const; |
| 43 | 43 | ||
| 44 | void SetValue(timeval t); | 44 | void SetValue(timeval t); |
| 45 | timeval GetValue(); | 45 | timeval GetValue() const; |
| 46 | }; | 46 | }; |
| 47 | 47 | ||
| 48 | }; | 48 | }; |
diff --git a/include/plist/Dictionary.h b/include/plist/Dictionary.h index c270de3..7a29f14 100644 --- a/include/plist/Dictionary.h +++ b/include/plist/Dictionary.h | |||
| @@ -34,11 +34,11 @@ class Dictionary : public Structure | |||
| 34 | public : | 34 | public : |
| 35 | Dictionary(Node* parent = NULL); | 35 | Dictionary(Node* parent = NULL); |
| 36 | Dictionary(plist_t node, Node* parent = NULL); | 36 | Dictionary(plist_t node, Node* parent = NULL); |
| 37 | Dictionary(Dictionary& d); | 37 | Dictionary(const Dictionary& d); |
| 38 | Dictionary& operator=(Dictionary& d); | 38 | Dictionary& operator=(Dictionary& d); |
| 39 | virtual ~Dictionary(); | 39 | virtual ~Dictionary(); |
| 40 | 40 | ||
| 41 | Node* Clone(); | 41 | Node* Clone() const; |
| 42 | 42 | ||
| 43 | typedef std::map<std::string,Node*>::iterator iterator; | 43 | typedef std::map<std::string,Node*>::iterator iterator; |
| 44 | 44 | ||
| @@ -46,7 +46,8 @@ public : | |||
| 46 | iterator Begin(); | 46 | iterator Begin(); |
| 47 | iterator End(); | 47 | iterator End(); |
| 48 | iterator Find(const std::string& key); | 48 | iterator Find(const std::string& key); |
| 49 | iterator Set(const std::string& key, Node* node); | 49 | iterator Set(const std::string& key, const Node* node); |
| 50 | iterator Set(const std::string& key, const Node& node); | ||
| 50 | iterator Insert(const std::string& key, Node* node) PLIST_WARN_DEPRECATED("use Set() instead"); | 51 | iterator Insert(const std::string& key, Node* node) PLIST_WARN_DEPRECATED("use Set() instead"); |
| 51 | void Remove(Node* node); | 52 | void Remove(Node* node); |
| 52 | void Remove(const std::string& key); | 53 | void Remove(const std::string& key); |
diff --git a/include/plist/Integer.h b/include/plist/Integer.h index 86af0dd..adbc39a 100644 --- a/include/plist/Integer.h +++ b/include/plist/Integer.h | |||
| @@ -32,15 +32,15 @@ class Integer : public Node | |||
| 32 | public : | 32 | public : |
| 33 | Integer(Node* parent = NULL); | 33 | Integer(Node* parent = NULL); |
| 34 | Integer(plist_t node, Node* parent = NULL); | 34 | Integer(plist_t node, Node* parent = NULL); |
| 35 | Integer(Integer& i); | 35 | Integer(const Integer& i); |
| 36 | Integer& operator=(Integer& i); | 36 | Integer& operator=(Integer& i); |
| 37 | Integer(uint64_t i); | 37 | Integer(uint64_t i); |
| 38 | virtual ~Integer(); | 38 | virtual ~Integer(); |
| 39 | 39 | ||
| 40 | Node* Clone(); | 40 | Node* Clone() const; |
| 41 | 41 | ||
| 42 | void SetValue(uint64_t i); | 42 | void SetValue(uint64_t i); |
| 43 | uint64_t GetValue(); | 43 | uint64_t GetValue() const; |
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | }; | 46 | }; |
diff --git a/include/plist/Key.h b/include/plist/Key.h index 3de09cf..c680f1c 100644 --- a/include/plist/Key.h +++ b/include/plist/Key.h | |||
| @@ -33,15 +33,15 @@ class Key : public Node | |||
| 33 | public : | 33 | public : |
| 34 | Key(Node* parent = NULL); | 34 | Key(Node* parent = NULL); |
| 35 | Key(plist_t node, Node* parent = NULL); | 35 | Key(plist_t node, Node* parent = NULL); |
| 36 | Key(Key& s); | 36 | Key(const Key& s); |
| 37 | Key& operator=(Key& s); | 37 | Key& operator=(Key& s); |
| 38 | Key(const std::string& s); | 38 | Key(const std::string& s); |
| 39 | virtual ~Key(); | 39 | virtual ~Key(); |
| 40 | 40 | ||
| 41 | Node* Clone(); | 41 | Node* Clone() const; |
| 42 | 42 | ||
| 43 | void SetValue(const std::string& s); | 43 | void SetValue(const std::string& s); |
| 44 | std::string GetValue(); | 44 | std::string GetValue() const; |
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| 47 | }; | 47 | }; |
diff --git a/include/plist/Node.h b/include/plist/Node.h index fdd26ee..9068880 100644 --- a/include/plist/Node.h +++ b/include/plist/Node.h | |||
| @@ -32,11 +32,11 @@ class Node | |||
| 32 | public : | 32 | public : |
| 33 | virtual ~Node(); | 33 | virtual ~Node(); |
| 34 | 34 | ||
| 35 | virtual Node* Clone() = 0; | 35 | virtual Node* Clone() const = 0; |
| 36 | 36 | ||
| 37 | Node * GetParent(); | 37 | Node * GetParent() const; |
| 38 | plist_type GetType(); | 38 | plist_type GetType() const; |
| 39 | plist_t GetPlist(); | 39 | plist_t GetPlist() const; |
| 40 | 40 | ||
| 41 | static Node* FromPlist(plist_t node, Node* parent = NULL); | 41 | static Node* FromPlist(plist_t node, Node* parent = NULL); |
| 42 | 42 | ||
diff --git a/include/plist/Real.h b/include/plist/Real.h index a89eb4a..c2d55f8 100644 --- a/include/plist/Real.h +++ b/include/plist/Real.h | |||
| @@ -32,15 +32,15 @@ class Real : public Node | |||
| 32 | public : | 32 | public : |
| 33 | Real(Node* parent = NULL); | 33 | Real(Node* parent = NULL); |
| 34 | Real(plist_t node, Node* parent = NULL); | 34 | Real(plist_t node, Node* parent = NULL); |
| 35 | Real(Real& d); | 35 | Real(const Real& d); |
| 36 | Real& operator=(Real& d); | 36 | Real& operator=(Real& d); |
| 37 | Real(double d); | 37 | Real(double d); |
| 38 | virtual ~Real(); | 38 | virtual ~Real(); |
| 39 | 39 | ||
| 40 | Node* Clone(); | 40 | Node* Clone() const; |
| 41 | 41 | ||
| 42 | void SetValue(double d); | 42 | void SetValue(double d); |
| 43 | double GetValue(); | 43 | double GetValue() const; |
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | }; | 46 | }; |
diff --git a/include/plist/String.h b/include/plist/String.h index a1906aa..80290b3 100644 --- a/include/plist/String.h +++ b/include/plist/String.h | |||
| @@ -33,15 +33,15 @@ class String : public Node | |||
| 33 | public : | 33 | public : |
| 34 | String(Node* parent = NULL); | 34 | String(Node* parent = NULL); |
| 35 | String(plist_t node, Node* parent = NULL); | 35 | String(plist_t node, Node* parent = NULL); |
| 36 | String(String& s); | 36 | String(const String& s); |
| 37 | String& operator=(String& s); | 37 | String& operator=(String& s); |
| 38 | String(const std::string& s); | 38 | String(const std::string& s); |
| 39 | virtual ~String(); | 39 | virtual ~String(); |
| 40 | 40 | ||
| 41 | Node* Clone(); | 41 | Node* Clone() const; |
| 42 | 42 | ||
| 43 | void SetValue(const std::string& s); | 43 | void SetValue(const std::string& s); |
| 44 | std::string GetValue(); | 44 | std::string GetValue() const; |
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| 47 | }; | 47 | }; |
diff --git a/include/plist/Uid.h b/include/plist/Uid.h index e11b022..2d8375b 100644 --- a/include/plist/Uid.h +++ b/include/plist/Uid.h | |||
| @@ -32,15 +32,15 @@ class Uid : public Node | |||
| 32 | public : | 32 | public : |
| 33 | Uid(Node* parent = NULL); | 33 | Uid(Node* parent = NULL); |
| 34 | Uid(plist_t node, Node* parent = NULL); | 34 | Uid(plist_t node, Node* parent = NULL); |
| 35 | Uid(Uid& i); | 35 | Uid(const Uid& i); |
| 36 | Uid& operator=(Uid& i); | 36 | Uid& operator=(Uid& i); |
| 37 | Uid(uint64_t i); | 37 | Uid(uint64_t i); |
| 38 | virtual ~Uid(); | 38 | virtual ~Uid(); |
| 39 | 39 | ||
| 40 | Node* Clone(); | 40 | Node* Clone() const; |
| 41 | 41 | ||
| 42 | void SetValue(uint64_t i); | 42 | void SetValue(uint64_t i); |
| 43 | uint64_t GetValue(); | 43 | uint64_t GetValue() const; |
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | }; | 46 | }; |
