Browse Source

Move serialization header files

Patrick 3 years ago
parent
commit
7c82765c88
28 changed files with 71 additions and 71 deletions
  1. 10 10
      CMakeLists.txt
  2. 1 1
      include/ls_std/base/Version.hpp
  3. 1 1
      include/ls_std/boxing/Boolean.hpp
  4. 1 1
      include/ls_std/boxing/Double.hpp
  5. 1 1
      include/ls_std/boxing/Float.hpp
  6. 1 1
      include/ls_std/boxing/Integer.hpp
  7. 1 1
      include/ls_std/boxing/Long.hpp
  8. 1 1
      include/ls_std/boxing/String.hpp
  9. 1 1
      include/ls_std/serialization/ISerializable.hpp
  10. 3 3
      include/ls_std/serialization/boxing/SerializableJSONBoolean.hpp
  11. 3 3
      include/ls_std/serialization/boxing/SerializableJSONDouble.hpp
  12. 3 3
      include/ls_std/serialization/boxing/SerializableJSONFloat.hpp
  13. 3 3
      include/ls_std/serialization/boxing/SerializableJSONInteger.hpp
  14. 1 1
      include/ls_std/serialization/boxing/SerializableJSONLong.hpp
  15. 1 1
      include/ls_std/serialization/boxing/SerializableJSONString.hpp
  16. 3 3
      include/ls_std/serialization/logic/SerializableJSONState.hpp
  17. 3 3
      include/ls_std/serialization/logic/SerializableJSONStateConnection.hpp
  18. 3 3
      include/ls_std/serialization/logic/SerializableJSONStateMachine.hpp
  19. 10 10
      source/ls_std/ls_std.hpp
  20. 2 2
      source/ls_std/serialization/json/boxing/SerializableJSONBoolean.cpp
  21. 2 2
      source/ls_std/serialization/json/boxing/SerializableJSONDouble.cpp
  22. 2 2
      source/ls_std/serialization/json/boxing/SerializableJSONFloat.cpp
  23. 2 2
      source/ls_std/serialization/json/boxing/SerializableJSONInteger.cpp
  24. 2 2
      source/ls_std/serialization/json/boxing/SerializableJSONLong.cpp
  25. 2 2
      source/ls_std/serialization/json/boxing/SerializableJSONString.cpp
  26. 3 3
      source/ls_std/serialization/json/logic/SerializableJSONState.cpp
  27. 2 2
      source/ls_std/serialization/json/logic/SerializableJSONStateConnection.cpp
  28. 3 3
      source/ls_std/serialization/json/logic/SerializableJSONStateMachine.cpp

+ 10 - 10
CMakeLists.txt

@@ -83,18 +83,18 @@ set(SOURCE_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/logging/Logger.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/logging/LogLevel.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/logging/LogLevelValue.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/ISerializable.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONInteger.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/serialization/ISerializable.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/serialization/boxing/SerializableJSONInteger.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONInteger.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONLong.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/serialization/boxing/SerializableJSONLong.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONLong.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONString.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/serialization/boxing/SerializableJSONString.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONString.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONFloat.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/serialization/boxing/SerializableJSONFloat.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONFloat.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONDouble.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/serialization/boxing/SerializableJSONDouble.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONDouble.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONBoolean.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/serialization/boxing/SerializableJSONBoolean.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/boxing/SerializableJSONBoolean.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/logic/StateMachine.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/logic/StateMachine.cpp
@@ -103,11 +103,11 @@ set(SOURCE_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/logic/StateConnection.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/logic/StateConnection.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/logic/StateMachineTypes.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/logic/SerializableJSONStateConnection.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/serialization/logic/SerializableJSONStateConnection.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/logic/SerializableJSONStateConnection.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/logic/SerializableJSONState.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/serialization/logic/SerializableJSONState.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/logic/SerializableJSONState.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/logic/SerializableJSONStateMachine.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/serialization/logic/SerializableJSONStateMachine.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/serialization/json/logic/SerializableJSONStateMachine.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/xml/XMLAttribute.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/xml/XMLAttribute.cpp

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

@@ -11,7 +11,7 @@
 #define LS_STD_VERSION_HPP
 
 #include "Class.hpp"
-#include "ls_std/serialization/ISerializable.hpp"
+#include "../serialization/ISerializable.hpp"
 #include "Types.hpp"
 
 namespace ls_std {

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

@@ -13,7 +13,7 @@
 #include <memory>
 #include "../base/Class.hpp"
 #include "IBoxing.hpp"
-#include "ls_std/serialization/ISerializable.hpp"
+#include "../serialization/ISerializable.hpp"
 #include "../io/IStorable.hpp"
 
 namespace ls_std {

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

@@ -13,7 +13,7 @@
 #include <memory>
 #include "../base/Class.hpp"
 #include "IBoxing.hpp"
-#include "ls_std/serialization/ISerializable.hpp"
+#include "../serialization/ISerializable.hpp"
 #include "../io/IStorable.hpp"
 
 namespace ls_std {

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

@@ -13,7 +13,7 @@
 #include <memory>
 #include "../base/Class.hpp"
 #include "IBoxing.hpp"
-#include "ls_std/serialization/ISerializable.hpp"
+#include "../serialization/ISerializable.hpp"
 #include "../io/IStorable.hpp"
 
 namespace ls_std {

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

@@ -13,7 +13,7 @@
 #include <memory>
 #include "../base/Class.hpp"
 #include "IBoxing.hpp"
-#include "ls_std/serialization/ISerializable.hpp"
+#include "../serialization/ISerializable.hpp"
 #include "../io/IStorable.hpp"
 
 namespace ls_std {

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

@@ -14,7 +14,7 @@
 #include "../base/Class.hpp"
 #include "IBoxing.hpp"
 #include "../base/Types.hpp"
-#include "ls_std/serialization/ISerializable.hpp"
+#include "../serialization/ISerializable.hpp"
 #include "../io/IStorable.hpp"
 
 namespace ls_std {

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

@@ -12,7 +12,7 @@
 
 #include "IBoxing.hpp"
 #include "../base/Class.hpp"
-#include "ls_std/serialization/ISerializable.hpp"
+#include "../serialization/ISerializable.hpp"
 #include "../io/IStorable.hpp"
 #include <string>
 #include <memory>

+ 1 - 1
source/ls_std/serialization/ISerializable.hpp → include/ls_std/serialization/ISerializable.hpp

@@ -10,7 +10,7 @@
 #ifndef LS_STD_SERIALIZABLE_HPP
 #define LS_STD_SERIALIZABLE_HPP
 
-#include "../../../include/ls_std/base/Types.hpp"
+#include "../base/Types.hpp"
 
 namespace ls_std {
   class ISerializable {

+ 3 - 3
source/ls_std/serialization/json/boxing/SerializableJSONBoolean.hpp → include/ls_std/serialization/boxing/SerializableJSONBoolean.hpp

@@ -12,9 +12,9 @@
 
 #include <memory>
 #include <json.hpp>
-#include "../../../../../include/ls_std/base/Class.hpp"
-#include "../../ISerializable.hpp"
-#include "../../../../../include/ls_std/boxing/Boolean.hpp"
+#include "../../base/Class.hpp"
+#include "../ISerializable.hpp"
+#include "../../boxing/Boolean.hpp"
 
 namespace ls_std {
   class SerializableJSONBoolean : public Class, public ISerializable {

+ 3 - 3
source/ls_std/serialization/json/boxing/SerializableJSONDouble.hpp → include/ls_std/serialization/boxing/SerializableJSONDouble.hpp

@@ -12,9 +12,9 @@
 
 #include <memory>
 #include <json.hpp>
-#include "../../../../../include/ls_std/base/Class.hpp"
-#include "../../ISerializable.hpp"
-#include "../../../../../include/ls_std/boxing/Double.hpp"
+#include "../../base/Class.hpp"
+#include "../ISerializable.hpp"
+#include "../../boxing/Double.hpp"
 
 namespace ls_std {
   class SerializableJSONDouble : public Class, public ISerializable {

+ 3 - 3
source/ls_std/serialization/json/boxing/SerializableJSONFloat.hpp → include/ls_std/serialization/boxing/SerializableJSONFloat.hpp

@@ -12,9 +12,9 @@
 
 #include <memory>
 #include <json.hpp>
-#include "../../../../../include/ls_std/base/Class.hpp"
-#include "../../ISerializable.hpp"
-#include "../../../../../include/ls_std/boxing/Float.hpp"
+#include "../../base/Class.hpp"
+#include "../ISerializable.hpp"
+#include "../../boxing/Float.hpp"
 
 namespace ls_std {
   class SerializableJSONFloat : public Class, public ISerializable {

+ 3 - 3
source/ls_std/serialization/json/boxing/SerializableJSONInteger.hpp → include/ls_std/serialization/boxing/SerializableJSONInteger.hpp

@@ -10,9 +10,9 @@
 #ifndef LS_STD_SERIALIZABLE_JSON_INTEGER_HPP
 #define LS_STD_SERIALIZABLE_JSON_INTEGER_HPP
 
-#include "../../../../../include/ls_std/base/Class.hpp"
-#include "../../ISerializable.hpp"
-#include "../../../../../include/ls_std/boxing/Integer.hpp"
+#include "../../base/Class.hpp"
+#include "../ISerializable.hpp"
+#include "../../boxing/Integer.hpp"
 #include <json.hpp>
 
 namespace ls_std {

+ 1 - 1
source/ls_std/serialization/json/boxing/SerializableJSONLong.hpp → include/ls_std/serialization/boxing/SerializableJSONLong.hpp

@@ -11,7 +11,7 @@
 #define LS_STD_SERIALIZABLE_JSON_LONG_HPP
 
 #include "../../../../../include/ls_std/base/Class.hpp"
-#include "../../ISerializable.hpp"
+#include "../../../../../include/ls_std/serialization/ISerializable.hpp"
 #include "../../../../../include/ls_std/boxing/Long.hpp"
 #include <json.hpp>
 

+ 1 - 1
source/ls_std/serialization/json/boxing/SerializableJSONString.hpp → include/ls_std/serialization/boxing/SerializableJSONString.hpp

@@ -12,7 +12,7 @@
 
 #include <memory>
 #include <json.hpp>
-#include "../../ISerializable.hpp"
+#include "../../../../../include/ls_std/serialization/ISerializable.hpp"
 #include "../../../../../include/ls_std/boxing/String.hpp"
 
 namespace ls_std {

+ 3 - 3
source/ls_std/serialization/json/logic/SerializableJSONState.hpp → include/ls_std/serialization/logic/SerializableJSONState.hpp

@@ -10,9 +10,9 @@
 #ifndef LS_STD_SERIALIZABLE_JSON_STATE_HPP
 #define LS_STD_SERIALIZABLE_JSON_STATE_HPP
 
-#include "../../../../../include/ls_std/base/Class.hpp"
-#include "../../ISerializable.hpp"
-#include "../../../../../include/ls_std/logic/State.hpp"
+#include "../../base/Class.hpp"
+#include "../ISerializable.hpp"
+#include "../../logic/State.hpp"
 #include <memory>
 #include <json.hpp>
 

+ 3 - 3
source/ls_std/serialization/json/logic/SerializableJSONStateConnection.hpp → include/ls_std/serialization/logic/SerializableJSONStateConnection.hpp

@@ -10,9 +10,9 @@
 #ifndef LS_STD_SERIALIZABLE_JSON_STATE_CONNECTION_HPP
 #define LS_STD_SERIALIZABLE_JSON_STATE_CONNECTION_HPP
 
-#include "../../../../../include/ls_std/base/Class.hpp"
-#include "../../ISerializable.hpp"
-#include "../../../../../include/ls_std/logic/StateConnection.hpp"
+#include "../../base/Class.hpp"
+#include "../ISerializable.hpp"
+#include "../../logic/StateConnection.hpp"
 #include <memory>
 #include <json.hpp>
 

+ 3 - 3
source/ls_std/serialization/json/logic/SerializableJSONStateMachine.hpp → include/ls_std/serialization/logic/SerializableJSONStateMachine.hpp

@@ -10,9 +10,9 @@
 #ifndef LS_STD_SERIALIZABLE_JSON_STATE_MACHINE_HPP
 #define LS_STD_SERIALIZABLE_JSON_STATE_MACHINE_HPP
 
-#include "../../../../../include/ls_std/base/Class.hpp"
-#include "../../ISerializable.hpp"
-#include "../../../../../include/ls_std/logic/StateMachine.hpp"
+#include "../../base/Class.hpp"
+#include "../ISerializable.hpp"
+#include "../../logic/StateMachine.hpp"
 #include <memory>
 #include <json.hpp>
 

+ 10 - 10
source/ls_std/ls_std.hpp

@@ -55,16 +55,16 @@
 #include "../../include/ls_std/logic/StateMachine.hpp"
 #include "../../include/ls_std/logic/StateMachineTypes.hpp"
 
-#include "serialization/json/boxing/SerializableJSONBoolean.hpp"
-#include "serialization/json/boxing/SerializableJSONDouble.hpp"
-#include "serialization/json/boxing/SerializableJSONFloat.hpp"
-#include "serialization/json/boxing/SerializableJSONInteger.hpp"
-#include "serialization/json/boxing/SerializableJSONLong.hpp"
-#include "serialization/json/boxing/SerializableJSONString.hpp"
-#include "serialization/json/logic/SerializableJSONState.hpp"
-#include "serialization/json/logic/SerializableJSONStateConnection.hpp"
-#include "serialization/json/logic/SerializableJSONStateMachine.hpp"
-#include "serialization/ISerializable.hpp"
+#include "../../include/ls_std/serialization/boxing/SerializableJSONBoolean.hpp"
+#include "../../include/ls_std/serialization/boxing/SerializableJSONDouble.hpp"
+#include "../../include/ls_std/serialization/boxing/SerializableJSONFloat.hpp"
+#include "../../include/ls_std/serialization/boxing/SerializableJSONInteger.hpp"
+#include "../../include/ls_std/serialization/boxing/SerializableJSONLong.hpp"
+#include "../../include/ls_std/serialization/boxing/SerializableJSONString.hpp"
+#include "../../include/ls_std/serialization/logic/SerializableJSONState.hpp"
+#include "../../include/ls_std/serialization/logic/SerializableJSONStateConnection.hpp"
+#include "../../include/ls_std/serialization/logic/SerializableJSONStateMachine.hpp"
+#include "../../include/ls_std/serialization/ISerializable.hpp"
 
 #include "time/Date.hpp"
 

+ 2 - 2
source/ls_std/serialization/json/boxing/SerializableJSONBoolean.cpp

@@ -3,11 +3,11 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-04
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
-#include "SerializableJSONBoolean.hpp"
+#include "../../../../../include/ls_std/serialization/boxing/SerializableJSONBoolean.hpp"
 
 ls_std::SerializableJSONBoolean::SerializableJSONBoolean(std::shared_ptr<ls_std::Boolean> _value) :
 Class("SerializableJSONBoolean"),

+ 2 - 2
source/ls_std/serialization/json/boxing/SerializableJSONDouble.cpp

@@ -3,11 +3,11 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-04
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
-#include "SerializableJSONDouble.hpp"
+#include "../../../../../include/ls_std/serialization/boxing/SerializableJSONDouble.hpp"
 
 ls_std::SerializableJSONDouble::SerializableJSONDouble(std::shared_ptr<ls_std::Double> _value) :
 Class("SerializableJSONDouble"),

+ 2 - 2
source/ls_std/serialization/json/boxing/SerializableJSONFloat.cpp

@@ -3,11 +3,11 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-04
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
-#include "SerializableJSONFloat.hpp"
+#include "../../../../../include/ls_std/serialization/boxing/SerializableJSONFloat.hpp"
 
 ls_std::SerializableJSONFloat::SerializableJSONFloat(std::shared_ptr<ls_std::Float> _value) :
 Class("SerializableJSONFloat"),

+ 2 - 2
source/ls_std/serialization/json/boxing/SerializableJSONInteger.cpp

@@ -3,11 +3,11 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-21
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
-#include "SerializableJSONInteger.hpp"
+#include "../../../../../include/ls_std/serialization/boxing/SerializableJSONInteger.hpp"
 
 ls_std::SerializableJSONInteger::SerializableJSONInteger(std::shared_ptr<ls_std::Integer> _value) :
 Class("SerializableJSONInteger"),

+ 2 - 2
source/ls_std/serialization/json/boxing/SerializableJSONLong.cpp

@@ -3,11 +3,11 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-25
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
-#include "SerializableJSONLong.hpp"
+#include "../../../../../include/ls_std/serialization/boxing/SerializableJSONLong.hpp"
 
 ls_std::SerializableJSONLong::SerializableJSONLong(std::shared_ptr<ls_std::Long> _value) :
 Class("SerializableJSONLong"),

+ 2 - 2
source/ls_std/serialization/json/boxing/SerializableJSONString.cpp

@@ -3,11 +3,11 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-30
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
-#include "SerializableJSONString.hpp"
+#include "../../../../../include/ls_std/serialization/boxing/SerializableJSONString.hpp"
 
 ls_std::SerializableJSONString::SerializableJSONString(std::shared_ptr<ls_std::String> _value) :
 Class("SerializableJSONString"),

+ 3 - 3
source/ls_std/serialization/json/logic/SerializableJSONState.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-15
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
-#include "SerializableJSONState.hpp"
-#include "SerializableJSONStateConnection.hpp"
+#include "../../../../../include/ls_std/serialization/logic/SerializableJSONState.hpp"
+#include "../../../../../include/ls_std/serialization/logic/SerializableJSONStateConnection.hpp"
 
 ls_std::SerializableJSONState::SerializableJSONState(std::shared_ptr<State> _value) :
 Class("SerializableJSONState"),

+ 2 - 2
source/ls_std/serialization/json/logic/SerializableJSONStateConnection.cpp

@@ -3,11 +3,11 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-14
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
-#include "SerializableJSONStateConnection.hpp"
+#include "../../../../../include/ls_std/serialization/logic/SerializableJSONStateConnection.hpp"
 
 #include <utility>
 

+ 3 - 3
source/ls_std/serialization/json/logic/SerializableJSONStateMachine.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-17
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
-#include "SerializableJSONStateMachine.hpp"
-#include "SerializableJSONState.hpp"
+#include "../../../../../include/ls_std/serialization/logic/SerializableJSONStateMachine.hpp"
+#include "../../../../../include/ls_std/serialization/logic/SerializableJSONState.hpp"
 
 ls_std::SerializableJSONStateMachine::SerializableJSONStateMachine(std::shared_ptr<StateMachine> _value) :
 Class("SerializableJSONStateMachine"),