diff options
author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2013-09-26 07:12:21 -0700 |
---|---|---|
committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2013-09-26 07:12:21 -0700 |
commit | ecfca6b1197658afb85fffd6f6ac9e92311a4b07 (patch) | |
tree | d4b2d1a8717db60a1a2a5767c0ffe21dd79f158f /include | |
parent | ffdaa0590d33ea89d116f6c56df2474cc0675ec9 (diff) |
Renamed member class to hashmember, because we're going to use the member class for specifying class information
Diffstat (limited to 'include')
-rw-r--r-- | include/hashmember.h (renamed from include/member.h) | 32 | ||||
-rw-r--r-- | include/value.h | 10 |
2 files changed, 21 insertions, 21 deletions
diff --git a/include/member.h b/include/hashmember.h index 5166535..2724836 100644 --- a/include/member.h +++ b/include/hashmember.h @@ -1,5 +1,5 @@ /** - * Member.h + * HashMember.h * * When you're accessing members in an array or an object, you're * doing this via an internal member object. This is an object that @@ -27,20 +27,20 @@ class Value; * Member class */ template <typename Type> -class Member +class HashMember { public: /** * Destructor */ - virtual ~Member() {} + virtual ~HashMember() {} /** * Assign a value object to the array * @param value * @return Member */ - Member &operator=(const Value &value) + HashMember &operator=(const Value &value) { // set property in parent array _base.set(_index, value); @@ -119,9 +119,9 @@ public: * Array access operator * This can be used for accessing arrays * @param index - * @return Member + * @return HashMember */ - Member operator[](int index) + HashMember operator[](int index) { return _base.get(_index)[index].add(this); } @@ -130,9 +130,9 @@ public: * Array access operator * This can be used for accessing associative arrays * @param key - * @return Member + * @return HashMember */ - Member operator[](const std::string &key) + HashMember operator[](const std::string &key) { return _base.get(_index)[key].add(this); } @@ -141,9 +141,9 @@ public: * Array access operator * This can be used for accessing associative arrays * @param key - * @return Member + * @return HashMember */ - Member operator[](const char *key) + HashMember operator[](const char *key) { return _base.get(_index)[key].add(this); } @@ -154,20 +154,20 @@ private: * @param base Base value * @param index Index in the array */ - Member(const Value *base, Type index) : _base(*base), _index(index) {} + HashMember(const Value *base, Type index) : _base(*base), _index(index) {} /** * Protected copy constructor * @param value Other element */ - Member(const Member<Type> &member) : _base(member._base), _index(member._index), _parent(member._parent) {} + HashMember(const HashMember<Type> &member) : _base(member._base), _index(member._index), _parent(member._parent) {} /** * Add parent * @param parent - * @return Member + * @return HashMember */ - Member &add(Member *parent) + HashMember &add(HashMember *parent) { _parent = parent; return *this; @@ -187,9 +187,9 @@ private: /** * Parent member (in case of nested members) - * @var Member + * @var HashMember */ - Member *_parent = nullptr; + HashMember *_parent = nullptr; /** * Only value objects may construct members diff --git a/include/value.h b/include/value.h index f47304a..652b7ef 100644 --- a/include/value.h +++ b/include/value.h @@ -31,7 +31,7 @@ namespace Php { /** * Forward definitions */ -template <class Type> class Member; +template <class Type> class HashMember; /** * Class definition @@ -467,7 +467,7 @@ public: * @param index * @return Member */ - Member<int> operator[](int index); + HashMember<int> operator[](int index); /** * Array access operator @@ -475,15 +475,15 @@ public: * @param key * @return Member */ - Member<std::string> operator[](const std::string &key); + HashMember<std::string> operator[](const std::string &key); /** * Array access operator * This can be used for accessing associative arrays * @param key - * @return Member + * @return HashMember */ - Member<std::string> operator[](const char *key); + HashMember<std::string> operator[](const char *key); protected: |