Merge pull request e8tools#271 from dmpas/feature/move-systemclasses

Перемещён SystemClasses
soofex · Apr 30, 2018 · 0e8309d · 0e8309d
2 parents b0c02ee + 49fc334
commit 0e8309d
Show file tree

Hide file tree

Showing 87 changed files with 641 additions and 671 deletions.
diff --git a/src/SystemClasses/.gitignore b/src/SystemClasses/.gitignore
diff --git a/src/ctool1cd/App.cpp b/src/ctool1cd/App.cpp
@@ -24,7 +24,6 @@
 #include <boost/filesystem/fstream.hpp>
 
 #include <iosfwd>
-#include <System.IOUtils.hpp>
 #include <vector>
 
 #include "App.h"

diff --git a/src/ctool1cd/App.h b/src/ctool1cd/App.h
@@ -27,7 +27,7 @@
 
 #include "Class_1CD.h"
 #include "ParseCommandLine.h"
-#include "String.hpp"
+#include <string>
 #include "Messenger.h"
 #include "cfapi/APIcfBase.h"
 

diff --git a/src/ctool1cd/CMakeLists.txt b/src/ctool1cd/CMakeLists.txt
@@ -5,12 +5,11 @@ set (tool_VERSION_MAJOR 1)
 set (tool_VERSION_MINOR 0)
 
 set (CTOOL_SOURCES cTool_1CD_Main.cpp ParseCommandLine.cpp App.cpp)
-set (CTOOL_HEADERS cTool_1CD_Main.h ParseCommandLine.h ErrorCode.h App.h)
+set (CTOOL_HEADERS ParseCommandLine.h ErrorCode.h App.h)
 
 add_executable (ctool1cd ${CTOOL_SOURCES} ${CTOOL_HEADERS})
 
 include_directories (${SOURCE_DIR}/tool1cd)
-include_directories (${SOURCE_DIR}/SystemClasses)
 target_link_libraries (ctool1cd tool1cd)
 
 find_package (Boost 1.53 REQUIRED COMPONENTS filesystem regex system)

diff --git a/src/ctool1cd/ParseCommandLine.cpp b/src/ctool1cd/ParseCommandLine.cpp
@@ -20,7 +20,8 @@
 */
 
 #include "ParseCommandLine.h"
-#include <String.hpp>
+#include "SystemClasses/String.hpp"
+
 using namespace System;
 
 //---------------------------------------------------------------------------

diff --git a/src/ctool1cd/ParseCommandLine.h b/src/ctool1cd/ParseCommandLine.h
@@ -23,7 +23,7 @@
 #define ParseCommandLineH
 
 #include <vector>
-#include "String.hpp"
+#include <string>
 
 //---------------------------------------------------------------------------
 enum class Command

diff --git a/src/ctool1cd/cTool_1CD_Main.cpp b/src/ctool1cd/cTool_1CD_Main.cpp
@@ -21,7 +21,6 @@
 
 #include <iosfwd>
 
-#include "cTool_1CD_Main.h"
 #include "ErrorCode.h"
 #include "App.h"
 

diff --git a/src/ctool1cd/cTool_1CD_Main.h b/src/ctool1cd/cTool_1CD_Main.h
diff --git a/src/gtool1cd/BlobViewer/blob_viewer.h b/src/gtool1cd/BlobViewer/blob_viewer.h
@@ -22,7 +22,7 @@
 #define BLOB_VIEWER_H
 
 #include <QWidget>
-#include <TStream.hpp>
+#include <SystemClasses/TStream.hpp>
 #include <QMap>
 
 namespace Ui {

diff --git a/src/gtool1cd/CMakeLists.txt b/src/gtool1cd/CMakeLists.txt
@@ -69,7 +69,6 @@ endif()
 add_executable(gtool1cd WIN32 ${SOURCE_FILES} ${HEADER_FILES} ${UI_FILES} ${RESOURCES})
 
 include_directories (${SOURCE_DIR}/tool1cd)
-include_directories (${SOURCE_DIR}/SystemClasses)
 target_link_libraries (gtool1cd tool1cd)
 
 

diff --git a/src/gtool1cd/container_form.cpp b/src/gtool1cd/container_form.cpp
@@ -21,7 +21,7 @@
 #include "container_form.h"
 #include "ui_container_form.h"
 #include <QFileInfo>
-#include <TFileStream.hpp>
+#include <SystemClasses/TFileStream.hpp>
 
 ContainerForm::ContainerForm(QWidget *parent) :
     QWidget(parent),

diff --git a/src/gtool1cd/models/skobka_tree_model.cpp b/src/gtool1cd/models/skobka_tree_model.cpp
@@ -21,11 +21,12 @@
 #include "skobka_tree_model.h"
 #include <QBuffer>
 #include "stream_device.h"
+#include <SystemClasses/TMemoryStream.hpp>
 
 const int PATH_COLUMN = 0;
 const int DATA_COLUMN = 1;
 
-SkobkaTreeModel::SkobkaTreeModel(unique_ptr<Tree> data_tree)
+SkobkaTreeModel::SkobkaTreeModel(std::unique_ptr<Tree> data_tree)
 	: data_tree(std::move(data_tree))
 {
 

diff --git a/src/gtool1cd/models/skobka_tree_model.h b/src/gtool1cd/models/skobka_tree_model.h
@@ -23,11 +23,12 @@
 
 #include <Parse_tree.h>
 #include <QAbstractItemModel>
+#include <memory>
 
 class SkobkaTreeModel : public QAbstractItemModel
 {
 public:
-	explicit SkobkaTreeModel(unique_ptr<Tree> data_tree);
+	explicit SkobkaTreeModel(std::unique_ptr<Tree> data_tree);
 
 
 	virtual int rowCount(const QModelIndex &parent) const override;
@@ -43,7 +44,7 @@ class SkobkaTreeModel : public QAbstractItemModel
 	virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
 
 private:
-	unique_ptr<Tree> data_tree;
+	std::unique_ptr<Tree> data_tree;
 };
 
 #endif // SKOBKA_TREE_MODEL_H
diff --git a/src/gtool1cd/models/stream_device.h b/src/gtool1cd/models/stream_device.h
@@ -22,7 +22,7 @@
 #define STREAM_DEVICE_H
 
 #include <QIODevice>
-#include <TStream.hpp>
+#include <SystemClasses/TStream.hpp>
 
 class StreamDevice : public QIODevice
 {

diff --git a/src/gtool1cd/models/table_data_model.cpp b/src/gtool1cd/models/table_data_model.cpp
@@ -24,6 +24,9 @@
 #include <TempStream.h>
 #include <UZLib.h>
 #include <QDebug>
+#include "SystemClasses/String.hpp"
+
+using namespace System;
 
 TableDataModel::TableDataModel(Table *table, Index *index)
     : table(table), _index(index) {}

diff --git a/src/gtool1cd/models/table_data_model.h b/src/gtool1cd/models/table_data_model.h
@@ -24,7 +24,7 @@
 #include <QAbstractItemModel>
 #include <Table.h>
 #include <TableIterator.h>
-#include <TStream.hpp>
+#include <SystemClasses/TStream.hpp>
 
 class TableDataModel : public QAbstractItemModel
 {

diff --git a/src/gtool1cd/table_data_window.cpp b/src/gtool1cd/table_data_window.cpp
@@ -133,7 +133,7 @@ void TableDataWindow::on_dataView_activated(const QModelIndex &index)
 {
 }
 
-unique_ptr<Tree> try_parse_tree(const QVariant &data)
+std::unique_ptr<Tree> try_parse_tree(const QVariant &data)
 {
 	std::string string_data = data.toString().toStdString();
 	if (string_data.substr(0, 1) != "{") {

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -10,7 +10,6 @@ add_executable(testproject ${TEST_SYSTEM_SOURCES} ${TEST_TOOL1CD_SOURCES} catch_
 add_definitions (-DCMAKE_SOURCE_DIR="${CMAKE_SOURCE_DIR}")
 
 include_directories (${SOURCE_DIR}/tool1cd)
-include_directories (${SOURCE_DIR}/SystemClasses)
 target_link_libraries (testproject tool1cd)
 
 find_package (Boost 1.53 REQUIRED COMPONENTS filesystem regex system)

diff --git a/src/tests/SystemClasses/test_string.cpp b/src/tests/SystemClasses/test_string.cpp
@@ -19,8 +19,8 @@
     along with test_project.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "../catch.hpp"
-#include <String.hpp>
-#include <System.SysUtils.hpp>
+#include <SystemClasses/String.hpp>
+#include <SystemClasses/System.SysUtils.hpp>
 
 using namespace System;
 using namespace std;
@@ -80,4 +80,4 @@ TEST_CASE("Конвертация строк", "[SystemClasses][String][Encoding
 			}
 		}
 	}
-}
+}
diff --git a/src/tests/catch_main.cpp b/src/tests/catch_main.cpp
@@ -19,7 +19,7 @@
     along with test_project.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define CATCH_CONFIG_RUNNER
-#include <System.SysUtils.hpp>
+#include <SystemClasses/System.SysUtils.hpp>
 #include <string>
 #include <MessageRegistration.h>
 #include <Messenger.h>

diff --git a/src/tests/tool1cd/test_binarydecimal.cpp b/src/tests/tool1cd/test_binarydecimal.cpp
@@ -20,7 +20,6 @@
 */
 #include "../catch.hpp"
 #include "BinaryDecimalNumber.h"
-#include <System.Classes.hpp>
 
 TEST_CASE( "Проверка обработки Двоично-Десятичных чисел", "[tool1cd][lib][BinaryDecimal]" ) {
 
@@ -44,4 +43,4 @@ TEST_CASE( "Проверка обработки Двоично-Десятичн
 			}
 		}
 	}
-}
+}
diff --git a/src/tests/tool1cd/test_blockheader.cpp b/src/tests/tool1cd/test_blockheader.cpp
@@ -20,7 +20,7 @@
 */
 #include "../catch.hpp"
 #include "cfapi/APIcfBase.h"
-#include <System.Classes.hpp>
+#include <SystemClasses/String.hpp>
 
 TEST_CASE( "Проверка BlockHeader", "[tool1cd][lib][stBlockHeader]" ) {
 
@@ -30,7 +30,7 @@ TEST_CASE( "Проверка BlockHeader", "[tool1cd][lib][stBlockHeader]" ) {
 			std::string bytes = data.toString();
 			THEN("Имеем массив '\r\n00000000 00000000 00000000 \r\n'") {
 
-				REQUIRE( Equal(bytes, "\r\n00000000 00000000 00000000 \r\n") );
+				REQUIRE( System::Equal(bytes, "\r\n00000000 00000000 00000000 \r\n") );
 			}
 		}
 	}

diff --git a/src/tests/tool1cd/test_depotv5.cpp b/src/tests/tool1cd/test_depotv5.cpp
@@ -21,7 +21,6 @@
 #include "../catch.hpp"
 #include <Class_1CD.h>
 #include <boost/filesystem.hpp>
-#include <String.hpp>
 
 using boost::filesystem::path;
 using namespace System;

diff --git a/src/tests/tool1cd/test_depotv6.cpp b/src/tests/tool1cd/test_depotv6.cpp
@@ -21,7 +21,6 @@
 #include "../catch.hpp"
 #include <Class_1CD.h>
 #include <boost/filesystem.hpp>
-#include <String.hpp>
 
 using boost::filesystem::path;
 using namespace System;

diff --git a/src/tests/tool1cd/test_depotv7.cpp b/src/tests/tool1cd/test_depotv7.cpp
@@ -21,7 +21,6 @@
 #include "../catch.hpp"
 #include <Class_1CD.h>
 #include <boost/filesystem.hpp>
-#include <String.hpp>
 
 using boost::filesystem::path;
 using namespace System;

diff --git a/src/tests/tool1cd/test_treeparser.cpp b/src/tests/tool1cd/test_treeparser.cpp
@@ -21,6 +21,8 @@
 #include "../catch.hpp"
 #include <Parse_tree.h>
 #include <string>
+#include <SystemClasses/TMemoryStream.hpp>
+#include <SystemClasses/System.SysUtils.hpp>
 
 TEST_CASE( "Проверка Parse_tree", "[tool1cd][common][Parse_tree]" ) {
 

diff --git a/src/tool1cd/Base64.h b/src/tool1cd/Base64.h
@@ -22,7 +22,7 @@
 #ifndef Base64H
 #define Base64H
 
-#include <System.Classes.hpp>
+#include "SystemClasses/TStream.hpp"
 
 void base64_encode(TStream* infile, TStream* outfile, int linesize);
 void base64_decode(TStream* infile, TStream* outfile);

diff --git a/src/tool1cd/BinaryGuid.h b/src/tool1cd/BinaryGuid.h
@@ -24,7 +24,6 @@
 
 #include <array>
 #include <string>
-#include <System.hpp>
 
 const int GUID_BINARY_SIZE = 16;
 const size_t GUID_LEN = 36;

diff --git a/src/tool1cd/CMakeLists.txt b/src/tool1cd/CMakeLists.txt
@@ -20,30 +20,29 @@
 cmake_minimum_required (VERSION 2.8)
 project (tool1cd)
 
-include_directories(../SystemClasses)
-set (SYSTEMCLASSES_SOURCES ../SystemClasses/String.cpp
-		../SystemClasses/System.Classes.cpp
-		../SystemClasses/System.cpp
-		../SystemClasses/System.IOUtils.cpp
-		../SystemClasses/TFileStream.cpp
-		../SystemClasses/TMemoryStream.cpp
-		../SystemClasses/TStream.cpp
-		../SystemClasses/TStreamReader.cpp
-		../SystemClasses/TStreamWriter.cpp
-		../SystemClasses/System.SysUtils.cpp
-		../SystemClasses/GetTickCount.cpp)
-set (SYSTEMCLASSES_HEADERS ../SystemClasses/String.hpp
-		../SystemClasses/System.Classes.hpp
-		../SystemClasses/System.hpp
-		../SystemClasses/System.IOUtils.hpp
-		../SystemClasses/TFileStream.hpp
-		../SystemClasses/TMemoryStream.hpp
-		../SystemClasses/TStream.hpp
-		../SystemClasses/TStreamReader.hpp
-		../SystemClasses/TStreamWriter.hpp
-		../SystemClasses/System.SysUtils.hpp
-		../SystemClasses/GetTickCount.hpp
-		../SystemClasses/Exception.hpp)
+set (SYSTEMCLASSES_SOURCES SystemClasses/String.cpp
+		SystemClasses/System.Classes.cpp
+		SystemClasses/System.cpp
+		SystemClasses/System.IOUtils.cpp
+		SystemClasses/TFileStream.cpp
+		SystemClasses/TMemoryStream.cpp
+		SystemClasses/TStream.cpp
+		SystemClasses/TStreamReader.cpp
+		SystemClasses/TStreamWriter.cpp
+		SystemClasses/System.SysUtils.cpp
+		SystemClasses/GetTickCount.cpp)
+set (SYSTEMCLASSES_HEADERS SystemClasses/String.hpp
+		SystemClasses/System.Classes.hpp
+		SystemClasses/System.hpp
+		SystemClasses/System.IOUtils.hpp
+		SystemClasses/TFileStream.hpp
+		SystemClasses/TMemoryStream.hpp
+		SystemClasses/TStream.hpp
+		SystemClasses/TStreamReader.hpp
+		SystemClasses/TStreamWriter.hpp
+		SystemClasses/System.SysUtils.hpp
+		SystemClasses/GetTickCount.hpp
+		SystemClasses/Exception.hpp)
 
 
 set (TOOL1CD_SOURCES MessageRegistration.cpp Class_1CD.cpp

diff --git a/src/tool1cd/CRC32.h b/src/tool1cd/CRC32.h
@@ -21,7 +21,8 @@
 #ifndef CRC32H
 #define CRC32H
 
-#include <System.Classes.hpp>
+#include "SystemClasses/TStream.hpp"
+#include <cstdint>
 
 //---------------------------------------------------------------------------
 uint32_t _crc32(TStream* str);

diff --git a/src/tool1cd/Class_1CD.cpp b/src/tool1cd/Class_1CD.cpp
@@ -20,7 +20,7 @@
 */
 
 #include <vector>
-#include <System.IOUtils.hpp>
+#include "SystemClasses/System.IOUtils.hpp"
 #include <boost/filesystem.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_generators.hpp>