From 92e88c1a01ea7b460b495e309322e780b50eb7ed Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Sat, 11 Jan 2014 15:15:52 +0100 Subject: [PATCH] Moved JsonArray::getString() and JsonHashTable::getString() into the .cpp files --- JsonArray.cpp | 6 ++++++ JsonArray.h | 10 +++------- JsonHashTable.cpp | 6 ++++++ JsonHashTable.h | 6 +----- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/JsonArray.cpp b/JsonArray.cpp index 422538bc..388daa18 100644 --- a/JsonArray.cpp +++ b/JsonArray.cpp @@ -34,4 +34,10 @@ JsonHashTable JsonArray::getHashTable(int index) { jsmntok_t* token = getToken(index); return JsonHashTable(json, token); +} + +char* JsonArray::getString(int index) +{ + jsmntok_t* token = getToken(index); + return token != 0 ? json + token->start : 0; } \ No newline at end of file diff --git a/JsonArray.h b/JsonArray.h index 3e989269..2609202d 100644 --- a/JsonArray.h +++ b/JsonArray.h @@ -25,21 +25,17 @@ public: return tokens != 0 ? tokens[0].size : 0; } - char* getString(int index) - { - jsmntok_t* token = getToken(index); - return token != 0 ? json + token->start : 0; - } + JsonArray getArray(int index); - JsonArray getArray(int index); JsonHashTable getHashTable(int index); + char* getString(int index); + private: JsonArray(char* json, jsmntok_t* tokens) : JsonObjectBase(json, tokens) { - } jsmntok_t* getToken(int index); diff --git a/JsonHashTable.cpp b/JsonHashTable.cpp index ec23d201..7783f448 100644 --- a/JsonHashTable.cpp +++ b/JsonHashTable.cpp @@ -42,4 +42,10 @@ JsonArray JsonHashTable::getArray(char* key) { jsmntok_t* token = getToken(key); return JsonArray(json, token); +} + +char* JsonHashTable::getString(char* key) +{ + jsmntok_t* token = getToken(key); + return token != 0 ? json + token->start : 0; } \ No newline at end of file diff --git a/JsonHashTable.h b/JsonHashTable.h index df8b5e9e..f9b25064 100644 --- a/JsonHashTable.h +++ b/JsonHashTable.h @@ -20,11 +20,7 @@ public: JsonHashTable() {} - char* getString(char* key) - { - jsmntok_t* token = getToken(key); - return token != 0 ? json + token->start : 0; - } + char* getString(char* key); JsonArray getArray(char* key);