Cleaning up...

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;
 }
 }

include/ArduinoJson/Internals/JsonArrayNode.hpp

@@ -7,13 +7,11 @@
 #pragma once
 
 #include "../JsonValue.hpp"
-#include "../JsonBuffer.hpp"
 
 namespace ArduinoJson {
 namespace Internals {
 
-class JsonArrayNode {
+struct JsonArrayNode {
- public:
   JsonArrayNode() : next(NULL) {}
 
   JsonArrayNode* next;

include/ArduinoJson/Internals/JsonObjectNode.hpp

@@ -7,13 +7,11 @@
 #pragma once
 
 #include "../JsonPair.hpp"
-#include "../JsonBuffer.hpp"
 
 namespace ArduinoJson {
 namespace Internals {
 
-class JsonObjectNode {
+struct JsonObjectNode {
- public:
   JsonObjectNode(const char* k) : pair(k), next(NULL) {}
 
   JsonPair pair;

include/ArduinoJson/Internals/JsonParser.hpp

@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include "../ForwardDeclarations.hpp"
 #include "../JsonBuffer.hpp"
 
 namespace ArduinoJson {

include/ArduinoJson/JsonObjectConstIterator.hpp

@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include "ForwardDeclarations.hpp"
 #include "Internals/JsonObjectNode.hpp"
 
 namespace ArduinoJson {

include/ArduinoJson/JsonObjectIterator.hpp

@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include "ForwardDeclarations.hpp"
 #include "Internals/JsonObjectNode.hpp"
 
 namespace ArduinoJson {

include/ArduinoJson/StaticJsonBuffer.hpp

@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include "ForwardDeclarations.hpp"
 #include "JsonBuffer.hpp"
 
 namespace ArduinoJson {

test/JsonArray_Container_Tests.cpp

@@ -9,7 +9,6 @@
 #include <ArduinoJson/JsonValue.hpp>
 #include <ArduinoJson/JsonArray.hpp>
 #include <ArduinoJson/JsonObject.hpp>
-#include "Printers.hpp"
 
 using namespace ArduinoJson;
 

test/JsonObject_Container_Tests.cpp

@@ -9,7 +9,6 @@
 #include <ArduinoJson/JsonObject.hpp>
 #include <ArduinoJson/JsonValue.hpp>
 #include <ArduinoJson/StaticJsonBuffer.hpp>
-#include "Printers.hpp"
 
 using namespace ArduinoJson;
 

test/JsonValueTests.cpp

@@ -9,7 +9,6 @@
 #include <ArduinoJson/JsonArray.hpp>
 #include <ArduinoJson/JsonObject.hpp>
 #include <ArduinoJson/JsonValue.hpp>
-#include "Printers.hpp"
 
 using namespace ArduinoJson;
 

test/Printers.cpp

@@ -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;
-}

test/Printers.hpp

@@ -1,12 +0,0 @@
-// Copyright Benoit Blanchon 2014
-// MIT License
-//
-// Arduino JSON library
-// https://github.com/bblanchon/ArduinoJson
-
-#pragma once
-
-#include <ArduinoJson/ForwardDeclarations.hpp>
-#include <ostream>
-
-std::ostream& operator<<(std::ostream& os, const ArduinoJson::JsonValue& v);