Browse Source

Move boxing header files

Patrick 4 years ago
parent
commit
a091942bc2

+ 7 - 7
CMakeLists.txt

@@ -38,21 +38,21 @@ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/test/lib/googletest-1.8.1)
 ##########################################################
 
 set(SOURCE_FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/boxing/Integer.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/boxing/Integer.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/base/Class.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/base/Class.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/boxing/Integer.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/boxing/IBoxing.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/boxing/IBoxing.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/exception/IllegalArithmeticOperationException.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/base/Types.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/boxing/Boolean.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/boxing/Boolean.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/boxing/Boolean.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/exception/IllegalArgumentException.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/boxing/Float.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/boxing/Float.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/boxing/Float.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/boxing/Double.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/boxing/Double.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/boxing/Double.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/boxing/String.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/boxing/String.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/boxing/String.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/time/Date.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/time/Date.cpp
@@ -62,7 +62,7 @@ set(SOURCE_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/FilePathSeparatorMatch.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/FilePathSeparator.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/utils/STLUtils.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/boxing/Long.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/boxing/Long.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/boxing/Long.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/IWriter.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/FileWriter.hpp

+ 3 - 3
source/ls_std/boxing/Boolean.hpp → include/ls_std/boxing/Boolean.hpp

@@ -11,10 +11,10 @@
 #define LS_STD_BOOLEAN_HPP
 
 #include <memory>
-#include "../../../include/ls_std/base/Class.hpp"
+#include "../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 {

+ 3 - 3
source/ls_std/boxing/Double.hpp → include/ls_std/boxing/Double.hpp

@@ -11,10 +11,10 @@
 #define LS_STD_DOUBLE_HPP
 
 #include <memory>
-#include "../../../include/ls_std/base/Class.hpp"
+#include "../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 {

+ 3 - 3
source/ls_std/boxing/Float.hpp → include/ls_std/boxing/Float.hpp

@@ -11,10 +11,10 @@
 #define LS_STD_FLOAT_HPP
 
 #include <memory>
-#include "../../../include/ls_std/base/Class.hpp"
+#include "../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 {

+ 1 - 1
source/ls_std/boxing/IBoxing.hpp → include/ls_std/boxing/IBoxing.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-07
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 

+ 3 - 3
source/ls_std/boxing/Integer.hpp → include/ls_std/boxing/Integer.hpp

@@ -11,10 +11,10 @@
 #define LS_STD_INTEGER_HPP
 
 #include <memory>
-#include "../../../include/ls_std/base/Class.hpp"
+#include "../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 {

+ 4 - 4
source/ls_std/boxing/Long.hpp → include/ls_std/boxing/Long.hpp

@@ -11,11 +11,11 @@
 #define LS_STD_LONG_HPP
 
 #include <memory>
-#include "../../../include/ls_std/base/Class.hpp"
+#include "../base/Class.hpp"
 #include "IBoxing.hpp"
-#include "../../../include/ls_std/base/Types.hpp"
-#include "../serialization/ISerializable.hpp"
-#include "../io/IStorable.hpp"
+#include "../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 {

+ 3 - 3
source/ls_std/boxing/String.hpp → include/ls_std/boxing/String.hpp

@@ -11,9 +11,9 @@
 #define LS_STD_STRING_HPP
 
 #include "IBoxing.hpp"
-#include "../../../include/ls_std/base/Class.hpp"
-#include "../serialization/ISerializable.hpp"
-#include "../io/IStorable.hpp"
+#include "../base/Class.hpp"
+#include "ls_std/serialization/ISerializable.hpp"
+#include "ls_std/io/IStorable.hpp"
 #include <string>
 #include <memory>
 #include <vector>

+ 2 - 2
source/ls_std/boxing/Boolean.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-09
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
 #include <algorithm>
-#include "Boolean.hpp"
+#include "../../../include/ls_std/boxing/Boolean.hpp"
 #include "../exception/IllegalArgumentException.hpp"
 
 ls_std::Boolean::Boolean() : Class("Boolean")

+ 2 - 2
source/ls_std/boxing/Double.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
 #include <cmath>
-#include "Double.hpp"
+#include "../../../include/ls_std/boxing/Double.hpp"
 
 ls_std::Double::Double() : Class("Double"),
 epsilon(0.00000001)

+ 2 - 2
source/ls_std/boxing/Float.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
 #include <cmath>
-#include "Float.hpp"
+#include "../../../include/ls_std/boxing/Float.hpp"
 
 ls_std::Float::Float() : Class("Float"),
 epsilon(0.00001f)

+ 2 - 2
source/ls_std/boxing/Integer.cpp

@@ -3,11 +3,11 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-07
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
-#include "Integer.hpp"
+#include "../../../include/ls_std/boxing/Integer.hpp"
 #include "../exception/IllegalArithmeticOperationException.hpp"
 
 ls_std::Integer::Integer(int _value) : Class("Integer"),

+ 2 - 2
source/ls_std/boxing/Long.cpp

@@ -3,11 +3,11 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-17
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
-#include "Long.hpp"
+#include "../../../include/ls_std/boxing/Long.hpp"
 
 #include <utility>
 #include "../exception/IllegalArithmeticOperationException.hpp"

+ 2 - 2
source/ls_std/boxing/String.cpp

@@ -3,13 +3,13 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
 #include <algorithm>
 #include <utility>
-#include "String.hpp"
+#include "../../../include/ls_std/boxing/String.hpp"
 
 ls_std::String::String() : Class("String")
 {}

+ 2 - 2
source/ls_std/io/logging/Logger.cpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-20
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
 #include "Logger.hpp"
 #include "../../time/Date.hpp"
 #include "../NewLine.hpp"
-#include "../../boxing/String.hpp"
+#include "../../../../include/ls_std/boxing/String.hpp"
 
 ls_std::Logger::Logger(const std::string &_path) : Class("Logger"),
 file(ls_std::File{_path}),

+ 2 - 2
source/ls_std/io/xml/XMLReader.cpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-10-10
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
 #include "XMLReader.hpp"
 #include "../../exception/IllegalArgumentException.hpp"
 #include "../FileReader.hpp"
-#include "../../boxing/String.hpp"
+#include "../../../../include/ls_std/boxing/String.hpp"
 
 ls_std::XMLReader::XMLReader(const std::shared_ptr<ls_std::XMLDocument>& _document, const std::string& _absolutePath) :
 Class("XMLReader"),

+ 7 - 7
source/ls_std/ls_std.hpp

@@ -14,13 +14,13 @@
 #include "../../include/ls_std/base/Types.hpp"
 #include "../../include/ls_std/base/Version.hpp"
 
-#include "boxing/IBoxing.hpp"
-#include "boxing/Boolean.hpp"
-#include "boxing/Double.hpp"
-#include "boxing/Float.hpp"
-#include "boxing/Integer.hpp"
-#include "boxing/Long.hpp"
-#include "boxing/String.hpp"
+#include "../../include/ls_std/boxing/IBoxing.hpp"
+#include "../../include/ls_std/boxing/Boolean.hpp"
+#include "../../include/ls_std/boxing/Double.hpp"
+#include "../../include/ls_std/boxing/Float.hpp"
+#include "../../include/ls_std/boxing/Integer.hpp"
+#include "../../include/ls_std/boxing/Long.hpp"
+#include "../../include/ls_std/boxing/String.hpp"
 
 #include "exception/FileNotFoundException.hpp"
 #include "exception/FileOperationException.hpp"

+ 1 - 1
source/ls_std/serialization/json/boxing/SerializableJSONBoolean.hpp

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

+ 1 - 1
source/ls_std/serialization/json/boxing/SerializableJSONDouble.hpp

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

+ 1 - 1
source/ls_std/serialization/json/boxing/SerializableJSONFloat.hpp

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

+ 1 - 1
source/ls_std/serialization/json/boxing/SerializableJSONInteger.hpp

@@ -12,7 +12,7 @@
 
 #include "../../../../../include/ls_std/base/Class.hpp"
 #include "../../ISerializable.hpp"
-#include "../../../boxing/Integer.hpp"
+#include "../../../../../include/ls_std/boxing/Integer.hpp"
 #include <json.hpp>
 
 namespace ls_std {

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

@@ -12,7 +12,7 @@
 
 #include "../../../../../include/ls_std/base/Class.hpp"
 #include "../../ISerializable.hpp"
-#include "../../../boxing/Long.hpp"
+#include "../../../../../include/ls_std/boxing/Long.hpp"
 #include <json.hpp>
 
 namespace ls_std {

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

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-30
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
@@ -13,7 +13,7 @@
 #include <memory>
 #include <json.hpp>
 #include "../../ISerializable.hpp"
-#include "../../../boxing/String.hpp"
+#include "../../../../../include/ls_std/boxing/String.hpp"
 
 namespace ls_std {
   class SerializableJSONString : public Class, public ISerializable {