diff --git a/include/ArduinoJson/JsonPrintable.hpp b/include/ArduinoJson/JsonPrintable.hpp index 34b4aaed..838e1205 100644 --- a/include/ArduinoJson/JsonPrintable.hpp +++ b/include/ArduinoJson/JsonPrintable.hpp @@ -6,9 +6,9 @@ #pragma once -#include "Internals/StringBuilder.hpp" #include "Internals/IndentedPrint.hpp" #include "Internals/PrettyJsonWriter.hpp" +#include "Internals/StringBuilder.hpp" namespace ArduinoJson { diff --git a/src/Arduino/Print.cpp b/src/Arduino/Print.cpp index 343cc8ab..72cab452 100644 --- a/src/Arduino/Print.cpp +++ b/src/Arduino/Print.cpp @@ -7,7 +7,8 @@ #ifndef ARDUINO #include "../../include/ArduinoJson/Arduino/Print.hpp" -#include + +#include // for sprintf size_t Print::print(const char s[]) { size_t n = 0; diff --git a/src/ArduinoJson.h b/src/ArduinoJson.h index f869c027..20ad9ae6 100644 --- a/src/ArduinoJson.h +++ b/src/ArduinoJson.h @@ -10,8 +10,8 @@ // for the IDE to find it. Feel free to ignore this file if your working in // another environment -#include "../include/ArduinoJson/StaticJsonBuffer.hpp" #include "../include/ArduinoJson/JsonArray.hpp" #include "../include/ArduinoJson/JsonObject.hpp" +#include "../include/ArduinoJson/StaticJsonBuffer.hpp" -using namespace ArduinoJson; \ No newline at end of file +using namespace ArduinoJson; diff --git a/src/Internals/JsonParser.cpp b/src/Internals/JsonParser.cpp index 61066656..d38c14c7 100644 --- a/src/Internals/JsonParser.cpp +++ b/src/Internals/JsonParser.cpp @@ -9,11 +9,10 @@ #include // for strtol, strtod #include +#include "../../include/ArduinoJson/Internals/QuotedString.hpp" #include "../../include/ArduinoJson/JsonArray.hpp" #include "../../include/ArduinoJson/JsonBuffer.hpp" -#include "../../include/ArduinoJson/JsonVariant.hpp" #include "../../include/ArduinoJson/JsonObject.hpp" -#include "../../include/ArduinoJson/Internals/QuotedString.hpp" using namespace ArduinoJson; using namespace ArduinoJson::Internals; diff --git a/src/Internals/JsonWriter.cpp b/src/Internals/JsonWriter.cpp index 1a32f030..9a60608b 100644 --- a/src/Internals/JsonWriter.cpp +++ b/src/Internals/JsonWriter.cpp @@ -5,6 +5,7 @@ // https://github.com/bblanchon/ArduinoJson #include "../../include/ArduinoJson/Internals/JsonWriter.hpp" + #include "../../include/ArduinoJson/Internals/QuotedString.hpp" using namespace ArduinoJson::Internals; diff --git a/src/JsonBuffer.cpp b/src/JsonBuffer.cpp index 0e9551fc..8f1d6175 100644 --- a/src/JsonBuffer.cpp +++ b/src/JsonBuffer.cpp @@ -6,11 +6,10 @@ #include "../include/ArduinoJson/JsonBuffer.hpp" +#include "../include/ArduinoJson/Internals/JsonParser.hpp" +#include "../include/ArduinoJson/Internals/PlacementNew.hpp" #include "../include/ArduinoJson/JsonArray.hpp" #include "../include/ArduinoJson/JsonObject.hpp" -#include "../include/ArduinoJson/JsonVariant.hpp" -#include "../include/ArduinoJson/Internals/PlacementNew.hpp" -#include "../include/ArduinoJson/Internals/JsonParser.hpp" using namespace ArduinoJson; using namespace ArduinoJson::Internals; diff --git a/src/JsonObject.cpp b/src/JsonObject.cpp index 8d91d46a..38d84099 100644 --- a/src/JsonObject.cpp +++ b/src/JsonObject.cpp @@ -8,12 +8,11 @@ #include // for strcmp -#include "../include/ArduinoJson/JsonBuffer.hpp" -#include "../include/ArduinoJson/JsonArray.hpp" -#include "../include/ArduinoJson/JsonVariant.hpp" +#include "../include/ArduinoJson/Internals/PlacementNew.hpp" #include "../include/ArduinoJson/Internals/PrettyJsonWriter.hpp" #include "../include/ArduinoJson/Internals/StringBuilder.hpp" -#include "../include/ArduinoJson/Internals/PlacementNew.hpp" +#include "../include/ArduinoJson/JsonArray.hpp" +#include "../include/ArduinoJson/JsonBuffer.hpp" using namespace ArduinoJson; using namespace ArduinoJson::Internals; diff --git a/src/JsonVariant.cpp b/src/JsonVariant.cpp index 6c0b4adc..2cd61930 100644 --- a/src/JsonVariant.cpp +++ b/src/JsonVariant.cpp @@ -5,9 +5,10 @@ // https://github.com/bblanchon/ArduinoJson #include "../include/ArduinoJson/JsonVariant.hpp" + +#include "../include/ArduinoJson/Internals/PrettyJsonWriter.hpp" #include "../include/ArduinoJson/JsonArray.hpp" #include "../include/ArduinoJson/JsonObject.hpp" -#include "../include/ArduinoJson/Internals/PrettyJsonWriter.hpp" using namespace ArduinoJson; using namespace ArduinoJson::Internals; diff --git a/test/Issue10.cpp b/test/Issue10.cpp index 1b2d40f8..2c00b342 100644 --- a/test/Issue10.cpp +++ b/test/Issue10.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include using namespace ArduinoJson; diff --git a/test/JsonArray_Container_Tests.cpp b/test/JsonArray_Container_Tests.cpp index 8190c969..268bb6a5 100644 --- a/test/JsonArray_Container_Tests.cpp +++ b/test/JsonArray_Container_Tests.cpp @@ -6,7 +6,6 @@ #include #include -#include #include #include diff --git a/test/JsonArray_PrettyPrintTo_Tests.cpp b/test/JsonArray_PrettyPrintTo_Tests.cpp index 78c168bf..9cf7260a 100644 --- a/test/JsonArray_PrettyPrintTo_Tests.cpp +++ b/test/JsonArray_PrettyPrintTo_Tests.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include using namespace ArduinoJson; diff --git a/test/JsonObject_Container_Tests.cpp b/test/JsonObject_Container_Tests.cpp index dead46e9..6e75cba6 100644 --- a/test/JsonObject_Container_Tests.cpp +++ b/test/JsonObject_Container_Tests.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include using namespace ArduinoJson; diff --git a/test/JsonObject_PrettyPrintTo_Tests.cpp b/test/JsonObject_PrettyPrintTo_Tests.cpp index ba05c6d5..a06fae5f 100644 --- a/test/JsonObject_PrettyPrintTo_Tests.cpp +++ b/test/JsonObject_PrettyPrintTo_Tests.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include using namespace ArduinoJson; diff --git a/test/JsonObject_PrintTo_Tests.cpp b/test/JsonObject_PrintTo_Tests.cpp index bb980e61..207b6448 100644 --- a/test/JsonObject_PrintTo_Tests.cpp +++ b/test/JsonObject_PrintTo_Tests.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include using namespace ArduinoJson; diff --git a/test/JsonParser_Array_Tests.cpp b/test/JsonParser_Array_Tests.cpp index abb63356..0c7e6f2b 100644 --- a/test/JsonParser_Array_Tests.cpp +++ b/test/JsonParser_Array_Tests.cpp @@ -6,7 +6,6 @@ #include #include -#include #include using namespace ArduinoJson; diff --git a/test/JsonParser_Object_Tests.cpp b/test/JsonParser_Object_Tests.cpp index 047320e0..33a18c34 100644 --- a/test/JsonParser_Object_Tests.cpp +++ b/test/JsonParser_Object_Tests.cpp @@ -7,7 +7,6 @@ #include #include #include -#include using namespace ArduinoJson; diff --git a/test/JsonVariant_Copy_Tests.cpp b/test/JsonVariant_Copy_Tests.cpp index ad74a248..d739d755 100644 --- a/test/JsonVariant_Copy_Tests.cpp +++ b/test/JsonVariant_Copy_Tests.cpp @@ -8,7 +8,6 @@ #include #include #include -#include using namespace ArduinoJson; diff --git a/test/JsonVariant_Storage_Tests.cpp b/test/JsonVariant_Storage_Tests.cpp index 3ef71981..e895775a 100644 --- a/test/JsonVariant_Storage_Tests.cpp +++ b/test/JsonVariant_Storage_Tests.cpp @@ -8,7 +8,6 @@ #include #include #include -#include using namespace ArduinoJson;