mirror of
				https://github.com/eledio-devices/thirdparty-ArduinoJson.git
				synced 2025-10-31 16:14:11 +01:00 
			
		
		
		
	Moved JsonArray::getString() and JsonHashTable::getString() into the .cpp files
This commit is contained in:
		| @@ -35,3 +35,9 @@ 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; | ||||
| } | ||||
							
								
								
									
										10
									
								
								JsonArray.h
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								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);	 | ||||
|  | ||||
| 	JsonHashTable getHashTable(int index); | ||||
|  | ||||
| 	char* getString(int index); | ||||
|  | ||||
| private: | ||||
|  | ||||
| 	JsonArray(char* json, jsmntok_t* tokens) | ||||
| 		: JsonObjectBase(json, tokens) | ||||
| 	{ | ||||
|  | ||||
| 	} | ||||
|  | ||||
| 	jsmntok_t* getToken(int index); | ||||
|   | ||||
| @@ -43,3 +43,9 @@ 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; | ||||
| } | ||||
| @@ -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); | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user