feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Renamed JsonObjectBase into JsonPrintable

Browse Source
This commit is contained in:
Benoît Blanchon
2014-07-17 13:16:14 +02:00
parent 5e1697f47b
commit 45c9ba1191
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
JsonGenerator/JsonArrayBase.h
View File

@ -5,13 +5,13 @@
#pragma once
#include "JsonObjectBase.h"
#include "JsonPrintable.h"
namespace ArduinoJson
{
namespace Generator
{
class JsonArrayBase : public JsonObjectBase
class JsonArrayBase : public JsonPrintable
{
public:
JsonArrayBase(Internals::JsonValue* items, int capacity)
@ -39,7 +39,7 @@ namespace ArduinoJson
virtual size_t printTo(Print& p) const;
using JsonObjectBase::printTo;
using JsonPrintable::printTo;
private:
Internals::JsonValue* items;

6
JsonGenerator/JsonHashTableBase.h
View File

@ -5,14 +5,14 @@
#pragma once
#include "JsonObjectBase.h"
#include "JsonPrintable.h"
#include "EscapedString.h"
namespace ArduinoJson
{
namespace Generator
{
class JsonHashTableBase : public JsonObjectBase
class JsonHashTableBase : public JsonPrintable
{
public:
@ -36,7 +36,7 @@ namespace ArduinoJson
count++;
}
using JsonObjectBase::printTo;
using JsonPrintable::printTo;
virtual size_t printTo(Print& p) const;

2
JsonGenerator/JsonObjectBase.h → JsonGenerator/JsonPrintable.h
View File

@ -13,7 +13,7 @@ namespace ArduinoJson
{
namespace Generator
{
class JsonObjectBase : public Printable
class JsonPrintable : public Printable
{
public:

4
JsonGeneratorTests/JsonArrayTests.cpp
View File

@ -146,9 +146,9 @@ namespace JsonGeneratorTests
private:
void addNested(JsonObjectBase& value)
void addNested(Printable& value)
{
arr.add<JsonObjectBase&>(value);
arr.add<Printable&>(value);
}
template<typename T>

2
JsonGeneratorTests/JsonGeneratorTests.vcxproj
View File

@ -102,7 +102,7 @@
<ClInclude Include="..\JsonGenerator\JsonArrayBase.h" />
<ClInclude Include="..\JsonGenerator\JsonHashTable.h" />
<ClInclude Include="..\JsonGenerator\JsonHashTableBase.h" />
<ClInclude Include="..\JsonGenerator\JsonObjectBase.h" />
<ClInclude Include="..\JsonGenerator\JsonPrintable.h" />
<ClInclude Include="..\JsonGenerator\JsonValue.h" />
<ClInclude Include="..\JsonGenerator\Print.h" />
<ClInclude Include="..\JsonGenerator\Printable.h" />

6
JsonGeneratorTests/JsonGeneratorTests.vcxproj.filters
View File

@ -56,9 +56,6 @@
<ClInclude Include="..\JsonGenerator\JsonHashTable.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\JsonGenerator\JsonObjectBase.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\JsonGenerator\JsonValue.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -80,5 +77,8 @@
<ClInclude Include="..\JsonGenerator\JsonArrayBase.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\JsonGenerator\JsonPrintable.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

4
JsonGeneratorTests/JsonHashTableTests.cpp
View File

@ -97,9 +97,9 @@ namespace JsonGeneratorTests
private:
void addNested(const char* key, JsonObjectBase& value)
void addNested(const char* key, Printable& value)
{
hash.add<JsonObjectBase&>(key, value);
hash.add<Printable&>(key, value);
}
template<typename T>