From ca0fbf00f9cc87bb8b17699ecce2d82993d49c99 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Fri, 31 Oct 2014 12:16:32 +0100 Subject: [PATCH] Cleaning up... --- include/ArduinoJson/ForwardDeclarations.hpp | 9 --------- include/ArduinoJson/Internals/JsonArrayNode.hpp | 4 +--- include/ArduinoJson/Internals/JsonObjectNode.hpp | 4 +--- include/ArduinoJson/Internals/JsonParser.hpp | 1 - include/ArduinoJson/JsonObjectConstIterator.hpp | 1 - include/ArduinoJson/JsonObjectIterator.hpp | 1 - include/ArduinoJson/StaticJsonBuffer.hpp | 1 - test/JsonArray_Container_Tests.cpp | 1 - test/JsonObject_Container_Tests.cpp | 1 - test/JsonValueTests.cpp | 1 - test/Printers.cpp | 12 ------------ test/Printers.hpp | 12 ------------ 12 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 test/Printers.cpp delete mode 100644 test/Printers.hpp diff --git a/include/ArduinoJson/ForwardDeclarations.hpp b/include/ArduinoJson/ForwardDeclarations.hpp index a3ebf3a5..1ca4b297 100644 --- a/include/ArduinoJson/ForwardDeclarations.hpp +++ b/include/ArduinoJson/ForwardDeclarations.hpp @@ -8,20 +8,11 @@ namespace ArduinoJson { class JsonArray; -class JsonArrayConstIterator; -class JsonArrayIterator; class JsonBuffer; class JsonObject; -class JsonObjectConstIterator; -class JsonObjectIterator; -struct JsonPair; -class JsonValue; namespace Internals { class IndentedPrint; -class JsonArrayNode; -class JsonObjectNode; -class JsonParser; class JsonWriter; } } diff --git a/include/ArduinoJson/Internals/JsonArrayNode.hpp b/include/ArduinoJson/Internals/JsonArrayNode.hpp index 0eee7047..c6404475 100644 --- a/include/ArduinoJson/Internals/JsonArrayNode.hpp +++ b/include/ArduinoJson/Internals/JsonArrayNode.hpp @@ -7,13 +7,11 @@ #pragma once #include "../JsonValue.hpp" -#include "../JsonBuffer.hpp" namespace ArduinoJson { namespace Internals { -class JsonArrayNode { - public: +struct JsonArrayNode { JsonArrayNode() : next(NULL) {} JsonArrayNode* next; diff --git a/include/ArduinoJson/Internals/JsonObjectNode.hpp b/include/ArduinoJson/Internals/JsonObjectNode.hpp index 6ea76f7d..0c4a900b 100644 --- a/include/ArduinoJson/Internals/JsonObjectNode.hpp +++ b/include/ArduinoJson/Internals/JsonObjectNode.hpp @@ -7,13 +7,11 @@ #pragma once #include "../JsonPair.hpp" -#include "../JsonBuffer.hpp" namespace ArduinoJson { namespace Internals { -class JsonObjectNode { - public: +struct JsonObjectNode { JsonObjectNode(const char* k) : pair(k), next(NULL) {} JsonPair pair; diff --git a/include/ArduinoJson/Internals/JsonParser.hpp b/include/ArduinoJson/Internals/JsonParser.hpp index 084fe193..b423978a 100644 --- a/include/ArduinoJson/Internals/JsonParser.hpp +++ b/include/ArduinoJson/Internals/JsonParser.hpp @@ -6,7 +6,6 @@ #pragma once -#include "../ForwardDeclarations.hpp" #include "../JsonBuffer.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/JsonObjectConstIterator.hpp b/include/ArduinoJson/JsonObjectConstIterator.hpp index 72c045b4..1ec2ebd6 100644 --- a/include/ArduinoJson/JsonObjectConstIterator.hpp +++ b/include/ArduinoJson/JsonObjectConstIterator.hpp @@ -6,7 +6,6 @@ #pragma once -#include "ForwardDeclarations.hpp" #include "Internals/JsonObjectNode.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/JsonObjectIterator.hpp b/include/ArduinoJson/JsonObjectIterator.hpp index e2536fd9..b873a4f2 100644 --- a/include/ArduinoJson/JsonObjectIterator.hpp +++ b/include/ArduinoJson/JsonObjectIterator.hpp @@ -6,7 +6,6 @@ #pragma once -#include "ForwardDeclarations.hpp" #include "Internals/JsonObjectNode.hpp" namespace ArduinoJson { diff --git a/include/ArduinoJson/StaticJsonBuffer.hpp b/include/ArduinoJson/StaticJsonBuffer.hpp index 8d72229b..79cca1e0 100644 --- a/include/ArduinoJson/StaticJsonBuffer.hpp +++ b/include/ArduinoJson/StaticJsonBuffer.hpp @@ -6,7 +6,6 @@ #pragma once -#include "ForwardDeclarations.hpp" #include "JsonBuffer.hpp" namespace ArduinoJson { diff --git a/test/JsonArray_Container_Tests.cpp b/test/JsonArray_Container_Tests.cpp index 7d0e5530..7e58ffcc 100644 --- a/test/JsonArray_Container_Tests.cpp +++ b/test/JsonArray_Container_Tests.cpp @@ -9,7 +9,6 @@ #include #include #include -#include "Printers.hpp" using namespace ArduinoJson; diff --git a/test/JsonObject_Container_Tests.cpp b/test/JsonObject_Container_Tests.cpp index 39213455..cc53a35c 100644 --- a/test/JsonObject_Container_Tests.cpp +++ b/test/JsonObject_Container_Tests.cpp @@ -9,7 +9,6 @@ #include #include #include -#include "Printers.hpp" using namespace ArduinoJson; diff --git a/test/JsonValueTests.cpp b/test/JsonValueTests.cpp index f07553bc..9882a3fc 100644 --- a/test/JsonValueTests.cpp +++ b/test/JsonValueTests.cpp @@ -9,7 +9,6 @@ #include #include #include -#include "Printers.hpp" using namespace ArduinoJson; diff --git a/test/Printers.cpp b/test/Printers.cpp deleted file mode 100644 index fc82357e..00000000 --- a/test/Printers.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright Benoit Blanchon 2014 -// MIT License -// -// Arduino JSON library -// https://github.com/bblanchon/ArduinoJson - -#include "Printers.hpp" - -std::ostream& operator<<(std::ostream& os, const ArduinoJson::JsonValue&) { - os << "JsonValue"; // TODO - return os; -} \ No newline at end of file diff --git a/test/Printers.hpp b/test/Printers.hpp deleted file mode 100644 index 73e18ac0..00000000 --- a/test/Printers.hpp +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright Benoit Blanchon 2014 -// MIT License -// -// Arduino JSON library -// https://github.com/bblanchon/ArduinoJson - -#pragma once - -#include -#include - -std::ostream& operator<<(std::ostream& os, const ArduinoJson::JsonValue& v); \ No newline at end of file