diff --git a/include/ArduinoJson/Internals/JsonWriter.hpp b/include/ArduinoJson/Internals/JsonWriter.hpp index 629d2f16..7b398023 100644 --- a/include/ArduinoJson/Internals/JsonWriter.hpp +++ b/include/ArduinoJson/Internals/JsonWriter.hpp @@ -7,6 +7,7 @@ #pragma once #include "../Arduino/Print.hpp" +#include "QuotedString.hpp" namespace ArduinoJson { namespace Internals { @@ -35,14 +36,22 @@ class JsonWriter { void endObject() { write('}'); } void writeEmptyObject() { write("{}"); } - void writeString(const char *value); - void writeInteger(long value); - void writeBoolean(bool value); - void writeDouble(double value, uint8_t decimals); - void writeColon() { write(':'); } void writeComma() { write(','); } + void writeString(const char *value) { + _length += QuotedString::printTo(value, _sink); + } + + void writeInteger(long value) { _length += _sink.print(value); } + + void writeBoolean(bool value) { + _length += _sink.print(value ? "true" : "false"); + } + void writeDouble(double value, uint8_t decimals) { + _length += _sink.print(value, decimals); + } + protected: void write(char c) { _length += _sink.write(c); } void write(const char *s) { _length += _sink.print(s); } diff --git a/src/Internals/JsonWriter.cpp b/src/Internals/JsonWriter.cpp deleted file mode 100644 index 3124ae01..00000000 --- a/src/Internals/JsonWriter.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright Benoit Blanchon 2014 -// MIT License -// -// Arduino JSON library -// https://github.com/bblanchon/ArduinoJson - -#include "../../include/ArduinoJson/Internals/JsonWriter.hpp" - -#include "../../include/ArduinoJson/Internals/QuotedString.hpp" - -using namespace ArduinoJson::Internals; - -void JsonWriter::writeString(char const *value) { - _length += QuotedString::printTo(value, _sink); -} - -void JsonWriter::writeInteger(long value) { _length += _sink.print(value); } - -void JsonWriter::writeBoolean(bool value) { - _length += _sink.print(value ? "true" : "false"); -} - -void JsonWriter::writeDouble(double value, uint8_t decimals) { - _length += _sink.print(value, decimals); -}