From 09294cb5e637b6d658ecd88da503cdc96bef8332 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Fri, 1 Aug 2014 15:32:05 +0200 Subject: [PATCH] Made EscapedString pure static --- JsonGenerator/EscapedString.h | 14 -------------- JsonGenerator/JsonObjectBase.cpp | 2 +- JsonGenerator/JsonValue.cpp | 2 +- JsonGeneratorTests/EscapedStringTests.cpp | 3 +-- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/JsonGenerator/EscapedString.h b/JsonGenerator/EscapedString.h index 232ede4e..22db62c7 100644 --- a/JsonGenerator/EscapedString.h +++ b/JsonGenerator/EscapedString.h @@ -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&); }; } diff --git a/JsonGenerator/JsonObjectBase.cpp b/JsonGenerator/JsonObjectBase.cpp index 03c21add..98007b75 100644 --- a/JsonGenerator/JsonObjectBase.cpp +++ b/JsonGenerator/JsonObjectBase.cpp @@ -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); diff --git a/JsonGenerator/JsonValue.cpp b/JsonGenerator/JsonValue.cpp index 5ce603da..28dbf357 100644 --- a/JsonGenerator/JsonValue.cpp +++ b/JsonGenerator/JsonValue.cpp @@ -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); } \ No newline at end of file diff --git a/JsonGeneratorTests/EscapedStringTests.cpp b/JsonGeneratorTests/EscapedStringTests.cpp index 6b72ecc9..ea0c7980 100644 --- a/JsonGeneratorTests/EscapedStringTests.cpp +++ b/JsonGeneratorTests/EscapedStringTests.cpp @@ -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)