Browse Source

Fix include paths

- create include paths based on project root
directory
Patrick 3 years ago
parent
commit
dcbdb72511
37 changed files with 116 additions and 117 deletions
  1. 0 1
      CMakeLists.txt
  2. 2 2
      include/ls_std/base/Version.hpp
  3. 4 4
      include/ls_std/boxing/Boolean.hpp
  4. 4 4
      include/ls_std/boxing/Double.hpp
  5. 4 4
      include/ls_std/boxing/Float.hpp
  6. 4 4
      include/ls_std/boxing/Integer.hpp
  7. 5 5
      include/ls_std/boxing/Long.hpp
  8. 4 4
      include/ls_std/boxing/String.hpp
  9. 2 2
      include/ls_std/io/File.hpp
  10. 2 2
      include/ls_std/io/FileOutputStream.hpp
  11. 2 2
      include/ls_std/io/FileReader.hpp
  12. 2 2
      include/ls_std/io/FileWriter.hpp
  13. 2 2
      include/ls_std/io/IReader.hpp
  14. 2 2
      include/ls_std/io/IStorable.hpp
  15. 2 2
      include/ls_std/io/IWriter.hpp
  16. 2 2
      include/ls_std/io/logging/LogLevel.hpp
  17. 5 5
      include/ls_std/io/logging/Logger.hpp
  18. 2 2
      include/ls_std/io/xml/XMLAttribute.hpp
  19. 2 2
      include/ls_std/io/xml/XMLDeclaration.hpp
  20. 2 2
      include/ls_std/io/xml/XMLDocument.hpp
  21. 2 2
      include/ls_std/io/xml/XMLNode.hpp
  22. 4 4
      include/ls_std/io/xml/XMLReader.hpp
  23. 2 2
      include/ls_std/logic/State.hpp
  24. 2 2
      include/ls_std/logic/StateConnection.hpp
  25. 2 2
      include/ls_std/logic/StateMachine.hpp
  26. 2 2
      include/ls_std/serialization/ISerializable.hpp
  27. 5 5
      include/ls_std/serialization/boxing/SerializableJSONBoolean.hpp
  28. 5 5
      include/ls_std/serialization/boxing/SerializableJSONDouble.hpp
  29. 5 5
      include/ls_std/serialization/boxing/SerializableJSONFloat.hpp
  30. 5 5
      include/ls_std/serialization/boxing/SerializableJSONInteger.hpp
  31. 5 5
      include/ls_std/serialization/boxing/SerializableJSONLong.hpp
  32. 4 4
      include/ls_std/serialization/boxing/SerializableJSONString.hpp
  33. 5 5
      include/ls_std/serialization/logic/SerializableJSONState.hpp
  34. 5 5
      include/ls_std/serialization/logic/SerializableJSONStateConnection.hpp
  35. 5 5
      include/ls_std/serialization/logic/SerializableJSONStateMachine.hpp
  36. 2 2
      include/ls_std/time/Date.hpp
  37. 2 2
      test/cases/serialization/json/JSONTest.cpp

+ 0 - 1
CMakeLists.txt

@@ -23,7 +23,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 message("${PROJECT_NAME}: Adding include directories...")
 
 include_directories(${CMAKE_CURRENT_LIST_DIR}/test/lib/googletest-1.8.1/googletest/include)
-include_directories(${CMAKE_CURRENT_LIST_DIR}/include/ls_std/lib/nlohmann_json/include/nlohmann)
 include_directories(${CMAKE_CURRENT_LIST_DIR}/include)
 
 ######################################################

+ 2 - 2
include/ls_std/base/Version.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-27
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -11,7 +11,7 @@
 #define LS_STD_VERSION_HPP
 
 #include "Class.hpp"
-#include "../serialization/ISerializable.hpp"
+#include <ls_std/serialization/ISerializable.hpp>
 #include "Types.hpp"
 
 namespace ls_std {

+ 4 - 4
include/ls_std/boxing/Boolean.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-09
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -11,10 +11,10 @@
 #define LS_STD_BOOLEAN_HPP
 
 #include <memory>
-#include "../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "IBoxing.hpp"
-#include "../serialization/ISerializable.hpp"
-#include "../io/IStorable.hpp"
+#include <ls_std/serialization/ISerializable.hpp>
+#include <ls_std/io/IStorable.hpp>
 
 namespace ls_std {
   class Boolean : public Class, public IBoxing, public ISerializable, public IStorable {

+ 4 - 4
include/ls_std/boxing/Double.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -11,10 +11,10 @@
 #define LS_STD_DOUBLE_HPP
 
 #include <memory>
-#include "../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "IBoxing.hpp"
-#include "../serialization/ISerializable.hpp"
-#include "../io/IStorable.hpp"
+#include <ls_std/serialization/ISerializable.hpp>
+#include <ls_std/io/IStorable.hpp>
 
 namespace ls_std {
   class Double : public Class, public IBoxing, public ISerializable, public IStorable {

+ 4 - 4
include/ls_std/boxing/Float.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -11,10 +11,10 @@
 #define LS_STD_FLOAT_HPP
 
 #include <memory>
-#include "../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "IBoxing.hpp"
-#include "../serialization/ISerializable.hpp"
-#include "../io/IStorable.hpp"
+#include <ls_std/serialization/ISerializable.hpp>
+#include <ls_std/io/IStorable.hpp>
 
 namespace ls_std {
   class Float : public Class, public IBoxing, public ISerializable, public IStorable {

+ 4 - 4
include/ls_std/boxing/Integer.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-07
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -11,10 +11,10 @@
 #define LS_STD_INTEGER_HPP
 
 #include <memory>
-#include "../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "IBoxing.hpp"
-#include "../serialization/ISerializable.hpp"
-#include "../io/IStorable.hpp"
+#include <ls_std/serialization/ISerializable.hpp>
+#include <ls_std/io/IStorable.hpp>
 
 namespace ls_std {
   class Integer : public Class, public IBoxing, public ISerializable, public IStorable {

+ 5 - 5
include/ls_std/boxing/Long.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-17
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -11,11 +11,11 @@
 #define LS_STD_LONG_HPP
 
 #include <memory>
-#include "../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "IBoxing.hpp"
-#include "../base/Types.hpp"
-#include "../serialization/ISerializable.hpp"
-#include "../io/IStorable.hpp"
+#include <ls_std/base/Types.hpp>
+#include <ls_std/serialization/ISerializable.hpp>
+#include <ls_std/io/IStorable.hpp>
 
 namespace ls_std {
   class Long : public Class, public IBoxing, public ISerializable, public IStorable {

+ 4 - 4
include/ls_std/boxing/String.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -11,9 +11,9 @@
 #define LS_STD_STRING_HPP
 
 #include "IBoxing.hpp"
-#include "../base/Class.hpp"
-#include "../serialization/ISerializable.hpp"
-#include "../io/IStorable.hpp"
+#include <ls_std/base/Class.hpp>
+#include <ls_std/serialization/ISerializable.hpp>
+#include <ls_std/io/IStorable.hpp>
 #include <string>
 #include <memory>
 #include <vector>

+ 2 - 2
include/ls_std/io/File.hpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-15
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_FILE_HPP
 #define LS_STD_FILE_HPP
 
-#include "../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include <string>
 #include <vector>
 #include <list>

+ 2 - 2
include/ls_std/io/FileOutputStream.hpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-20
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_FILE_OUTPUT_STREAM_HPP
 #define LS_STD_FILE_OUTPUT_STREAM_HPP
 
-#include "../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "File.hpp"
 #include "IWriter.hpp"
 #include <fstream>

+ 2 - 2
include/ls_std/io/FileReader.hpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-17
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_FILE_READER_HPP
 #define LS_STD_FILE_READER_HPP
 
-#include "../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "File.hpp"
 #include "IReader.hpp"
 

+ 2 - 2
include/ls_std/io/FileWriter.hpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-17
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_FILE_WRITER_HPP
 #define LS_STD_FILE_WRITER_HPP
 
-#include "../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "IWriter.hpp"
 #include "File.hpp"
 

+ 2 - 2
include/ls_std/io/IReader.hpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-17
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_I_READER_HPP
 #define LS_STD_I_READER_HPP
 
-#include "../base/Types.hpp"
+#include <ls_std/base/Types.hpp>
 
 namespace ls_std {
   class IReader {

+ 2 - 2
include/ls_std/io/IStorable.hpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-19
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_I_STORABLE_HPP
 #define LS_STD_I_STORABLE_HPP
 
-#include "../base/Types.hpp"
+#include <ls_std/base/Types.hpp>
 
 namespace ls_std {
   class IStorable {

+ 2 - 2
include/ls_std/io/IWriter.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-17
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -11,7 +11,7 @@
 #define LS_STD_I_WRITER_HPP
 
 #include <vector>
-#include "../base/Types.hpp"
+#include <ls_std/base/Types.hpp>
 
 namespace ls_std {
   class IWriter {

+ 2 - 2
include/ls_std/io/logging/LogLevel.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-20
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -11,7 +11,7 @@
 #define LS_STD_LOG_LEVEL_HPP
 
 #include <unordered_map>
-#include "../../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "LogLevelValue.hpp"
 
 namespace ls_std {

+ 5 - 5
include/ls_std/io/logging/Logger.hpp

@@ -3,18 +3,18 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-20
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_LOGGER_HPP
 #define LS_STD_LOGGER_HPP
 
-#include "../../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "LogLevel.hpp"
-#include "../IWriter.hpp"
-#include "../File.hpp"
-#include "../FileOutputStream.hpp"
+#include <ls_std/io/IWriter.hpp>
+#include <ls_std/io/File.hpp>
+#include <ls_std/io/FileOutputStream.hpp>
 #include <string>
 
 namespace ls_std {

+ 2 - 2
include/ls_std/io/xml/XMLAttribute.hpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-23
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_XML_ATTRIBUTE_HPP
 #define LS_STD_XML_ATTRIBUTE_HPP
 
-#include "../../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include <string>
 
 namespace ls_std {

+ 2 - 2
include/ls_std/io/xml/XMLDeclaration.hpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-27
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_XML_DECLARATION_HPP
 #define LS_STD_XML_DECLARATION_HPP
 
-#include "../../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "XMLAttribute.hpp"
 
 namespace ls_std {

+ 2 - 2
include/ls_std/io/xml/XMLDocument.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-27
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -11,7 +11,7 @@
 #define LS_STD_XML_DOCUMENT_HPP
 
 #include <memory>
-#include "../../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "XMLNode.hpp"
 #include "XMLDeclaration.hpp"
 

+ 2 - 2
include/ls_std/io/xml/XMLNode.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-24
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -12,7 +12,7 @@
 
 #include <list>
 #include <memory>
-#include "../../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "XMLAttribute.hpp"
 
 namespace ls_std {

+ 4 - 4
include/ls_std/io/xml/XMLReader.hpp

@@ -3,17 +3,17 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-10-08
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_XML_READER_HPP
 #define LS_STD_XML_READER_HPP
 
-#include "../../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "XMLDocument.hpp"
-#include "../IReader.hpp"
-#include "../File.hpp"
+#include <ls_std/io/IReader.hpp>
+#include <ls_std/io/File.hpp>
 #include "XMLParseMode.hpp"
 #include "XMLParseData.hpp"
 #include <list>

+ 2 - 2
include/ls_std/logic/State.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-05
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -12,7 +12,7 @@
 
 #include <memory>
 #include <unordered_map>
-#include "../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "StateMachineTypes.hpp"
 #include "StateConnection.hpp"
 

+ 2 - 2
include/ls_std/logic/StateConnection.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-10
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -11,7 +11,7 @@
 #define LS_STD_STATE_CONNECTION_HPP
 
 #include <memory>
-#include "../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "StateMachineTypes.hpp"
 
 namespace ls_std {

+ 2 - 2
include/ls_std/logic/StateMachine.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-05
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -14,7 +14,7 @@
 #include <unordered_map>
 #include <string>
 #include <vector>
-#include "../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include "State.hpp"
 #include "StateMachineTypes.hpp"
 

+ 2 - 2
include/ls_std/serialization/ISerializable.hpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-21
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_SERIALIZABLE_HPP
 #define LS_STD_SERIALIZABLE_HPP
 
-#include "../base/Types.hpp"
+#include <ls_std/base/Types.hpp>
 
 namespace ls_std {
   class ISerializable {

+ 5 - 5
include/ls_std/serialization/boxing/SerializableJSONBoolean.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-04
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -11,10 +11,10 @@
 #define LS_STD_SERIALIZABLE_JSON_BOOLEAN_HPP
 
 #include <memory>
-#include <json.hpp>
-#include "../../base/Class.hpp"
-#include "../ISerializable.hpp"
-#include "../../boxing/Boolean.hpp"
+#include <ls_std/lib/nlohmann_json/include/nlohmann/json.hpp>
+#include <ls_std/base/Class.hpp>
+#include <ls_std/serialization/ISerializable.hpp>
+#include <ls_std/boxing/Boolean.hpp>
 
 namespace ls_std {
   class SerializableJSONBoolean : public Class, public ISerializable {

+ 5 - 5
include/ls_std/serialization/boxing/SerializableJSONDouble.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-04
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -11,10 +11,10 @@
 #define LS_STD_SERIALIZABLE_JSON_DOUBLE_HPP
 
 #include <memory>
-#include <json.hpp>
-#include "../../base/Class.hpp"
-#include "../ISerializable.hpp"
-#include "../../boxing/Double.hpp"
+#include <ls_std/lib/nlohmann_json/include/nlohmann/json.hpp>
+#include <ls_std/base/Class.hpp>
+#include <ls_std/serialization/ISerializable.hpp>
+#include <ls_std/boxing/Double.hpp>
 
 namespace ls_std {
   class SerializableJSONDouble : public Class, public ISerializable {

+ 5 - 5
include/ls_std/serialization/boxing/SerializableJSONFloat.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-04
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -11,10 +11,10 @@
 #define LS_STD_SERIALIZABLE_JSON_FLOAT_HPP
 
 #include <memory>
-#include <json.hpp>
-#include "../../base/Class.hpp"
-#include "../ISerializable.hpp"
-#include "../../boxing/Float.hpp"
+#include <ls_std/lib/nlohmann_json/include/nlohmann/json.hpp>
+#include <ls_std/base/Class.hpp>
+#include <ls_std/serialization/ISerializable.hpp>
+#include <ls_std/boxing/Float.hpp>
 
 namespace ls_std {
   class SerializableJSONFloat : public Class, public ISerializable {

+ 5 - 5
include/ls_std/serialization/boxing/SerializableJSONInteger.hpp

@@ -3,17 +3,17 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-21
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_SERIALIZABLE_JSON_INTEGER_HPP
 #define LS_STD_SERIALIZABLE_JSON_INTEGER_HPP
 
-#include "../../base/Class.hpp"
-#include "../ISerializable.hpp"
-#include "../../boxing/Integer.hpp"
-#include <json.hpp>
+#include <ls_std/serialization/ISerializable.hpp>
+#include <ls_std/base/Class.hpp>
+#include <ls_std/boxing/Integer.hpp>
+#include <ls_std/lib/nlohmann_json/include/nlohmann/json.hpp>
 
 namespace ls_std {
   class SerializableJSONInteger : public Class, public ISerializable {

+ 5 - 5
include/ls_std/serialization/boxing/SerializableJSONLong.hpp

@@ -3,17 +3,17 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-25
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_SERIALIZABLE_JSON_LONG_HPP
 #define LS_STD_SERIALIZABLE_JSON_LONG_HPP
 
-#include "../../../../../include/ls_std/base/Class.hpp"
-#include "../../../../../include/ls_std/serialization/ISerializable.hpp"
-#include "../../../../../include/ls_std/boxing/Long.hpp"
-#include <json.hpp>
+#include <ls_std/base/Class.hpp>
+#include <ls_std/serialization/ISerializable.hpp>
+#include <ls_std/boxing/Long.hpp>
+#include <ls_std/lib/nlohmann_json/include/nlohmann/json.hpp>
 
 namespace ls_std {
   class SerializableJSONLong : public Class, public ISerializable {

+ 4 - 4
include/ls_std/serialization/boxing/SerializableJSONString.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-30
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
@@ -11,9 +11,9 @@
 #define LS_STD_SERIALIZABLE_JSON_STRING_HPP
 
 #include <memory>
-#include <json.hpp>
-#include "../../../../../include/ls_std/serialization/ISerializable.hpp"
-#include "../../../../../include/ls_std/boxing/String.hpp"
+#include <ls_std/lib/nlohmann_json/include/nlohmann/json.hpp>
+#include <ls_std/serialization/ISerializable.hpp>
+#include <ls_std/boxing/String.hpp>
 
 namespace ls_std {
   class SerializableJSONString : public Class, public ISerializable {

+ 5 - 5
include/ls_std/serialization/logic/SerializableJSONState.hpp

@@ -3,18 +3,18 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-15
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_SERIALIZABLE_JSON_STATE_HPP
 #define LS_STD_SERIALIZABLE_JSON_STATE_HPP
 
-#include "../../base/Class.hpp"
-#include "../ISerializable.hpp"
-#include "../../logic/State.hpp"
 #include <memory>
-#include <json.hpp>
+#include <ls_std/lib/nlohmann_json/include/nlohmann/json.hpp>
+#include <ls_std/logic/State.hpp>
+#include <ls_std/serialization/ISerializable.hpp>
+#include <ls_std/base/Class.hpp>
 
 namespace ls_std {
   class SerializableJSONState : public Class, public ISerializable {

+ 5 - 5
include/ls_std/serialization/logic/SerializableJSONStateConnection.hpp

@@ -3,18 +3,18 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-14
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_SERIALIZABLE_JSON_STATE_CONNECTION_HPP
 #define LS_STD_SERIALIZABLE_JSON_STATE_CONNECTION_HPP
 
-#include "../../base/Class.hpp"
-#include "../ISerializable.hpp"
-#include "../../logic/StateConnection.hpp"
 #include <memory>
-#include <json.hpp>
+#include <ls_std/lib/nlohmann_json/include/nlohmann/json.hpp>
+#include <ls_std/base/Class.hpp>
+#include <ls_std/serialization/ISerializable.hpp>
+#include <ls_std/logic/StateConnection.hpp>
 
 namespace ls_std {
   class SerializableJSONStateConnection : public Class, public ISerializable {

+ 5 - 5
include/ls_std/serialization/logic/SerializableJSONStateMachine.hpp

@@ -3,18 +3,18 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-17
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_SERIALIZABLE_JSON_STATE_MACHINE_HPP
 #define LS_STD_SERIALIZABLE_JSON_STATE_MACHINE_HPP
 
-#include "../../base/Class.hpp"
-#include "../ISerializable.hpp"
-#include "../../logic/StateMachine.hpp"
+#include <ls_std/base/Class.hpp>
+#include <ls_std/serialization/ISerializable.hpp>
+#include <ls_std/logic/StateMachine.hpp>
 #include <memory>
-#include <json.hpp>
+#include <ls_std/lib/nlohmann_json/include/nlohmann/json.hpp>
 
 namespace ls_std {
   class SerializableJSONStateMachine : public Class, public ISerializable {

+ 2 - 2
include/ls_std/time/Date.hpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2020-11-06
+ * Changed:         2020-11-20
  *
  * */
 
 #ifndef LS_STD_DATE_HPP
 #define LS_STD_DATE_HPP
 
-#include "../base/Class.hpp"
+#include <ls_std/base/Class.hpp>
 #include <ctime>
 
 namespace ls_std {

+ 2 - 2
test/cases/serialization/json/JSONTest.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2020-09-14
+ * Changed:         2020-11-20
  *
  * */
 
 #include <gtest/gtest.h>
-#include <json.hpp>
+#include <ls_std/lib/nlohmann_json/include/nlohmann/json.hpp>
 
 namespace {
   class JSONTest : public ::testing::Test {