Browse Source

Move io header files

Patrick 3 years ago
parent
commit
084455dc98

+ 12 - 12
CMakeLists.txt

@@ -56,28 +56,28 @@ set(SOURCE_FILES
         ${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
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/File.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/File.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/File.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/exception/FileOperationException.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/FilePathSeparatorMatch.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/FilePathSeparator.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/FilePathSeparatorMatch.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/FilePathSeparator.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/utils/STLUtils.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
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/IWriter.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/FileWriter.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/FileWriter.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/exception/FileNotFoundException.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/IReader.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/FileReader.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/IReader.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/FileReader.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/FileReader.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/NewLine.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/NewLine.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/utils/RegexUtils.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/IStorable.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/StorableFile.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/IStorable.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/StorableFile.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/StorableFile.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/logging/LogLevel.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/FileOutputStream.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/FileOutputStream.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/FileOutputStream.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/logging/Logger.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/logging/Logger.cpp
@@ -126,7 +126,7 @@ set(SOURCE_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/xml/XMLReaderMock.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/xml/XMLReaderMock.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/exception/NullPointerException.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/StandardOutputWriter.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ls_std/io/StandardOutputWriter.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/StandardOutputWriter.cpp)
 
 set(TEST_FILES

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

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

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

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

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

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

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

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

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

@@ -15,7 +15,7 @@
 #include "IBoxing.hpp"
 #include "../base/Types.hpp"
 #include "ls_std/serialization/ISerializable.hpp"
-#include "ls_std/io/IStorable.hpp"
+#include "../io/IStorable.hpp"
 
 namespace ls_std {
   class Long : public Class, public IBoxing, public ISerializable, public IStorable {

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

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

+ 1 - 1
source/ls_std/io/File.hpp → include/ls_std/io/File.hpp

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

+ 1 - 1
source/ls_std/io/FileOutputStream.hpp → include/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/ls_std/base/Class.hpp"
+#include "../base/Class.hpp"
 #include "File.hpp"
 #include "IWriter.hpp"
 #include <fstream>

+ 1 - 1
source/ls_std/io/FilePathSeparator.hpp → include/ls_std/io/FilePathSeparator.hpp

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

+ 1 - 1
source/ls_std/io/FilePathSeparatorMatch.hpp → include/ls_std/io/FilePathSeparatorMatch.hpp

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

+ 1 - 1
source/ls_std/io/FileReader.hpp → include/ls_std/io/FileReader.hpp

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

+ 1 - 1
source/ls_std/io/FileWriter.hpp → include/ls_std/io/FileWriter.hpp

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

+ 1 - 1
source/ls_std/io/IReader.hpp → include/ls_std/io/IReader.hpp

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

+ 1 - 1
source/ls_std/io/IStorable.hpp → include/ls_std/io/IStorable.hpp

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

+ 1 - 1
source/ls_std/io/IWriter.hpp → include/ls_std/io/IWriter.hpp

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

+ 1 - 1
source/ls_std/io/NewLine.hpp → include/ls_std/io/NewLine.hpp

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

+ 0 - 0
source/ls_std/io/StandardOutputWriter.hpp → include/ls_std/io/StandardOutputWriter.hpp


+ 1 - 1
source/ls_std/io/StorableFile.hpp → include/ls_std/io/StorableFile.hpp

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

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

@@ -12,9 +12,9 @@
 
 #include "../../base/Class.hpp"
 #include "LogLevel.hpp"
-#include "ls_std/io/IWriter.hpp"
-#include "ls_std/io/File.hpp"
-#include "ls_std/io/FileOutputStream.hpp"
+#include "../IWriter.hpp"
+#include "../File.hpp"
+#include "../FileOutputStream.hpp"
 #include <string>
 
 namespace ls_std {

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

@@ -12,8 +12,8 @@
 
 #include "../../base/Class.hpp"
 #include "XMLDocument.hpp"
-#include "ls_std/io/IReader.hpp"
-#include "ls_std/io/File.hpp"
+#include "../IReader.hpp"
+#include "../File.hpp"
 #include "XMLParseMode.hpp"
 #include "XMLParseData.hpp"
 #include <list>

+ 2 - 2
source/ls_std/io/File.cpp

@@ -7,9 +7,9 @@
  *
  * */
 
-#include "File.hpp"
+#include "../../../include/ls_std/io/File.hpp"
 #include "../../../include/ls_std/exception/FileOperationException.hpp"
-#include "FilePathSeparatorMatch.hpp"
+#include "../../../include/ls_std/io/FilePathSeparatorMatch.hpp"
 #include <fstream>
 #include <algorithm>
 #include <sstream>

+ 1 - 1
source/ls_std/io/FileOutputStream.cpp

@@ -7,7 +7,7 @@
  *
  * */
 
-#include "FileOutputStream.hpp"
+#include "../../../include/ls_std/io/FileOutputStream.hpp"
 #include "../../../include/ls_std/exception/FileNotFoundException.hpp"
 #include "../../../include/ls_std/exception/FileOperationException.hpp"
 

+ 1 - 1
source/ls_std/io/FileReader.cpp

@@ -8,7 +8,7 @@
  * */
 
 #include <fstream>
-#include "FileReader.hpp"
+#include "../../../include/ls_std/io/FileReader.hpp"
 #include "../../../include/ls_std/exception/FileNotFoundException.hpp"
 #include "../../../include/ls_std/exception/FileOperationException.hpp"
 

+ 1 - 1
source/ls_std/io/FileWriter.cpp

@@ -8,7 +8,7 @@
  * */
 
 #include <fstream>
-#include "FileWriter.hpp"
+#include "../../../include/ls_std/io/FileWriter.hpp"
 #include "../../../include/ls_std/exception/FileNotFoundException.hpp"
 #include "../../../include/ls_std/exception/FileOperationException.hpp"
 

+ 1 - 1
source/ls_std/io/StandardOutputWriter.cpp

@@ -8,7 +8,7 @@
  * */
 
 #include <iostream>
-#include "StandardOutputWriter.hpp"
+#include "../../../include/ls_std/io/StandardOutputWriter.hpp"
 
 bool ls_std::StandardOutputWriter::write(const ls_std::byte_field &_data)
 {

+ 4 - 4
source/ls_std/io/StorableFile.cpp

@@ -3,13 +3,13 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-19
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
-#include "StorableFile.hpp"
-#include "FileReader.hpp"
-#include "FileWriter.hpp"
+#include "../../../include/ls_std/io/StorableFile.hpp"
+#include "../../../include/ls_std/io/FileReader.hpp"
+#include "../../../include/ls_std/io/FileWriter.hpp"
 
 ls_std::StorableFile::StorableFile(const std::string &_path)
 {

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

@@ -9,7 +9,7 @@
 
 #include "../../../../include/ls_std/io/logging/Logger.hpp"
 #include "../../time/Date.hpp"
-#include "../NewLine.hpp"
+#include "../../../../include/ls_std/io/NewLine.hpp"
 #include "../../../../include/ls_std/boxing/String.hpp"
 
 ls_std::Logger::Logger(const std::string &_path) : Class("Logger"),

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

@@ -9,7 +9,7 @@
 
 #include "../../../../include/ls_std/io/xml/XMLReader.hpp"
 #include "../../../../include/ls_std/exception/IllegalArgumentException.hpp"
-#include "../FileReader.hpp"
+#include "../../../../include/ls_std/io/FileReader.hpp"
 #include "../../../../include/ls_std/boxing/String.hpp"
 
 ls_std::XMLReader::XMLReader(const std::shared_ptr<ls_std::XMLDocument>& _document, const std::string& _absolutePath) :

+ 11 - 11
source/ls_std/ls_std.hpp

@@ -38,17 +38,17 @@
 #include "../../include/ls_std/io/xml/XMLDocument.hpp"
 #include "../../include/ls_std/io/xml/XMLDeclaration.hpp"
 #include "../../include/ls_std/io/xml/XMLAttribute.hpp"
-#include "io/File.hpp"
-#include "io/FileOutputStream.hpp"
-#include "io/FilePathSeparator.hpp"
-#include "io/FilePathSeparatorMatch.hpp"
-#include "io/FileReader.hpp"
-#include "io/FileWriter.hpp"
-#include "io/IReader.hpp"
-#include "io/IStorable.hpp"
-#include "io/IWriter.hpp"
-#include "io/NewLine.hpp"
-#include "io/StorableFile.hpp"
+#include "../../include/ls_std/io/File.hpp"
+#include "../../include/ls_std/io/FileOutputStream.hpp"
+#include "../../include/ls_std/io/FilePathSeparator.hpp"
+#include "../../include/ls_std/io/FilePathSeparatorMatch.hpp"
+#include "../../include/ls_std/io/FileReader.hpp"
+#include "../../include/ls_std/io/FileWriter.hpp"
+#include "../../include/ls_std/io/IReader.hpp"
+#include "../../include/ls_std/io/IStorable.hpp"
+#include "../../include/ls_std/io/IWriter.hpp"
+#include "../../include/ls_std/io/NewLine.hpp"
+#include "../../include/ls_std/io/StorableFile.hpp"
 
 #include "logic/State.hpp"
 #include "logic/StateConnection.hpp"