Move files.

src/base/base.cmake

@@ -1,7 +1,7 @@
 set(HEADERS_BASE
     src/base/io/Console.h
-    src/base/io/Json.h
+    src/base/io/json/Json.h
-    src/base/io/JsonChain.h
+    src/base/io/json/JsonChain.h
     src/base/io/log/backends/ConsoleLog.h
     src/base/io/log/backends/FileLog.h
     src/base/io/log/Log.h
@@ -51,8 +51,8 @@ set(HEADERS_BASE
 
 set(SOURCES_BASE
     src/base/io/Console.cpp
-    src/base/io/Json.cpp
+    src/base/io/json/Json.cpp
-    src/base/io/JsonChain.cpp
+    src/base/io/json/JsonChain.cpp
     src/base/io/log/backends/ConsoleLog.cpp
     src/base/io/log/backends/FileLog.cpp
     src/base/io/log/Log.cpp
@@ -81,9 +81,9 @@ set(SOURCES_BASE
 
 
 if (WIN32)
-    set(SOURCES_OS src/base/io/Json_win.cpp)
+    set(SOURCES_OS src/base/io/json/Json_win.cpp)
 else()
-    set(SOURCES_OS src/base/io/Json_unix.cpp)
+    set(SOURCES_OS src/base/io/json/Json_unix.cpp)
 endif()
 
 

src/base/io/json/Json.cpp

@@ -23,7 +23,7 @@
  */
 
 
-#include "base/io/Json.h"
+#include "base/io/json/Json.h"
 #include "rapidjson/document.h"
 
 

src/base/io/json/JsonChain.cpp

@@ -23,8 +23,8 @@
  */
 
 
-#include "base/io/Json.h"
+#include "base/io/json/Json.h"
-#include "base/io/JsonChain.h"
+#include "base/io/json/JsonChain.h"
 #include "base/io/log/Log.h"
 #include "rapidjson/error/en.h"
 

src/base/io/json/Json_win.cpp

@@ -35,7 +35,7 @@
 #include <fstream>
 
 
-#include "base/io/Json.h"
+#include "base/io/json/Json.h"
 #include "rapidjson/document.h"
 #include "rapidjson/istreamwrapper.h"
 #include "rapidjson/ostreamwrapper.h"

src/base/kernel/Base.cpp

@@ -27,8 +27,8 @@
 #include <memory>
 
 
-#include "base/io/Json.h"
+#include "base/io/json/Json.h"
-#include "base/io/JsonChain.h"
+#include "base/io/json/JsonChain.h"
 #include "base/io/log/backends/ConsoleLog.h"
 #include "base/io/log/backends/FileLog.h"
 #include "base/io/log/Log.h"

src/base/kernel/config/BaseConfig.cpp

@@ -49,7 +49,7 @@
 #endif
 
 
-#include "base/io/Json.h"
+#include "base/io/json/Json.h"
 #include "base/io/log/Log.h"
 #include "base/kernel/config/BaseConfig.h"
 #include "base/kernel/interfaces/IJsonReader.h"

src/base/kernel/config/BaseTransform.cpp

@@ -37,7 +37,7 @@
 #include "base/kernel/Process.h"
 #include "base/io/log/Log.h"
 #include "base/kernel/interfaces/IConfig.h"
-#include "base/io/JsonChain.h"
+#include "base/io/json/JsonChain.h"
 #include "core/config/Config_platform.h"
 
 

src/base/net/http/Http.cpp

@@ -24,7 +24,7 @@
 
 
 #include "3rdparty/rapidjson/document.h"
-#include "base/io/Json.h"
+#include "base/io/json/Json.h"
 #include "base/net/http/Http.h"
 
 

src/base/net/stratum/DaemonClient.cpp

@@ -29,7 +29,7 @@
 
 
 #include "3rdparty/http-parser/http_parser.h"
-#include "base/io/Json.h"
+#include "base/io/json/Json.h"
 #include "base/io/log/Log.h"
 #include "base/kernel/interfaces/IClientListener.h"
 #include "base/net/http/HttpClient.h"

src/base/net/stratum/Pool.cpp

@@ -30,7 +30,7 @@
 #include <stdio.h>
 
 
-#include "base/io/Json.h"
+#include "base/io/json/Json.h"
 #include "base/net/stratum/Pool.h"
 #include "rapidjson/document.h"