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

Made EscapedString pure static

Browse Source
This commit is contained in:
Benoit Blanchon
2014-08-01 15:32:05 +02:00
parent 158f4600fb
commit 09294cb5e6
4 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
JsonGenerator/EscapedString.h
View File

@ -14,20 +14,6 @@ namespace ArduinoJson
class EscapedString
{
public:
EscapedString(const char* s)
: rawString(s)
{
}
size_t printTo(Print& p) const
{
return printTo(rawString, p);
}
private:
const char* rawString;
static size_t printTo(const char*, Print&);
};
}

2
JsonGenerator/JsonObjectBase.cpp
View File

@ -20,7 +20,7 @@ size_t JsonObjectBase::printTo(Print& p) const
const KeyValuePair* current = items;
for (int i = count; i > 0; i--)
{
n += EscapedString(current->key).printTo(p);
n += EscapedString::printTo(current->key, p);
n += p.write(':');
n += current->value.printTo(p);

2
JsonGenerator/JsonValue.cpp
View File

@ -31,5 +31,5 @@ size_t JsonValue::printPrintableTo(const Content& c, Print& p)
size_t JsonValue::printStringTo(const Content& c, Print& p)
{
return EscapedString(c.asString).printTo(p);
return EscapedString::printTo(c.asString, p);
}

3
JsonGeneratorTests/EscapedStringTests.cpp
View File

@ -83,8 +83,7 @@ namespace JsonGeneratorTests
void whenInputIs(const char* input)
{
StringBuilder sb(buffer, sizeof(buffer));
EscapedString escapedString = input;
returnValue = escapedString.printTo(sb);
returnValue = EscapedString::printTo(input, sb);
}
void outputMustBe(const char* expected)