bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-22 14:57:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replaced public inheritance by protected and private

Browse Source
This commit is contained in:
Benoit Blanchon
2014-07-19 14:41:29 +02:00
parent b278d7711b
commit e94575b4b8
12 changed files with 58 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
JsonParser/JsonObject.h
View File

@ -14,7 +14,7 @@ namespace ArduinoJson
{
class JsonArray;
class JsonObject : public JsonToken
class JsonObject : JsonValue
{
public:
JsonObject()
@ -22,8 +22,8 @@ namespace ArduinoJson
}
JsonObject(JsonToken token)
: JsonToken(token)
JsonObject(JsonValue value)
: JsonValue(value)
{
}
@ -33,14 +33,11 @@ namespace ArduinoJson
return isObject();
}
JsonValue operator[](const char* key)
{
return getValue(key);
}
JsonValue operator[](const char* key);
bool containsKey(const char* key)
{
return getValue(key).success();
return operator[](key).success();
}
JsonObjectIterator begin()
@ -57,37 +54,33 @@ namespace ArduinoJson
DEPRECATED bool getBool(const char* key)
{
return getValue(key);
return operator[](key);
}
DEPRECATED double getDouble(const char* key)
{
return getValue(key);
return operator[](key);
}
DEPRECATED JsonObject getHashTable(const char* key)
{
return getValue(key);
return operator[](key);
}
DEPRECATED long getLong(const char* key)
{
return getValue(key);
return operator[](key);
}
DEPRECATED char* getString(const char* key)
{
return getValue(key);
return operator[](key);
}
static JsonObject null()
{
return JsonObject(JsonToken::null());
}
private:
JsonValue getValue(const char* key);
};
typedef JsonObject JsonHashTable;