Moved .h files to include/

include/ArduinoJson/Internals/CompactJsonWriter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Internals/JsonWriter.h"
+#include "ArduinoJson/Internals/JsonWriter.h"
 
 class CompactJsonWriter : public JsonWriter
 {

include/ArduinoJson/JsonContainer.h

@@ -1,10 +1,11 @@
 #pragma once
 
-#include "Arduino/Printable.h"
+#include "ArduinoJson/Arduino/Printable.h"
-#include "Internals/JsonNodeIterator.h"
+#include "ArduinoJson/Internals/JsonNodeIterator.h"
-#include "Internals/JsonNode.h"
+#include "ArduinoJson/Internals/JsonNode.h"
-#include "Internals/IndentedPrint.h"
+#include "ArduinoJson/Internals/IndentedPrint.h"
-#include "Internals/JsonNodeWrapper.h"
+#include "ArduinoJson/Internals/JsonNodeWrapper.h"
+
 class JsonArray;
 class JsonObject;
 class JsonValue;

srcs/Arduino/Print.cpp

@@ -5,7 +5,7 @@
 
 #ifndef ARDUINO
 
-#include "Print.h"
+#include "ArduinoJson/Arduino/Print.h"
 #include <cstdio>
 
 size_t Print::print(const char s[])

srcs/CMakeLists.txt

@@ -1,3 +1,6 @@
-file(GLOB_RECURSE SRCS_FILES *.cpp *.h)
+file(GLOB_RECURSE INC_FILES ../include/*.h)
+file(GLOB_RECURSE SRC_FILES *.cpp)
 
-add_library(ArduinoJson ${SRCS_FILES})
+include_directories(../include)
+
+add_library(ArduinoJson ${SRC_FILES} ${INC_FILES})

srcs/Internals/CompactJsonWriter.cpp

@@ -1 +1 @@
-#include "CompactJsonWriter.h"
+#include "ArduinoJson/Internals/CompactJsonWriter.h"

srcs/Internals/EscapedString.cpp

@@ -3,7 +3,7 @@
  * Benoit Blanchon 2014 - MIT License
  */
 
-#include "EscapedString.h"
+#include "ArduinoJson/Internals/EscapedString.h"
 
 using namespace ArduinoJson::Internals;
 

srcs/Internals/IndentedPrint.cpp

@@ -1,4 +1,4 @@
-#include "IndentedPrint.h"
+#include "ArduinoJson/Internals/IndentedPrint.h"
 
 using namespace ArduinoJson::Generator;
 

srcs/Internals/JsonNode.cpp

@@ -1,9 +1,9 @@
-#include "JsonNode.h"
+#include "ArduinoJson/Internals/JsonNode.h"
 
-#include "JsonWriter.h"
+#include "ArduinoJson/Internals/JsonWriter.h"
-#include "../JsonArray.h"
+#include "ArduinoJson/JsonArray.h"
-#include "../JsonObject.h"
+#include "ArduinoJson/JsonObject.h"
-#include "../JsonBuffer.h"
+#include "ArduinoJson/JsonBuffer.h"
 
 void JsonNode::writeTo(JsonWriter& writer)
 {

srcs/Internals/JsonParser.cpp

@@ -1,5 +1,5 @@
-#include "JsonParser.h"
+#include "ArduinoJson/Internals/JsonParser.h"
-#include "../JsonBuffer.h"
+#include "ArduinoJson/JsonBuffer.h"
 #include <stdlib.h> // for strtol, strtod
 #include <ctype.h>
 

srcs/Internals/JsonWriter.cpp

@@ -1,5 +1,5 @@
-#include "JsonWriter.h"
+#include "ArduinoJson/Internals/JsonWriter.h"
-#include "EscapedString.h"
+#include "ArduinoJson/Internals/EscapedString.h"
 
 using namespace ArduinoJson::Internals;
 

srcs/Internals/PrettyJsonWriter.cpp

@@ -1 +1 @@
-#include "PrettyJsonWriter.h"
+#include "ArduinoJson/Internals/PrettyJsonWriter.h"

srcs/Internals/StringBuilder.cpp

@@ -3,7 +3,7 @@
  * Benoit Blanchon 2014 - MIT License
  */
 
-#include "StringBuilder.h"
+#include "ArduinoJson/Internals/StringBuilder.h"
 
 using namespace ArduinoJson::Internals;
 

srcs/JsonArray.cpp

@@ -1,7 +1,6 @@
-#include "JsonArray.h"
+#include "ArduinoJson/JsonArray.h"
-
+#include "ArduinoJson/JsonObject.h"
-#include "JsonObject.h"
+#include "ArduinoJson/JsonValue.h"
-#include "JsonValue.h"
 
 JsonValue JsonArray::operator[](int index) const
 {

srcs/JsonBuffer.cpp

@@ -1,10 +1,10 @@
-#include "JsonBuffer.h"
+#include "ArduinoJson/JsonBuffer.h"
 
 #include <new>
 
-#include "JsonValue.h"
+#include "ArduinoJson/JsonValue.h"
-#include "Internals/JsonParser.h"
+#include "ArduinoJson/Internals/JsonParser.h"
-#include "Internals/JsonNode.h"
+#include "ArduinoJson/Internals/JsonNode.h"
 
 JsonValue JsonBuffer::createValue()
 {

srcs/JsonContainer.cpp

@@ -1,9 +1,9 @@
-#include "JsonContainer.h"
+#include "ArduinoJson/JsonContainer.h"
 
-#include "JsonBuffer.h"
+#include "ArduinoJson/JsonBuffer.h"
-#include "Internals/StringBuilder.h"
+#include "ArduinoJson/Internals/StringBuilder.h"
-#include "Internals/CompactJsonWriter.h"
+#include "ArduinoJson/Internals/CompactJsonWriter.h"
-#include "Internals/PrettyJsonWriter.h"
+#include "ArduinoJson/Internals/PrettyJsonWriter.h"
 
 using namespace ArduinoJson::Internals;
 

srcs/JsonObject.cpp

@@ -1,12 +1,12 @@
-#include "JsonObject.h"
+#include "ArduinoJson/JsonObject.h"
 
 #include <string.h> // for strcmp
 
-#include "JsonBuffer.h"
+#include "ArduinoJson/JsonBuffer.h"
-#include "JsonValue.h"
+#include "ArduinoJson/JsonValue.h"
-#include "Internals/EscapedString.h"
+#include "ArduinoJson/Internals/EscapedString.h"
-#include "Internals/JsonNode.h"
+#include "ArduinoJson/Internals/JsonNode.h"
-#include "Internals/StringBuilder.h"
+#include "ArduinoJson/Internals/StringBuilder.h"
 
 using namespace ArduinoJson::Internals;
 

srcs/JsonValue.cpp

@@ -1,8 +1,8 @@
-#include "JsonValue.h"
+#include "ArduinoJson/JsonValue.h"
 
-#include "JsonArray.h"
+#include "ArduinoJson/JsonArray.h"
-#include "JsonObject.h"
+#include "ArduinoJson/JsonObject.h"
-#include "Internals/JsonNode.h"
+#include "ArduinoJson/Internals/JsonNode.h"
 
 void JsonValue::operator=(bool value)
 {

tests/CMakeLists.txt

@@ -1,14 +1,16 @@
 set(GTEST_DIR ../third-party/gtest-1.7.0)
 
+file(GLOB_RECURSE INC_FILES ../include/*.h)
 file(GLOB TESTS_FILES *.cpp)
 
 include_directories(
-	../srcs
+	../include
     ${GTEST_DIR}
     ${GTEST_DIR}/include)
 
 add_executable(ArduinoJsonTests 
     ${TESTS_FILES}
+	${INC_FILES}
     ${GTEST_DIR}/src/gtest-all.cc
     ${GTEST_DIR}/src/gtest_main.cc)
 

tests/EscapedStringTests.cpp

@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
-#include <Internals/EscapedString.h>
+#include <ArduinoJson/Internals/EscapedString.h>
-#include <Internals/StringBuilder.h>
+#include <ArduinoJson/Internals/StringBuilder.h>
 
 using namespace ArduinoJson::Internals;
 

tests/Issue10.cpp

@@ -1,8 +1,8 @@
 #include <gtest/gtest.h>
-#include <JsonArray.h>
+#include <ArduinoJson/JsonArray.h>
-#include <JsonObject.h>
+#include <ArduinoJson/JsonObject.h>
-#include <JsonValue.h>
+#include <ArduinoJson/JsonValue.h>
-#include <StaticJsonBuffer.h>
+#include <ArduinoJson/StaticJsonBuffer.h>
 
 using namespace ArduinoJson::Generator;
 

tests/JsonArray_Container_Tests.cpp

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
-#include <StaticJsonBuffer.h>
+#include <ArduinoJson/StaticJsonBuffer.h>
-#include <JsonValue.h>
+#include <ArduinoJson/JsonValue.h>
 
 class JsonArray_Container_Tests : public ::testing::Test
 {

tests/JsonArray_Parser_Tests.cpp

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
-#include <StaticJsonBuffer.h>
+#include <ArduinoJson/StaticJsonBuffer.h>
-#include <JsonValue.h>
+#include <ArduinoJson/JsonValue.h>
 
 class JsonArray_Parser_Tests : public testing::Test
 {

tests/JsonArray_PrettyPrintTo_Tests.cpp

@@ -4,10 +4,10 @@
 */
 
 #include <gtest/gtest.h>
-#include <JsonArray.h>
+#include <ArduinoJson/JsonArray.h>
-#include <JsonObject.h>
+#include <ArduinoJson/JsonObject.h>
-#include <JsonValue.h>
+#include <ArduinoJson/JsonValue.h>
-#include <StaticJsonBuffer.h>
+#include <ArduinoJson/StaticJsonBuffer.h>
 
 class JsonArray_PrettyPrintTo_Tests : public testing::Test
 {

tests/JsonArray_PrintTo_Tests.cpp

@@ -4,9 +4,9 @@
 */
 
 #include <gtest/gtest.h>
-#include <JsonArray.h>
+#include <ArduinoJson/JsonArray.h>
-#include <JsonObject.h>
+#include <ArduinoJson/JsonObject.h>
-#include <StaticJsonBuffer.h>
+#include <ArduinoJson/StaticJsonBuffer.h>
 
 class JsonArray_PrintTo_Tests : public testing::Test 
 {

tests/JsonObject_Container_Tests.cpp

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
-#include <StaticJsonBuffer.h>
+#include <ArduinoJson/StaticJsonBuffer.h>
-#include <JsonValue.h>
+#include <ArduinoJson/JsonValue.h>
 
 class JsonObject_Container_Tests : public ::testing::Test
 {

tests/JsonObject_PrettyPrintTo_Tests.cpp

@@ -4,9 +4,9 @@
 */
 
 #include <gtest/gtest.h>
-#include <JsonObject.h>
+#include <ArduinoJson/JsonObject.h>
-#include <JsonValue.h>
+#include <ArduinoJson/JsonValue.h>
-#include <StaticJsonBuffer.h>
+#include <ArduinoJson/StaticJsonBuffer.h>
 
 class JsonObject_PrettyPrintTo_Tests : public testing::Test
 {

tests/JsonObject_Serialization_Tests.cpp

@@ -1,8 +1,8 @@
 #include <gtest/gtest.h>
-#include <JsonArray.h>
+#include <ArduinoJson/JsonArray.h>
-#include <JsonObject.h>
+#include <ArduinoJson/JsonObject.h>
-#include <JsonValue.h>
+#include <ArduinoJson/JsonValue.h>
-#include <StaticJsonBuffer.h>
+#include <ArduinoJson/StaticJsonBuffer.h>
 
 class JsonObject_Serialization_Tests : public testing::Test
 {

tests/JsonValueTests.cpp

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
-#include <StaticJsonBuffer.h>
+#include <ArduinoJson/StaticJsonBuffer.h>
-#include <JsonValue.h>
+#include <ArduinoJson/JsonValue.h>
 
 class JsonValueTests : public ::testing::Test
 {

tests/StaticJsonBufferTests.cpp

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
-#include <StaticJsonBuffer.h>
+#include <ArduinoJson/StaticJsonBuffer.h>
-#include <JsonValue.h>
+#include <ArduinoJson/JsonValue.h>
 
 TEST(StaticJsonBuffer, CapacityMatchTemplateParameter)
 {

tests/StringBuilderTests.cpp

@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <Internals/StringBuilder.h>
+#include <ArduinoJson/Internals/StringBuilder.h>
 
 using namespace ArduinoJson::Internals;