From 0daf82eee24e17ab93282f5948779c0a2851f72a Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Sun, 19 Oct 2014 15:46:36 +0200 Subject: [PATCH] Renamed all .h files into .hpp (so that Sublime Text selects C++ syntax) --- JsonGenerator.cpp | 15 --------------- JsonGenerator.h | 7 ------- JsonParser.cpp | 13 ------------- JsonParser.h | 6 ------ .../ArduinoJson/Arduino/{Print.h => Print.hpp} | 0 .../Arduino/{Printable.h => Printable.hpp} | 0 ...{CompactJsonWriter.h => CompactJsonWriter.hpp} | 2 +- .../{IndentedPrint.h => IndentedPrint.hpp} | 2 +- .../Internals/{JsonNode.h => JsonNode.hpp} | 0 .../{JsonNodeIterator.h => JsonNodeIterator.hpp} | 2 +- .../{JsonNodeWrapper.h => JsonNodeWrapper.hpp} | 2 +- .../Internals/{JsonParser.h => JsonParser.hpp} | 2 +- .../Internals/{JsonWriter.h => JsonWriter.hpp} | 2 +- .../{PrettyJsonWriter.h => PrettyJsonWriter.hpp} | 4 ++-- .../{QuotedString.h => QuotedString.hpp} | 2 +- .../{StringBuilder.h => StringBuilder.hpp} | 2 +- .../ArduinoJson/{JsonArray.h => JsonArray.hpp} | 2 +- .../ArduinoJson/{JsonBuffer.h => JsonBuffer.hpp} | 4 ++-- .../{JsonContainer.h => JsonContainer.hpp} | 10 +++++----- .../ArduinoJson/{JsonObject.h => JsonObject.hpp} | 2 +- .../ArduinoJson/{JsonValue.h => JsonValue.hpp} | 2 +- .../{StaticJsonBuffer.h => StaticJsonBuffer.hpp} | 4 ++-- src/Arduino/Print.cpp | 2 +- src/Internals/CompactJsonWriter.cpp | 2 +- src/Internals/EscapedString.cpp | 2 +- src/Internals/IndentedPrint.cpp | 2 +- src/Internals/JsonNode.cpp | 10 +++++----- src/Internals/JsonParser.cpp | 6 +++--- src/Internals/JsonWriter.cpp | 4 ++-- src/Internals/PrettyJsonWriter.cpp | 2 +- src/Internals/StringBuilder.cpp | 2 +- src/JsonArray.cpp | 6 +++--- src/JsonBuffer.cpp | 8 ++++---- src/JsonContainer.cpp | 10 +++++----- src/JsonObject.cpp | 10 +++++----- src/JsonValue.cpp | 8 ++++---- test/Issue10.cpp | 8 ++++---- test/JsonArray_Container_Tests.cpp | 4 ++-- test/JsonArray_PrettyPrintTo_Tests.cpp | 8 ++++---- test/JsonArray_PrintTo_Tests.cpp | 6 +++--- test/JsonObject_Container_Tests.cpp | 4 ++-- test/JsonObject_PrettyPrintTo_Tests.cpp | 6 +++--- test/JsonObject_Serialization_Tests.cpp | 8 ++++---- test/JsonParser_Array_Tests.cpp | 4 ++-- test/JsonValueTests.cpp | 4 ++-- test/QuotedString_ExtractFrom_Tests.cpp | 2 +- test/QuotedString_PrintTo_Tests.cpp | 4 ++-- test/StaticJsonBufferTests.cpp | 4 ++-- test/StringBuilderTests.cpp | 2 +- 49 files changed, 91 insertions(+), 132 deletions(-) delete mode 100644 JsonGenerator.cpp delete mode 100644 JsonGenerator.h delete mode 100644 JsonParser.cpp delete mode 100644 JsonParser.h rename include/ArduinoJson/Arduino/{Print.h => Print.hpp} (100%) rename include/ArduinoJson/Arduino/{Printable.h => Printable.hpp} (100%) rename include/ArduinoJson/Internals/{CompactJsonWriter.h => CompactJsonWriter.hpp} (95%) rename include/ArduinoJson/Internals/{IndentedPrint.h => IndentedPrint.hpp} (97%) rename include/ArduinoJson/Internals/{JsonNode.h => JsonNode.hpp} (100%) rename include/ArduinoJson/Internals/{JsonNodeIterator.h => JsonNodeIterator.hpp} (96%) rename include/ArduinoJson/Internals/{JsonNodeWrapper.h => JsonNodeWrapper.hpp} (96%) rename include/ArduinoJson/Internals/{JsonParser.h => JsonParser.hpp} (97%) rename include/ArduinoJson/Internals/{JsonWriter.h => JsonWriter.hpp} (97%) rename include/ArduinoJson/Internals/{PrettyJsonWriter.h => PrettyJsonWriter.hpp} (96%) rename include/ArduinoJson/Internals/{QuotedString.h => QuotedString.hpp} (91%) rename include/ArduinoJson/Internals/{StringBuilder.h => StringBuilder.hpp} (94%) rename include/ArduinoJson/{JsonArray.h => JsonArray.hpp} (96%) rename include/ArduinoJson/{JsonBuffer.h => JsonBuffer.hpp} (95%) rename include/ArduinoJson/{JsonContainer.h => JsonContainer.hpp} (86%) rename include/ArduinoJson/{JsonObject.h => JsonObject.hpp} (94%) rename include/ArduinoJson/{JsonValue.h => JsonValue.hpp} (95%) rename include/ArduinoJson/{StaticJsonBuffer.h => StaticJsonBuffer.hpp} (92%) diff --git a/JsonGenerator.cpp b/JsonGenerator.cpp deleted file mode 100644 index 58a3cfdf..00000000 --- a/JsonGenerator.cpp +++ /dev/null @@ -1,15 +0,0 @@ -/* -* malloc-free JSON parser for Arduino -* Benoit Blanchon 2014 - MIT License -*/ - -// This file is here to help the Arduino IDE find the .cpp files - -#include "JsonGenerator/EscapedString.cpp" -#include "JsonGenerator/IndentedPrint.cpp" -#include "JsonGenerator/JsonArrayBase.cpp" -#include "JsonGenerator/JsonObjectBase.cpp" -#include "JsonGenerator/JsonValue.cpp" -#include "JsonGenerator/JsonPrettyPrint.cpp" -#include "JsonGenerator/JsonPrintable.cpp" -#include "JsonGenerator/StringBuilder.cpp" \ No newline at end of file diff --git a/JsonGenerator.h b/JsonGenerator.h deleted file mode 100644 index 00bab65c..00000000 --- a/JsonGenerator.h +++ /dev/null @@ -1,7 +0,0 @@ -/* -* malloc-free JSON parser for Arduino -* Benoit Blanchon 2014 - MIT License -*/ - -#include "JsonGenerator/JsonArray.h" -#include "JsonGenerator/JsonObject.h" \ No newline at end of file diff --git a/JsonParser.cpp b/JsonParser.cpp deleted file mode 100644 index 0fc7597e..00000000 --- a/JsonParser.cpp +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Arduino JSON library - * Benoit Blanchon 2014 - MIT License - */ - -// This file is here to help the Arduino IDE find the .cpp files - -#include "JsonParser/JsonArray.cpp" -#include "JsonParser/JsonObject.cpp" -#include "JsonParser/JsonParserBase.cpp" -#include "JsonParser/JsonValue.cpp" -#include "JsonParser/JsonToken.cpp" -#include "JsonParser/jsmn.cpp" \ No newline at end of file diff --git a/JsonParser.h b/JsonParser.h deleted file mode 100644 index 52a28741..00000000 --- a/JsonParser.h +++ /dev/null @@ -1,6 +0,0 @@ -/* -* malloc-free JSON parser for Arduino -* Benoit Blanchon 2014 - MIT License -*/ - -#include "JsonParser/JsonParser.h" \ No newline at end of file diff --git a/include/ArduinoJson/Arduino/Print.h b/include/ArduinoJson/Arduino/Print.hpp similarity index 100% rename from include/ArduinoJson/Arduino/Print.h rename to include/ArduinoJson/Arduino/Print.hpp diff --git a/include/ArduinoJson/Arduino/Printable.h b/include/ArduinoJson/Arduino/Printable.hpp similarity index 100% rename from include/ArduinoJson/Arduino/Printable.h rename to include/ArduinoJson/Arduino/Printable.hpp diff --git a/include/ArduinoJson/Internals/CompactJsonWriter.h b/include/ArduinoJson/Internals/CompactJsonWriter.hpp similarity index 95% rename from include/ArduinoJson/Internals/CompactJsonWriter.h rename to include/ArduinoJson/Internals/CompactJsonWriter.hpp index 326271b9..75fd87ae 100644 --- a/include/ArduinoJson/Internals/CompactJsonWriter.h +++ b/include/ArduinoJson/Internals/CompactJsonWriter.hpp @@ -1,6 +1,6 @@ #pragma once -#include "ArduinoJson/Internals/JsonWriter.h" +#include "ArduinoJson/Internals/JsonWriter.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/Internals/IndentedPrint.h b/include/ArduinoJson/Internals/IndentedPrint.hpp similarity index 97% rename from include/ArduinoJson/Internals/IndentedPrint.h rename to include/ArduinoJson/Internals/IndentedPrint.hpp index 66b37f63..928eb2a6 100644 --- a/include/ArduinoJson/Internals/IndentedPrint.h +++ b/include/ArduinoJson/Internals/IndentedPrint.hpp @@ -5,7 +5,7 @@ #pragma once -#include "../Arduino/Print.h" +#include "../Arduino/Print.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/Internals/JsonNode.h b/include/ArduinoJson/Internals/JsonNode.hpp similarity index 100% rename from include/ArduinoJson/Internals/JsonNode.h rename to include/ArduinoJson/Internals/JsonNode.hpp diff --git a/include/ArduinoJson/Internals/JsonNodeIterator.h b/include/ArduinoJson/Internals/JsonNodeIterator.hpp similarity index 96% rename from include/ArduinoJson/Internals/JsonNodeIterator.h rename to include/ArduinoJson/Internals/JsonNodeIterator.hpp index 26e6a8df..c42a95c3 100644 --- a/include/ArduinoJson/Internals/JsonNodeIterator.h +++ b/include/ArduinoJson/Internals/JsonNodeIterator.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JsonNode.h" +#include "JsonNode.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/Internals/JsonNodeWrapper.h b/include/ArduinoJson/Internals/JsonNodeWrapper.hpp similarity index 96% rename from include/ArduinoJson/Internals/JsonNodeWrapper.h rename to include/ArduinoJson/Internals/JsonNodeWrapper.hpp index 477ba23a..170d1f31 100644 --- a/include/ArduinoJson/Internals/JsonNodeWrapper.h +++ b/include/ArduinoJson/Internals/JsonNodeWrapper.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JsonNode.h" +#include "JsonNode.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/Internals/JsonParser.h b/include/ArduinoJson/Internals/JsonParser.hpp similarity index 97% rename from include/ArduinoJson/Internals/JsonParser.h rename to include/ArduinoJson/Internals/JsonParser.hpp index 5f2e9f80..e101b66d 100644 --- a/include/ArduinoJson/Internals/JsonParser.h +++ b/include/ArduinoJson/Internals/JsonParser.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JsonNode.h" +#include "JsonNode.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/Internals/JsonWriter.h b/include/ArduinoJson/Internals/JsonWriter.hpp similarity index 97% rename from include/ArduinoJson/Internals/JsonWriter.h rename to include/ArduinoJson/Internals/JsonWriter.hpp index 4aa261fc..757fbefd 100644 --- a/include/ArduinoJson/Internals/JsonWriter.h +++ b/include/ArduinoJson/Internals/JsonWriter.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../Arduino/Print.h" +#include "../Arduino/Print.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/Internals/PrettyJsonWriter.h b/include/ArduinoJson/Internals/PrettyJsonWriter.hpp similarity index 96% rename from include/ArduinoJson/Internals/PrettyJsonWriter.h rename to include/ArduinoJson/Internals/PrettyJsonWriter.hpp index 63d16c96..bd6f249e 100644 --- a/include/ArduinoJson/Internals/PrettyJsonWriter.h +++ b/include/ArduinoJson/Internals/PrettyJsonWriter.hpp @@ -1,7 +1,7 @@ #pragma once -#include "JsonWriter.h" -#include "IndentedPrint.h" +#include "JsonWriter.hpp" +#include "IndentedPrint.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/Internals/QuotedString.h b/include/ArduinoJson/Internals/QuotedString.hpp similarity index 91% rename from include/ArduinoJson/Internals/QuotedString.h rename to include/ArduinoJson/Internals/QuotedString.hpp index 794cc7d2..3f6f79c7 100644 --- a/include/ArduinoJson/Internals/QuotedString.h +++ b/include/ArduinoJson/Internals/QuotedString.hpp @@ -5,7 +5,7 @@ #pragma once -#include "../Arduino/Print.h" +#include "../Arduino/Print.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/Internals/StringBuilder.h b/include/ArduinoJson/Internals/StringBuilder.hpp similarity index 94% rename from include/ArduinoJson/Internals/StringBuilder.h rename to include/ArduinoJson/Internals/StringBuilder.hpp index fc62167b..fdd53632 100644 --- a/include/ArduinoJson/Internals/StringBuilder.h +++ b/include/ArduinoJson/Internals/StringBuilder.hpp @@ -5,7 +5,7 @@ #pragma once -#include "../Arduino/Print.h" +#include "../Arduino/Print.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/JsonArray.h b/include/ArduinoJson/JsonArray.hpp similarity index 96% rename from include/ArduinoJson/JsonArray.h rename to include/ArduinoJson/JsonArray.hpp index cb0753ac..67689221 100644 --- a/include/ArduinoJson/JsonArray.h +++ b/include/ArduinoJson/JsonArray.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JsonContainer.h" +#include "JsonContainer.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/JsonBuffer.h b/include/ArduinoJson/JsonBuffer.hpp similarity index 95% rename from include/ArduinoJson/JsonBuffer.h rename to include/ArduinoJson/JsonBuffer.hpp index 868a9c2e..4ea05b56 100644 --- a/include/ArduinoJson/JsonBuffer.h +++ b/include/ArduinoJson/JsonBuffer.hpp @@ -1,7 +1,7 @@ #pragma once -#include "JsonArray.h" -#include "JsonObject.h" +#include "JsonArray.hpp" +#include "JsonObject.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/JsonContainer.h b/include/ArduinoJson/JsonContainer.hpp similarity index 86% rename from include/ArduinoJson/JsonContainer.h rename to include/ArduinoJson/JsonContainer.hpp index 0f376d1d..c97c2442 100644 --- a/include/ArduinoJson/JsonContainer.h +++ b/include/ArduinoJson/JsonContainer.hpp @@ -1,10 +1,10 @@ #pragma once -#include "Arduino/Printable.h" -#include "Internals/JsonNodeIterator.h" -#include "Internals/JsonNode.h" -#include "Internals/IndentedPrint.h" -#include "Internals/JsonNodeWrapper.h" +#include "Arduino/Printable.hpp" +#include "Internals/JsonNodeIterator.hpp" +#include "Internals/JsonNode.hpp" +#include "Internals/IndentedPrint.hpp" +#include "Internals/JsonNodeWrapper.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/JsonObject.h b/include/ArduinoJson/JsonObject.hpp similarity index 94% rename from include/ArduinoJson/JsonObject.h rename to include/ArduinoJson/JsonObject.hpp index a4a6c309..e360b435 100644 --- a/include/ArduinoJson/JsonObject.h +++ b/include/ArduinoJson/JsonObject.hpp @@ -1,6 +1,6 @@ #pragma once -#include "JsonContainer.h" +#include "JsonContainer.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/JsonValue.h b/include/ArduinoJson/JsonValue.hpp similarity index 95% rename from include/ArduinoJson/JsonValue.h rename to include/ArduinoJson/JsonValue.hpp index 854579d4..9645b92d 100644 --- a/include/ArduinoJson/JsonValue.h +++ b/include/ArduinoJson/JsonValue.hpp @@ -1,6 +1,6 @@ #pragma once -#include "Internals/JsonNodeWrapper.h" +#include "Internals/JsonNodeWrapper.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/StaticJsonBuffer.h b/include/ArduinoJson/StaticJsonBuffer.hpp similarity index 92% rename from include/ArduinoJson/StaticJsonBuffer.h rename to include/ArduinoJson/StaticJsonBuffer.hpp index 4d164f23..df6477ad 100644 --- a/include/ArduinoJson/StaticJsonBuffer.h +++ b/include/ArduinoJson/StaticJsonBuffer.hpp @@ -1,7 +1,7 @@ #pragma once -#include "JsonBuffer.h" -#include "JsonObject.h" +#include "JsonBuffer.hpp" +#include "JsonObject.hpp" namespace ArduinoJson { diff --git a/src/Arduino/Print.cpp b/src/Arduino/Print.cpp index 87100cad..03b5429c 100644 --- a/src/Arduino/Print.cpp +++ b/src/Arduino/Print.cpp @@ -5,7 +5,7 @@ #ifndef ARDUINO -#include "ArduinoJson/Arduino/Print.h" +#include "ArduinoJson/Arduino/Print.hpp" #include size_t Print::print(const char s[]) diff --git a/src/Internals/CompactJsonWriter.cpp b/src/Internals/CompactJsonWriter.cpp index 40fc3969..4f6935a5 100644 --- a/src/Internals/CompactJsonWriter.cpp +++ b/src/Internals/CompactJsonWriter.cpp @@ -1 +1 @@ -#include "ArduinoJson/Internals/CompactJsonWriter.h" +#include "ArduinoJson/Internals/CompactJsonWriter.hpp" diff --git a/src/Internals/EscapedString.cpp b/src/Internals/EscapedString.cpp index b1fa57e6..6807130c 100644 --- a/src/Internals/EscapedString.cpp +++ b/src/Internals/EscapedString.cpp @@ -3,7 +3,7 @@ * Benoit Blanchon 2014 - MIT License */ -#include "ArduinoJson/Internals/QuotedString.h" +#include "ArduinoJson/Internals/QuotedString.hpp" using namespace ArduinoJson::Internals; diff --git a/src/Internals/IndentedPrint.cpp b/src/Internals/IndentedPrint.cpp index 3e01b872..de0d3547 100644 --- a/src/Internals/IndentedPrint.cpp +++ b/src/Internals/IndentedPrint.cpp @@ -1,4 +1,4 @@ -#include "ArduinoJson/Internals/IndentedPrint.h" +#include "ArduinoJson/Internals/IndentedPrint.hpp" using namespace ArduinoJson::Internals; diff --git a/src/Internals/JsonNode.cpp b/src/Internals/JsonNode.cpp index f0ac8ab7..7215a622 100644 --- a/src/Internals/JsonNode.cpp +++ b/src/Internals/JsonNode.cpp @@ -1,9 +1,9 @@ -#include "ArduinoJson/Internals/JsonNode.h" +#include "ArduinoJson/Internals/JsonNode.hpp" -#include "ArduinoJson/Internals/JsonWriter.h" -#include "ArduinoJson/JsonArray.h" -#include "ArduinoJson/JsonObject.h" -#include "ArduinoJson/JsonBuffer.h" +#include "ArduinoJson/Internals/JsonWriter.hpp" +#include "ArduinoJson/JsonArray.hpp" +#include "ArduinoJson/JsonObject.hpp" +#include "ArduinoJson/JsonBuffer.hpp" using namespace ArduinoJson::Internals; diff --git a/src/Internals/JsonParser.cpp b/src/Internals/JsonParser.cpp index eceb41df..193c3343 100644 --- a/src/Internals/JsonParser.cpp +++ b/src/Internals/JsonParser.cpp @@ -1,10 +1,10 @@ -#include "ArduinoJson/Internals/JsonParser.h" +#include "ArduinoJson/Internals/JsonParser.hpp" #include // for strtol, strtod #include -#include "ArduinoJson/JsonBuffer.h" -#include "ArduinoJson/Internals/QuotedString.h" +#include "ArduinoJson/JsonBuffer.hpp" +#include "ArduinoJson/Internals/QuotedString.hpp" using namespace ArduinoJson::Internals; diff --git a/src/Internals/JsonWriter.cpp b/src/Internals/JsonWriter.cpp index f95d4e2e..6df0a2a5 100644 --- a/src/Internals/JsonWriter.cpp +++ b/src/Internals/JsonWriter.cpp @@ -1,5 +1,5 @@ -#include "ArduinoJson/Internals/JsonWriter.h" -#include "ArduinoJson/Internals/QuotedString.h" +#include "ArduinoJson/Internals/JsonWriter.hpp" +#include "ArduinoJson/Internals/QuotedString.hpp" using namespace ArduinoJson::Internals; diff --git a/src/Internals/PrettyJsonWriter.cpp b/src/Internals/PrettyJsonWriter.cpp index 1f9da156..e0635c63 100644 --- a/src/Internals/PrettyJsonWriter.cpp +++ b/src/Internals/PrettyJsonWriter.cpp @@ -1 +1 @@ -#include "ArduinoJson/Internals/PrettyJsonWriter.h" +#include "ArduinoJson/Internals/PrettyJsonWriter.hpp" diff --git a/src/Internals/StringBuilder.cpp b/src/Internals/StringBuilder.cpp index 9f5c867a..86ff373d 100644 --- a/src/Internals/StringBuilder.cpp +++ b/src/Internals/StringBuilder.cpp @@ -3,7 +3,7 @@ * Benoit Blanchon 2014 - MIT License */ -#include "ArduinoJson/Internals/StringBuilder.h" +#include "ArduinoJson/Internals/StringBuilder.hpp" using namespace ArduinoJson::Internals; diff --git a/src/JsonArray.cpp b/src/JsonArray.cpp index 2c622fb0..bdefb9b9 100644 --- a/src/JsonArray.cpp +++ b/src/JsonArray.cpp @@ -1,6 +1,6 @@ -#include "ArduinoJson/JsonArray.h" -#include "ArduinoJson/JsonObject.h" -#include "ArduinoJson/JsonValue.h" +#include "ArduinoJson/JsonArray.hpp" +#include "ArduinoJson/JsonObject.hpp" +#include "ArduinoJson/JsonValue.hpp" using namespace ArduinoJson; using namespace ArduinoJson::Internals; diff --git a/src/JsonBuffer.cpp b/src/JsonBuffer.cpp index 0df60e7f..97ce57ff 100644 --- a/src/JsonBuffer.cpp +++ b/src/JsonBuffer.cpp @@ -1,10 +1,10 @@ -#include "ArduinoJson/JsonBuffer.h" +#include "ArduinoJson/JsonBuffer.hpp" #include -#include "ArduinoJson/JsonValue.h" -#include "ArduinoJson/Internals/JsonParser.h" -#include "ArduinoJson/Internals/JsonNode.h" +#include "ArduinoJson/JsonValue.hpp" +#include "ArduinoJson/Internals/JsonParser.hpp" +#include "ArduinoJson/Internals/JsonNode.hpp" using namespace ArduinoJson; using namespace ArduinoJson::Internals; diff --git a/src/JsonContainer.cpp b/src/JsonContainer.cpp index c7c6f79a..587c7dbe 100644 --- a/src/JsonContainer.cpp +++ b/src/JsonContainer.cpp @@ -1,9 +1,9 @@ -#include "ArduinoJson/JsonContainer.h" +#include "ArduinoJson/JsonContainer.hpp" -#include "ArduinoJson/JsonBuffer.h" -#include "ArduinoJson/Internals/StringBuilder.h" -#include "ArduinoJson/Internals/CompactJsonWriter.h" -#include "ArduinoJson/Internals/PrettyJsonWriter.h" +#include "ArduinoJson/JsonBuffer.hpp" +#include "ArduinoJson/Internals/StringBuilder.hpp" +#include "ArduinoJson/Internals/CompactJsonWriter.hpp" +#include "ArduinoJson/Internals/PrettyJsonWriter.hpp" using namespace ArduinoJson; using namespace ArduinoJson::Internals; diff --git a/src/JsonObject.cpp b/src/JsonObject.cpp index f6ff2043..9c95a98a 100644 --- a/src/JsonObject.cpp +++ b/src/JsonObject.cpp @@ -1,11 +1,11 @@ -#include "ArduinoJson/JsonObject.h" +#include "ArduinoJson/JsonObject.hpp" #include // for strcmp -#include "ArduinoJson/JsonBuffer.h" -#include "ArduinoJson/JsonValue.h" -#include "ArduinoJson/Internals/JsonNode.h" -#include "ArduinoJson/Internals/StringBuilder.h" +#include "ArduinoJson/JsonBuffer.hpp" +#include "ArduinoJson/JsonValue.hpp" +#include "ArduinoJson/Internals/JsonNode.hpp" +#include "ArduinoJson/Internals/StringBuilder.hpp" using namespace ArduinoJson; using namespace ArduinoJson::Internals; diff --git a/src/JsonValue.cpp b/src/JsonValue.cpp index a4834650..07f30ad6 100644 --- a/src/JsonValue.cpp +++ b/src/JsonValue.cpp @@ -1,8 +1,8 @@ -#include "ArduinoJson/JsonValue.h" +#include "ArduinoJson/JsonValue.hpp" -#include "ArduinoJson/JsonArray.h" -#include "ArduinoJson/JsonObject.h" -#include "ArduinoJson/Internals/JsonNode.h" +#include "ArduinoJson/JsonArray.hpp" +#include "ArduinoJson/JsonObject.hpp" +#include "ArduinoJson/Internals/JsonNode.hpp" using namespace ArduinoJson; diff --git a/test/Issue10.cpp b/test/Issue10.cpp index 1fe4f4e0..35620eb1 100644 --- a/test/Issue10.cpp +++ b/test/Issue10.cpp @@ -1,8 +1,8 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace ArduinoJson; diff --git a/test/JsonArray_Container_Tests.cpp b/test/JsonArray_Container_Tests.cpp index dfd54d4c..323b2434 100644 --- a/test/JsonArray_Container_Tests.cpp +++ b/test/JsonArray_Container_Tests.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include using namespace ArduinoJson; diff --git a/test/JsonArray_PrettyPrintTo_Tests.cpp b/test/JsonArray_PrettyPrintTo_Tests.cpp index d1a7d150..c1ee6a2d 100644 --- a/test/JsonArray_PrettyPrintTo_Tests.cpp +++ b/test/JsonArray_PrettyPrintTo_Tests.cpp @@ -4,10 +4,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace ArduinoJson; diff --git a/test/JsonArray_PrintTo_Tests.cpp b/test/JsonArray_PrintTo_Tests.cpp index ad84a5b9..be4e9d0d 100644 --- a/test/JsonArray_PrintTo_Tests.cpp +++ b/test/JsonArray_PrintTo_Tests.cpp @@ -4,9 +4,9 @@ */ #include -#include -#include -#include +#include +#include +#include using namespace ArduinoJson; diff --git a/test/JsonObject_Container_Tests.cpp b/test/JsonObject_Container_Tests.cpp index fe799e55..1bdb1607 100644 --- a/test/JsonObject_Container_Tests.cpp +++ b/test/JsonObject_Container_Tests.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include using namespace ArduinoJson; diff --git a/test/JsonObject_PrettyPrintTo_Tests.cpp b/test/JsonObject_PrettyPrintTo_Tests.cpp index 03ed970e..1b264e9a 100644 --- a/test/JsonObject_PrettyPrintTo_Tests.cpp +++ b/test/JsonObject_PrettyPrintTo_Tests.cpp @@ -4,9 +4,9 @@ */ #include -#include -#include -#include +#include +#include +#include using namespace ArduinoJson; diff --git a/test/JsonObject_Serialization_Tests.cpp b/test/JsonObject_Serialization_Tests.cpp index dd312206..dcefff16 100644 --- a/test/JsonObject_Serialization_Tests.cpp +++ b/test/JsonObject_Serialization_Tests.cpp @@ -1,8 +1,8 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace ArduinoJson; diff --git a/test/JsonParser_Array_Tests.cpp b/test/JsonParser_Array_Tests.cpp index d43d0a8e..b7e0da15 100644 --- a/test/JsonParser_Array_Tests.cpp +++ b/test/JsonParser_Array_Tests.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include using namespace ArduinoJson; diff --git a/test/JsonValueTests.cpp b/test/JsonValueTests.cpp index 9a54044c..4673cef1 100644 --- a/test/JsonValueTests.cpp +++ b/test/JsonValueTests.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include using namespace ArduinoJson; diff --git a/test/QuotedString_ExtractFrom_Tests.cpp b/test/QuotedString_ExtractFrom_Tests.cpp index d69f2b7d..d017c5af 100644 --- a/test/QuotedString_ExtractFrom_Tests.cpp +++ b/test/QuotedString_ExtractFrom_Tests.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace ArduinoJson::Internals; diff --git a/test/QuotedString_PrintTo_Tests.cpp b/test/QuotedString_PrintTo_Tests.cpp index f9a57ab3..1077e251 100644 --- a/test/QuotedString_PrintTo_Tests.cpp +++ b/test/QuotedString_PrintTo_Tests.cpp @@ -1,7 +1,7 @@ #include -#include -#include +#include +#include using namespace ArduinoJson::Internals; diff --git a/test/StaticJsonBufferTests.cpp b/test/StaticJsonBufferTests.cpp index e4c7fc8d..ada47e0f 100644 --- a/test/StaticJsonBufferTests.cpp +++ b/test/StaticJsonBufferTests.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include using namespace ArduinoJson; diff --git a/test/StringBuilderTests.cpp b/test/StringBuilderTests.cpp index 9b47004e..da2267ca 100644 --- a/test/StringBuilderTests.cpp +++ b/test/StringBuilderTests.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace ArduinoJson::Internals;