Reorder include files

- add missing include directives in ls_std.hpp file
- order include directives in ls_std.hpp file
- remove unnecessary win socket include directive

CMakeLists.txt

@@ -9,7 +9,7 @@ project(ls_std VERSION 2022.1.0)
 # Options
 ##########################################################
 
-option(LS_STD_BUILD_WITH_TESTS "Build project with tests..." ON)
+option(LS_STD_BUILD_WITH_TESTS "Build project with tests..." OFF)
 option(LS_STD_BUILD_STATIC "Build ls_std static library..." ON)
 option(LS_STD_BUILD_SHARED "Build ls_std shared library..." OFF)
 option(LS_STD_BUILD_MODULE "Build ls_std module library..." OFF)

include/ls_std/exception/EventNotHandledException.hpp → include/ls_std/core/exception/EventNotHandledException.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-05-27
- * Changed:         2021-05-27
+ * Changed:         2022-05-05
  *
  * */
 

include/ls_std/exception/EventNotSubscribedException.hpp → include/ls_std/core/exception/EventNotSubscribedException.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-05-27
- * Changed:         2021-05-27
+ * Changed:         2022-05-05
  *
  * */
 

include/ls_std/exception/FileNotFoundException.hpp → include/ls_std/core/exception/FileNotFoundException.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-17
- * Changed:         2021-04-23
+ * Changed:         2022-05-05
  *
  * */
 

include/ls_std/exception/FileOperationException.hpp → include/ls_std/core/exception/FileOperationException.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-15
- * Changed:         2021-04-23
+ * Changed:         2022-05-05
  *
  * */
 

include/ls_std/exception/IllegalArgumentException.hpp → include/ls_std/core/exception/IllegalArgumentException.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-09
- * Changed:         2021-04-23
+ * Changed:         2022-05-05
  *
  * */
 

include/ls_std/exception/IllegalArithmeticOperationException.hpp → include/ls_std/core/exception/IllegalArithmeticOperationException.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-07
- * Changed:         2021-05-01
+ * Changed:         2022-05-05
  *
  * */
 

include/ls_std/exception/IncompleteJsonException.hpp → include/ls_std/core/exception/IncompleteJsonException.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-30
- * Changed:         2021-05-01
+ * Changed:         2022-05-05
  *
  * */
 

include/ls_std/exception/NullPointerException.hpp → include/ls_std/core/exception/NullPointerException.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-11-06
- * Changed:         2021-04-23
+ * Changed:         2022-05-05
  *
  * */
 

include/ls_std/factory/IFactory.hpp → include/ls_std/core/factory/IFactory.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-23
- * Changed:         2022-04-29
+ * Changed:         2022-05-05
  *
  * */
 
@@ -11,7 +11,7 @@
 #define LS_STD_I_FACTORY_HPP
 
 #include <memory>
-#include <ls_std/core/Class.hpp>
+#include "ls_std/core/Class.hpp"
 
 namespace ls_std
 {

include/ls_std/utils/RegexUtils.hpp → include/ls_std/core/utils/RegexUtils.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-18
- * Changed:         2021-04-23
+ * Changed:         2022-05-05
  *
  * */
 

include/ls_std/utils/STLUtils.hpp → include/ls_std/core/utils/STLUtils.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-17
- * Changed:         2021-04-23
+ * Changed:         2022-05-05
  *
  * */
 

include/ls_std/utils/WindowsUtils.hpp → include/ls_std/core/utils/WindowsUtils.hpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-06
- * Changed:         2022-04-29
+ * Changed:         2022-05-05
  *
  * */
 
 #ifndef LS_STD_WINDOWS_UTILS_HPP
 #define LS_STD_WINDOWS_UTILS_HPP
 
-#include <ls_std/core/Types.hpp>
+#include "ls_std/core/Types.hpp"
 #include <string>
 #include <windows.h>
 

include/ls_std/serialization/json/event/SerializableJsonEvent.hpp → include/ls_std/event/serialization/SerializableJsonEvent.hpp

@@ -3,18 +3,18 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-07
- * Changed:         2022-04-29
+ * Changed:         2022-05-05
  *
  * */
 
 #ifndef LS_STD_SERIALIZABLE_JSON_EVENT_HPP
 #define LS_STD_SERIALIZABLE_JSON_EVENT_HPP
 
-#include <ls_std/serialization/ISerializable.hpp>
-#include <ls_std/core/Class.hpp>
-#include <ls_std/event/Event.hpp>
+#include "ls_std/serialization/ISerializable.hpp"
+#include "ls_std/core/Class.hpp"
+#include "ls_std/event/Event.hpp"
 #include <memory>
-#include <ls_std/lib/nlohmann_json/include/nlohmann/json.hpp>
+#include "ls_std/lib/nlohmann_json/include/nlohmann/json.hpp"
 
 namespace ls_std
 {

include/ls_std/serialization/json/logic/SerializableJsonState.hpp → include/ls_std/logic/serialization/SerializableJsonState.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-15
- * Changed:         2022-04-29
+ * Changed:         2022-05-05
  *
  * */
 
@@ -11,10 +11,10 @@
 #define LS_STD_SERIALIZABLE_JSON_STATE_HPP
 
 #include <memory>
-#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/core/Class.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/core/Class.hpp"
 
 namespace ls_std
 {

include/ls_std/serialization/json/logic/SerializableJsonStateConnection.hpp → include/ls_std/logic/serialization/SerializableJsonStateConnection.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-14
- * Changed:         2022-04-29
+ * Changed:         2022-05-05
  *
  * */
 
@@ -11,10 +11,10 @@
 #define LS_STD_SERIALIZABLE_JSON_STATE_CONNECTION_HPP
 
 #include <memory>
-#include <ls_std/lib/nlohmann_json/include/nlohmann/json.hpp>
-#include <ls_std/core/Class.hpp>
-#include <ls_std/serialization/ISerializable.hpp>
-#include <ls_std/logic/StateConnection.hpp>
+#include "ls_std/lib/nlohmann_json/include/nlohmann/json.hpp"
+#include "ls_std/core/Class.hpp"
+#include "ls_std/serialization/ISerializable.hpp"
+#include "ls_std/logic/StateConnection.hpp"
 
 namespace ls_std
 {

include/ls_std/serialization/json/logic/SerializableJsonStateMachine.hpp → include/ls_std/logic/serialization/SerializableJsonStateMachine.hpp

@@ -3,18 +3,18 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-17
- * Changed:         2022-04-29
+ * Changed:         2022-05-05
  *
  * */
 
 #ifndef LS_STD_SERIALIZABLE_JSON_STATE_MACHINE_HPP
 #define LS_STD_SERIALIZABLE_JSON_STATE_MACHINE_HPP
 
-#include <ls_std/core/Class.hpp>
-#include <ls_std/serialization/ISerializable.hpp>
-#include <ls_std/logic/StateMachine.hpp>
+#include "ls_std/core/Class.hpp"
+#include "ls_std/serialization/ISerializable.hpp"
+#include "ls_std/logic/StateMachine.hpp"
 #include <memory>
-#include <ls_std/lib/nlohmann_json/include/nlohmann/json.hpp>
+#include "ls_std/lib/nlohmann_json/include/nlohmann/json.hpp"
 
 namespace ls_std
 {

include/ls_std/ls_std.hpp

@@ -3,17 +3,13 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-10-29
- * Changed:         2022-04-29
+ * Changed:         2022-05-05
  *
  * */
 
 #ifndef LS_STD_LS_STD_HPP
 #define LS_STD_LS_STD_HPP
 
-#if _WIN32
-#include <winsock2.h>
-#endif
-
 #include "boxing/IBoxing.hpp"
 #include "boxing/Boolean.hpp"
 #include "boxing/Double.hpp"
@@ -22,31 +18,49 @@
 #include "boxing/Long.hpp"
 #include "boxing/String.hpp"
 
+#include "core/exception/EventNotHandledException.hpp"
+#include "core/exception/EventNotSubscribedException.hpp"
+#include "core/exception/FileNotFoundException.hpp"
+#include "core/exception/FileOperationException.hpp"
+#include "core/exception/IllegalArgumentException.hpp"
+#include "core/exception/IllegalArithmeticOperationException.hpp"
+#include "core/exception/IncompleteJsonException.hpp"
+#include "core/exception/NullPointerException.hpp"
+#include "core/factory/IFactory.hpp"
+#include "core/utils/RegexUtils.hpp"
+#include "core/utils/STLUtils.hpp"
+#if _WIN32
+#include "core/utils/WindowsUtils.hpp"
+#endif
 #include "core/Class.hpp"
+#include "core/LibraryVersion.hpp"
 #include "core/Types.hpp"
 #include "core/Version.hpp"
-#include "core/LibraryVersion.hpp"
 
-#include "exception/EventNotHandledException.hpp"
-#include "exception/EventNotSubscribedException.hpp"
-#include "exception/FileNotFoundException.hpp"
-#include "exception/FileOperationException.hpp"
-#include "exception/IllegalArgumentException.hpp"
-#include "exception/IllegalArithmeticOperationException.hpp"
-#include "exception/IncompleteJsonException.hpp"
-#include "exception/NullPointerException.hpp"
+#include "event/serialization/SerializableJsonEvent.hpp"
+#include "event/Event.hpp"
+#include "event/EventHandler.hpp"
+#include "event/EventManager.hpp"
+#include "event/EventTypes.hpp"
+#include "event/IEventSubscriber.hpp"
 
+#include "io/kv/KvDocument.hpp"
+#include "io/kv/KvFileReader.hpp"
+#include "io/kv/KvPair.hpp"
+#include "io/kv/KvParseParameter.hpp"
+#include "io/kv/KvParser.hpp"
+#include "io/kv/KvTypes.hpp"
+#include "io/logging/Logger.hpp"
 #include "io/logging/LogLevel.hpp"
 #include "io/logging/LogLevelValue.hpp"
-#include "io/logging/Logger.hpp"
-#include "io/xml/XmlReader.hpp"
+#include "io/xml/XmlAttribute.hpp"
+#include "io/xml/XmlDeclaration.hpp"
+#include "io/xml/XmlDocument.hpp"
+#include "io/xml/XmlNode.hpp"
 #include "io/xml/XmlParseMode.hpp"
 #include "io/xml/XmlParseParameter.hpp"
-#include "io/xml/XmlNode.hpp"
-#include "io/xml/XmlDocument.hpp"
-#include "io/xml/XmlDeclaration.hpp"
-#include "io/xml/XmlAttribute.hpp"
 #include "io/xml/XmlParser.hpp"
+#include "io/xml/XmlReader.hpp"
 #include "io/File.hpp"
 #include "io/FileOutputStream.hpp"
 #include "io/FilePathSeparator.hpp"
@@ -57,39 +71,21 @@
 #include "io/IStorable.hpp"
 #include "io/IWriter.hpp"
 #include "io/NewLine.hpp"
-#include "io/StorableFile.hpp"
 #include "io/StandardOutputWriter.hpp"
-#include "io/kv/KvPair.hpp"
-#include "io/kv/KvDocument.hpp"
-#include "io/kv/KvParser.hpp"
-#include "io/kv/KvFileReader.hpp"
+#include "io/StorableFile.hpp"
 
+#include "logic/serialization/SerializableJsonState.hpp"
+#include "logic/serialization/SerializableJsonStateConnection.hpp"
+#include "logic/serialization/SerializableJsonStateMachine.hpp"
+#include "logic/IListener.hpp"
+#include "logic/Narrator.hpp"
 #include "logic/State.hpp"
 #include "logic/StateConnection.hpp"
 #include "logic/StateMachine.hpp"
 #include "logic/StateMachineTypes.hpp"
 
-#include "serialization/json/logic/SerializableJsonState.hpp"
-#include "serialization/json/logic/SerializableJsonStateConnection.hpp"
-#include "serialization/json/logic/SerializableJsonStateMachine.hpp"
-#include "serialization/json/event/SerializableJsonEvent.hpp"
 #include "serialization/ISerializable.hpp"
 
 #include "time/Date.hpp"
 
-#include "utils/RegexUtils.hpp"
-#include "utils/STLUtils.hpp"
-
-#if _WIN32
-#include "utils/WindowsUtils.hpp"
-#endif
-
-#include "event/Event.hpp"
-#include "event/EventTypes.hpp"
-#include "event/EventHandler.hpp"
-#include "event/IEventSubscriber.hpp"
-#include "event/EventManager.hpp"
-
-#include "factory/IFactory.hpp"
-
 #endif

source/ls_std/boxing/Boolean.cpp

@@ -3,13 +3,13 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-09
- * Changed:         2021-07-08
+ * Changed:         2022-05-05
  *
  * */
 
 #include <algorithm>
 #include <ls_std/boxing/Boolean.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::Boolean::Boolean() : ls_std::Class("Boolean")
 {}

source/ls_std/boxing/Double.cpp

@@ -3,13 +3,13 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2021-07-12
+ * Changed:         2022-05-05
  *
  * */
 
 #include <cmath>
 #include <ls_std/boxing/Double.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::Double::Double() : ls_std::Class("Double")
 {

source/ls_std/boxing/Float.cpp

@@ -3,13 +3,13 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2021-07-12
+ * Changed:         2022-05-05
  *
  * */
 
 #include <cmath>
 #include <ls_std/boxing/Float.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::Float::Float()
     : ls_std::Class("Float"),

source/ls_std/boxing/Integer.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-07
- * Changed:         2021-07-14
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/boxing/Integer.hpp>
-#include <ls_std/exception/IllegalArithmeticOperationException.hpp>
+#include <ls_std/core/exception/IllegalArithmeticOperationException.hpp>
 
 ls_std::Integer::Integer(int _value)
     : ls_std::Class("Integer"),

source/ls_std/boxing/Long.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-17
- * Changed:         2021-07-14
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/boxing/Long.hpp>
-#include <ls_std/exception/IllegalArithmeticOperationException.hpp>
+#include <ls_std/core/exception/IllegalArithmeticOperationException.hpp>
 
 ls_std::Long::Long(ls_std::long_type _value)
     : ls_std::Class("Long"),

source/ls_std/boxing/String.cpp

@@ -3,13 +3,13 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2021-07-12
+ * Changed:         2022-05-05
  *
  * */
 
 #include <algorithm>
 #include <ls_std/boxing/String.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::String::String() : ls_std::Class("String")
 {}

source/ls_std/core/Class.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-07
- * Changed:         2022-04-29
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/core/Class.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::Class::Class(const std::string &_name)
 {

source/ls_std/event/Event.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-11-26
- * Changed:         2021-07-14
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/event/Event.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::Event::Event(const ls_std::event_id &_id) : ls_std::Class("Event")
 {

source/ls_std/event/EventHandler.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-11-27
- * Changed:         2021-05-27
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/event/EventHandler.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::EventHandler::EventHandler(const ls_std::event_id& _id) : ls_std::Narrator()
 {

source/ls_std/event/EventManager.cpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-11-27
- * Changed:         2021-05-27
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/event/EventManager.hpp>
-#include <ls_std/exception/EventNotSubscribedException.hpp>
-#include <ls_std/exception/EventNotHandledException.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/EventNotSubscribedException.hpp>
+#include <ls_std/core/exception/EventNotHandledException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::EventManager::EventManager() : ls_std::Class("EventManager")
 {}

source/ls_std/event/serialization/SerializableJsonEvent.cpp

@@ -7,8 +7,8 @@
  *
  * */
 
-#include <ls_std/serialization/json/event/SerializableJsonEvent.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include "ls_std/event/serialization/SerializableJsonEvent.hpp"
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::SerializableJsonEvent::SerializableJsonEvent(const std::shared_ptr<ls_std::Event> &_value) : ls_std::Class("SerializableJsonEvent")
 {

source/ls_std/io/File.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-15
- * Changed:         2021-09-26
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/io/File.hpp>
-#include <ls_std/exception/FileOperationException.hpp>
+#include <ls_std/core/exception/FileOperationException.hpp>
 #include <ls_std/io/FilePathSeparatorMatch.hpp>
 #include <fstream>
 #include <algorithm>

source/ls_std/io/FileOutputStream.cpp

@@ -3,13 +3,13 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-20
- * Changed:         2021-04-23
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/io/FileOutputStream.hpp>
-#include <ls_std/exception/FileNotFoundException.hpp>
-#include <ls_std/exception/FileOperationException.hpp>
+#include <ls_std/core/exception/FileNotFoundException.hpp>
+#include <ls_std/core/exception/FileOperationException.hpp>
 
 ls_std::FileOutputStream::FileOutputStream(ls_std::File &_file)
     : ls_std::Class("FileOutputStream"),

source/ls_std/io/FileReader.cpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-17
- * Changed:         2021-04-23
+ * Changed:         2022-05-05
  *
  * */
 
 #include <fstream>
 #include <ls_std/io/FileReader.hpp>
-#include <ls_std/exception/FileNotFoundException.hpp>
-#include <ls_std/exception/FileOperationException.hpp>
+#include <ls_std/core/exception/FileNotFoundException.hpp>
+#include <ls_std/core/exception/FileOperationException.hpp>
 
 ls_std::FileReader::FileReader(ls_std::File &_file)
     : ls_std::Class("FileReader"),

source/ls_std/io/FileWriter.cpp

@@ -3,14 +3,14 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-17
- * Changed:         2021-09-18
+ * Changed:         2022-05-05
  *
  * */
 
 #include <fstream>
 #include <ls_std/io/FileWriter.hpp>
-#include <ls_std/exception/FileNotFoundException.hpp>
-#include <ls_std/exception/FileOperationException.hpp>
+#include <ls_std/core/exception/FileNotFoundException.hpp>
+#include <ls_std/core/exception/FileOperationException.hpp>
 
 ls_std::FileWriter::FileWriter(ls_std::File &_file)
     : ls_std::Class("FileWriter"),

source/ls_std/io/kv/KvFileReader.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-25
- * Changed:         2021-07-15
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/io/kv/KvFileReader.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 #include <ls_std/io/FileReader.hpp>
 #include <ls_std/io/kv/KvParser.hpp>
 

source/ls_std/io/kv/KvPair.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-25
- * Changed:         2021-05-02
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/io/kv/KvPair.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::KvPair::KvPair(const ls_std::kv_key &_key, ls_std::kv_value _value)
     : ls_std::Class("KvPair"),

source/ls_std/io/kv/KvParser.cpp

@@ -3,13 +3,13 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-12-25
- * Changed:         2021-07-15
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/io/kv/KvParser.hpp>
 #include <ls_std/io/NewLine.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::KvParser::KvParser(const std::shared_ptr<ls_std::KvDocument> &_document) : ls_std::Class("KvParser")
 {

source/ls_std/io/logging/LogLevel.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-20
- * Changed:         2021-05-02
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/io/logging/LogLevel.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::LogLevel::LogLevel(const ls_std::LogLevelValue &_value)
     : ls_std::Class("LogLevel"),

source/ls_std/io/logging/Logger.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-20
- * Changed:         2021-07-16
+ * Changed:         2022-05-05
  *
  * */
 
@@ -11,7 +11,7 @@
 #include <ls_std/time/Date.hpp>
 #include <ls_std/io/NewLine.hpp>
 #include <ls_std/boxing/String.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::Logger::Logger(const std::shared_ptr<ls_std::IWriter> &_writer)
     : ls_std::Class("Logger"),

source/ls_std/io/xml/XmlAttribute.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-23
- * Changed:         2021-07-16
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/io/xml/XmlAttribute.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::XmlAttribute::XmlAttribute(const std::string& _name) : ls_std::Class("XmlAttribute")
 {

source/ls_std/io/xml/XmlDocument.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-30
- * Changed:         2021-07-16
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/io/xml/XmlDocument.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::XmlDocument::XmlDocument() : ls_std::Class("XmlDocument")
 {}

source/ls_std/io/xml/XmlNode.cpp

@@ -3,13 +3,13 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-24
- * Changed:         2021-07-16
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/io/xml/XmlNode.hpp>
-#include <ls_std/utils/STLUtils.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/utils/STLUtils.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::XmlNode::XmlNode(std::string _name)
     : ls_std::Class("XmlNode"),

source/ls_std/io/xml/XmlParser.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-11-26
- * Changed:         2021-05-02
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/io/xml/XmlParser.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 #include <ls_std/boxing/String.hpp>
 
 ls_std::XmlParser::XmlParser(const std::shared_ptr<ls_std::XmlDocument> &_document) : ls_std::Class("XmlParser")

source/ls_std/io/xml/XmlReader.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-10-10
- * Changed:         2021-05-02
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/io/xml/XmlReader.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 #include <ls_std/io/FileReader.hpp>
 #include <ls_std/boxing/String.hpp>
 #include <ls_std/io/xml/XmlParser.hpp>

source/ls_std/logic/Narrator.cpp

@@ -3,13 +3,13 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-11-14
- * Changed:         2021-05-27
+ * Changed:         2022-05-05
  *
  * */
 
-#include <ls_std/utils/STLUtils.hpp>
+#include <ls_std/core/utils/STLUtils.hpp>
 #include <ls_std/logic/Narrator.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::Narrator::Narrator() : ls_std::Class("Narrator")
 {}

source/ls_std/logic/State.cpp

@@ -3,13 +3,13 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-05
- * Changed:         2021-07-14
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/logic/State.hpp>
-#include <ls_std/exception/NullPointerException.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/NullPointerException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::State::State(const ls_std::StateId& _id) : ls_std::Class("State")
 {

source/ls_std/logic/StateConnection.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-10
- * Changed:         2021-05-27
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/logic/StateConnection.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::StateConnection::StateConnection(const ls_std::StateConnectionId& _connectionId, const ls_std::StateId& _stateId) : ls_std::Class("StateConnection")
 {

source/ls_std/logic/StateMachine.cpp

@@ -3,12 +3,12 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-09-05
- * Changed:         2021-04-23
+ * Changed:         2022-05-05
  *
  * */
 
 #include <ls_std/logic/StateMachine.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::StateMachine::StateMachine(const std::string& _name) : ls_std::Class("StateMachine")
 {

source/ls_std/logic/serialization/SerializableJsonState.cpp

@@ -7,9 +7,9 @@
  *
  * */
 
-#include <ls_std/serialization/json/logic/SerializableJsonState.hpp>
-#include <ls_std/serialization/json/logic/SerializableJsonStateConnection.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include "ls_std/logic/serialization/SerializableJsonState.hpp"
+#include "ls_std/logic/serialization/SerializableJsonStateConnection.hpp"
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::SerializableJsonState::SerializableJsonState(const std::shared_ptr<ls_std::State> &_value) : ls_std::Class("SerializableJsonState")
 {

source/ls_std/logic/serialization/SerializableJsonStateConnection.cpp

@@ -7,8 +7,8 @@
  *
  * */
 
-#include <ls_std/serialization/json/logic/SerializableJsonStateConnection.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include "ls_std/logic/serialization/SerializableJsonStateConnection.hpp"
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::SerializableJsonStateConnection::SerializableJsonStateConnection(const std::shared_ptr<ls_std::StateConnection> &_value) : ls_std::Class("SerializableJsonStateConnection")
 {

source/ls_std/logic/serialization/SerializableJsonStateMachine.cpp

@@ -7,9 +7,9 @@
  *
  * */
 
-#include <ls_std/serialization/json/logic/SerializableJsonStateMachine.hpp>
-#include <ls_std/serialization/json/logic/SerializableJsonState.hpp>
-#include <ls_std/exception/IllegalArgumentException.hpp>
+#include "ls_std/logic/serialization/SerializableJsonStateMachine.hpp"
+#include "ls_std/logic/serialization/SerializableJsonState.hpp"
+#include <ls_std/core/exception/IllegalArgumentException.hpp>
 
 ls_std::SerializableJsonStateMachine::SerializableJsonStateMachine(const std::shared_ptr<ls_std::StateMachine> &_value) : ls_std::Class("SerializableJsonStateMachine")
 {