From f197f6b1ebb13f6c46ec1e79fe3547961a7902f8 Mon Sep 17 00:00:00 2001 From: XMRig Date: Fri, 13 Apr 2018 06:38:18 +0700 Subject: [PATCH] Changed directory structure. --- CMakeLists.txt | 15 +++++++-------- src/{core => common/config}/CommonConfig.cpp | 2 +- src/{core => common/config}/CommonConfig.h | 2 +- src/{core => common/config}/ConfigLoader.cpp | 4 ++-- src/{core => common/config}/ConfigLoader.h | 0 src/{core => common/config}/ConfigWatcher.cpp | 4 ++-- src/{core => common/config}/ConfigWatcher.h | 2 +- src/{core => common}/utils/c_str.h | 0 src/core/Config.cpp | 2 +- src/core/Config.h | 2 +- src/core/Controller.cpp | 2 +- src/net/Pool.h | 2 +- src/workers/CpuThread.cpp | 2 +- 13 files changed, 19 insertions(+), 20 deletions(-) rename src/{core => common/config}/CommonConfig.cpp (99%) rename src/{core => common/config}/CommonConfig.h (99%) rename src/{core => common/config}/ConfigLoader.cpp (98%) rename src/{core => common/config}/ConfigLoader.h (100%) rename src/{core => common/config}/ConfigWatcher.cpp (97%) rename src/{core => common/config}/ConfigWatcher.h (98%) rename src/{core => common}/utils/c_str.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5502405ca..096fa97f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,15 +14,14 @@ include (cmake/cpu.cmake) set(HEADERS src/api/NetworkState.h src/App.h + src/common/config/CommonConfig.h + src/common/config/ConfigLoader.h + src/common/config/ConfigWatcher.h + src/common/utils/c_str.h src/Console.h - src/core/CommonConfig.h src/core/Config.cpp - src/core/ConfigLoader.cpp - src/core/ConfigLoader.h src/core/ConfigLoader_platform.h - src/core/ConfigWatcher.cpp src/core/Controller.h - src/core/utils/c_str.h src/Cpu.h src/interfaces/IClientListener.h src/interfaces/IConfig.h @@ -89,11 +88,11 @@ endif() set(SOURCES src/api/NetworkState.cpp src/App.cpp + src/common/config/CommonConfig.cpp + src/common/config/ConfigLoader.cpp + src/common/config/ConfigWatcher.cpp src/Console.cpp - src/core/CommonConfig.cpp src/core/Config.cpp - src/core/ConfigLoader.cpp - src/core/ConfigWatcher.cpp src/core/Controller.cpp src/log/ConsoleLog.cpp src/log/FileLog.cpp diff --git a/src/core/CommonConfig.cpp b/src/common/config/CommonConfig.cpp similarity index 99% rename from src/core/CommonConfig.cpp rename to src/common/config/CommonConfig.cpp index 726b0e37b..6902b7a24 100644 --- a/src/core/CommonConfig.cpp +++ b/src/common/config/CommonConfig.cpp @@ -29,7 +29,7 @@ #include -#include "core/CommonConfig.h" +#include "common/config/CommonConfig.h" #include "donate.h" #include "log/Log.h" #include "net/Pool.h" diff --git a/src/core/CommonConfig.h b/src/common/config/CommonConfig.h similarity index 99% rename from src/core/CommonConfig.h rename to src/common/config/CommonConfig.h index 0b72b7e1b..f4cf4b437 100644 --- a/src/core/CommonConfig.h +++ b/src/common/config/CommonConfig.h @@ -28,7 +28,7 @@ #include -#include "core/utils/c_str.h" +#include "common/utils/c_str.h" #include "interfaces/IConfig.h" #include "net/Pool.h" #include "xmrig.h" diff --git a/src/core/ConfigLoader.cpp b/src/common/config/ConfigLoader.cpp similarity index 98% rename from src/core/ConfigLoader.cpp rename to src/common/config/ConfigLoader.cpp index c84ba962d..a9c802f6a 100644 --- a/src/core/ConfigLoader.cpp +++ b/src/common/config/ConfigLoader.cpp @@ -32,10 +32,10 @@ #endif +#include "common/config/ConfigLoader.h" +#include "common/config/ConfigWatcher.h" #include "core/ConfigCreator.h" -#include "core/ConfigLoader.h" #include "core/ConfigLoader_platform.h" -#include "core/ConfigWatcher.h" #include "interfaces/IConfig.h" #include "interfaces/IWatcherListener.h" #include "net/Pool.h" diff --git a/src/core/ConfigLoader.h b/src/common/config/ConfigLoader.h similarity index 100% rename from src/core/ConfigLoader.h rename to src/common/config/ConfigLoader.h diff --git a/src/core/ConfigWatcher.cpp b/src/common/config/ConfigWatcher.cpp similarity index 97% rename from src/core/ConfigWatcher.cpp rename to src/common/config/ConfigWatcher.cpp index 092a0f3aa..21d73188f 100644 --- a/src/core/ConfigWatcher.cpp +++ b/src/common/config/ConfigWatcher.cpp @@ -25,9 +25,9 @@ #include +#include "common/config/ConfigLoader.h" +#include "common/config/ConfigWatcher.h" #include "core/ConfigCreator.h" -#include "core/ConfigLoader.h" -#include "core/ConfigWatcher.h" #include "interfaces/IWatcherListener.h" #include "log/Log.h" diff --git a/src/core/ConfigWatcher.h b/src/common/config/ConfigWatcher.h similarity index 98% rename from src/core/ConfigWatcher.h rename to src/common/config/ConfigWatcher.h index a5d258640..7f38b45a8 100644 --- a/src/core/ConfigWatcher.h +++ b/src/common/config/ConfigWatcher.h @@ -29,7 +29,7 @@ #include -#include "core/utils/c_str.h" +#include "common/utils/c_str.h" #include "rapidjson/fwd.h" diff --git a/src/core/utils/c_str.h b/src/common/utils/c_str.h similarity index 100% rename from src/core/utils/c_str.h rename to src/common/utils/c_str.h diff --git a/src/core/Config.cpp b/src/core/Config.cpp index f72112509..ee305091a 100644 --- a/src/core/Config.cpp +++ b/src/core/Config.cpp @@ -26,9 +26,9 @@ #include +#include "common/config/ConfigLoader.h" #include "core/Config.h" #include "core/ConfigCreator.h" -#include "core/ConfigLoader.h" #include "Cpu.h" #include "net/Pool.h" #include "rapidjson/document.h" diff --git a/src/core/Config.h b/src/core/Config.h index 536e1c012..999f30599 100644 --- a/src/core/Config.h +++ b/src/core/Config.h @@ -29,7 +29,7 @@ #include -#include "core/CommonConfig.h" +#include "common/config/CommonConfig.h" #include "rapidjson/fwd.h" #include "xmrig.h" diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp index 805861efb..954e5b10e 100644 --- a/src/core/Controller.cpp +++ b/src/core/Controller.cpp @@ -25,8 +25,8 @@ #include +#include "common/config/ConfigLoader.h" #include "core/Config.h" -#include "core/ConfigLoader.h" #include "core/Controller.h" #include "Cpu.h" #include "interfaces/IControllerListener.h" diff --git a/src/net/Pool.h b/src/net/Pool.h index efa3e3a7a..aff1ea318 100644 --- a/src/net/Pool.h +++ b/src/net/Pool.h @@ -28,7 +28,7 @@ #include -#include "core/utils/c_str.h" +#include "common/utils/c_str.h" #include "xmrig.h" diff --git a/src/workers/CpuThread.cpp b/src/workers/CpuThread.cpp index 482b4305d..20a8006fb 100644 --- a/src/workers/CpuThread.cpp +++ b/src/workers/CpuThread.cpp @@ -24,7 +24,7 @@ #include -#include "core/CommonConfig.h" +#include "net/Pool.h" #include "rapidjson/document.h" #include "workers/CpuThread.h"