Add parent include directory

CMakeLists.txt

@@ -39,12 +39,12 @@ 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/base/Class.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}/source/ls_std/exception/IllegalArithmeticOperationException.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/base/Types.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}/source/ls_std/boxing/Boolean.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/exception/IllegalArgumentException.hpp
@@ -115,7 +115,7 @@ set(SOURCE_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/xml/XMLNode.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/xml/XMLDocument.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/xml/XMLDeclaration.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/base/Version.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/base/Version.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/base/Version.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/xml/XMLDeclaration.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/xml/XMLDocument.cpp

source/ls_std/base/Class.cpp

@@ -7,7 +7,7 @@
  *
  * */
 
-#include "../../../include/base/Class.hpp"
+#include "../../../include/ls_std/base/Class.hpp"
 
 ls_std::Class::Class(std::string _name):
 name(std::move(_name))

source/ls_std/base/Version.cpp

@@ -8,7 +8,7 @@
  * */
 
 #include <regex>
-#include "../../../include/base/Version.hpp"
+#include "../../../include/ls_std/base/Version.hpp"
 
 ls_std::Version::Version(version_type _majorVersion, version_type _minorVersion, version_type _patchVersion) :
 majorVersion(_majorVersion),

source/ls_std/boxing/Boolean.hpp

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

source/ls_std/boxing/Double.hpp

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

source/ls_std/boxing/Float.hpp

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

source/ls_std/boxing/Integer.hpp

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

source/ls_std/boxing/Long.hpp

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

source/ls_std/boxing/String.hpp

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

source/ls_std/io/File.hpp

@@ -10,7 +10,7 @@
 #ifndef LS_STD_FILE_HPP
 #define LS_STD_FILE_HPP
 
-#include "../../../include/base/Class.hpp"
+#include "../../../include/ls_std/base/Class.hpp"
 #include <string>
 #include <vector>
 #include <list>

source/ls_std/io/FileOutputStream.hpp

@@ -10,7 +10,7 @@
 #ifndef LS_STD_FILE_OUTPUT_STREAM_HPP
 #define LS_STD_FILE_OUTPUT_STREAM_HPP
 
-#include "../../../include/base/Class.hpp"
+#include "../../../include/ls_std/base/Class.hpp"
 #include "File.hpp"
 #include "IWriter.hpp"
 #include <fstream>

source/ls_std/io/FileReader.hpp

@@ -10,7 +10,7 @@
 #ifndef LS_STD_FILE_READER_HPP
 #define LS_STD_FILE_READER_HPP
 
-#include "../../../include/base/Class.hpp"
+#include "../../../include/ls_std/base/Class.hpp"
 #include "File.hpp"
 #include "IReader.hpp"
 

source/ls_std/io/FileWriter.hpp

@@ -10,7 +10,7 @@
 #ifndef LS_STD_FILE_WRITER_HPP
 #define LS_STD_FILE_WRITER_HPP
 
-#include "../../../include/base/Class.hpp"
+#include "../../../include/ls_std/base/Class.hpp"
 #include "IWriter.hpp"
 #include "File.hpp"
 

source/ls_std/io/IReader.hpp

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

source/ls_std/io/IStorable.hpp

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

source/ls_std/io/IWriter.hpp

@@ -11,7 +11,7 @@
 #define LS_STD_I_WRITER_HPP
 
 #include <vector>
-#include "../../../include/base/Types.hpp"
+#include "../../../include/ls_std/base/Types.hpp"
 
 namespace ls_std {
   class IWriter {

source/ls_std/io/logging/LogLevel.hpp

@@ -11,7 +11,7 @@
 #define LS_STD_LOG_LEVEL_HPP
 
 #include <unordered_map>
-#include "../../../../include/base/Class.hpp"
+#include "../../../../include/ls_std/base/Class.hpp"
 #include "LogLevelValue.hpp"
 
 namespace ls_std {

source/ls_std/io/logging/Logger.hpp

@@ -10,7 +10,7 @@
 #ifndef LS_STD_LOGGER_HPP
 #define LS_STD_LOGGER_HPP
 
-#include "../../../../include/base/Class.hpp"
+#include "../../../../include/ls_std/base/Class.hpp"
 #include "LogLevel.hpp"
 #include "../IWriter.hpp"
 #include "../File.hpp"

source/ls_std/io/xml/XMLAttribute.hpp

@@ -10,7 +10,7 @@
 #ifndef LS_STD_XML_ATTRIBUTE_HPP
 #define LS_STD_XML_ATTRIBUTE_HPP
 
-#include "../../../../include/base/Class.hpp"
+#include "../../../../include/ls_std/base/Class.hpp"
 #include <string>
 
 namespace ls_std {

source/ls_std/io/xml/XMLDeclaration.hpp

@@ -10,7 +10,7 @@
 #ifndef LS_STD_XML_DECLARATION_HPP
 #define LS_STD_XML_DECLARATION_HPP
 
-#include "../../../../include/base/Class.hpp"
+#include "../../../../include/ls_std/base/Class.hpp"
 #include "XMLAttribute.hpp"
 
 namespace ls_std {

source/ls_std/io/xml/XMLDocument.hpp

@@ -11,7 +11,7 @@
 #define LS_STD_XML_DOCUMENT_HPP
 
 #include <memory>
-#include "../../../../include/base/Class.hpp"
+#include "../../../../include/ls_std/base/Class.hpp"
 #include "XMLNode.hpp"
 #include "XMLDeclaration.hpp"
 

source/ls_std/io/xml/XMLNode.hpp

@@ -12,7 +12,7 @@
 
 #include <list>
 #include <memory>
-#include "../../../../include/base/Class.hpp"
+#include "../../../../include/ls_std/base/Class.hpp"
 #include "XMLAttribute.hpp"
 
 namespace ls_std {

source/ls_std/io/xml/XMLReader.hpp

@@ -10,7 +10,7 @@
 #ifndef LS_STD_XML_READER_HPP
 #define LS_STD_XML_READER_HPP
 
-#include "../../../../include/base/Class.hpp"
+#include "../../../../include/ls_std/base/Class.hpp"
 #include "XMLDocument.hpp"
 #include "../IReader.hpp"
 #include "../File.hpp"

source/ls_std/logic/State.hpp

@@ -12,7 +12,7 @@
 
 #include <memory>
 #include <unordered_map>
-#include "../../../include/base/Class.hpp"
+#include "../../../include/ls_std/base/Class.hpp"
 #include "StateMachineTypes.hpp"
 #include "StateConnection.hpp"
 

source/ls_std/logic/StateConnection.hpp

@@ -11,7 +11,7 @@
 #define LS_STD_STATE_CONNECTION_HPP
 
 #include <memory>
-#include "../../../include/base/Class.hpp"
+#include "../../../include/ls_std/base/Class.hpp"
 #include "StateMachineTypes.hpp"
 
 namespace ls_std {

source/ls_std/logic/StateMachine.hpp

@@ -14,7 +14,7 @@
 #include <unordered_map>
 #include <string>
 #include <vector>
-#include "../../../include/base/Class.hpp"
+#include "../../../include/ls_std/base/Class.hpp"
 #include "State.hpp"
 #include "StateMachineTypes.hpp"
 

source/ls_std/ls_std.hpp

@@ -10,9 +10,9 @@
 #ifndef LS_STD_LS_STD_HPP
 #define LS_STD_LS_STD_HPP
 
-#include "../../include/base/Class.hpp"
-#include "../../include/base/Types.hpp"
-#include "../../include/base/Version.hpp"
+#include "../../include/ls_std/base/Class.hpp"
+#include "../../include/ls_std/base/Types.hpp"
+#include "../../include/ls_std/base/Version.hpp"
 
 #include "boxing/IBoxing.hpp"
 #include "boxing/Boolean.hpp"

source/ls_std/serialization/ISerializable.hpp

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

source/ls_std/serialization/json/boxing/SerializableJSONBoolean.hpp

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

source/ls_std/serialization/json/boxing/SerializableJSONDouble.hpp

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

source/ls_std/serialization/json/boxing/SerializableJSONFloat.hpp

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

source/ls_std/serialization/json/boxing/SerializableJSONInteger.hpp

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

source/ls_std/serialization/json/boxing/SerializableJSONLong.hpp

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

source/ls_std/serialization/json/logic/SerializableJSONState.hpp

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

source/ls_std/serialization/json/logic/SerializableJSONStateConnection.hpp

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

source/ls_std/serialization/json/logic/SerializableJSONStateMachine.hpp

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

source/ls_std/time/Date.hpp

@@ -10,7 +10,7 @@
 #ifndef LS_STD_DATE_HPP
 #define LS_STD_DATE_HPP
 
-#include "../../../include/base/Class.hpp"
+#include "../../../include/ls_std/base/Class.hpp"
 #include <ctime>
 
 namespace ls_std {