Moved system modules from app/ to common/system/

src/CMakeLists.txt

@@ -89,8 +89,6 @@ endif()
 # Source files
 set(BASE_SOURCES
     ${OPENAL_SRC}
-    app/${SYSTEM_CPP_MODULE}
-    app/${SYSTEM_H_MODULE}
     app/app.cpp
     app/app.h
     app/controller.cpp
@@ -103,10 +101,6 @@ set(BASE_SOURCES
     app/pausemanager.h
     app/signal_handlers.cpp
     app/signal_handlers.h
-    app/system.cpp
-    app/system.h
-    app/system_other.cpp
-    app/system_other.h
     common/config_file.cpp
     common/config_file.h
     common/error.h
@@ -143,6 +137,12 @@ set(BASE_SOURCES
     common/resources/sndfile_wrapper.h
     common/restext.cpp
     common/restext.h
+    common/system/system.cpp
+    common/system/system.h
+    common/system/system_other.cpp
+    common/system/system_other.h
+    common/system/${SYSTEM_CPP_MODULE}
+    common/system/${SYSTEM_H_MODULE}
     common/settings.cpp
     common/settings.h
     common/singleton.h

src/app/app.cpp

@@ -22,7 +22,6 @@
 #include "app/controller.h"
 #include "app/input.h"
 #include "app/pathman.h"
-#include "app/system.h"
 
 #include "common/config_file.h"
 #include "common/image.h"
@@ -34,6 +33,8 @@
 
 #include "common/resources/resourcemanager.h"
 
+#include "common/system/system.h"
+
 #include "graphics/core/nulldevice.h"
 
 #include "graphics/opengl/glutil.h"

src/app/main.cpp

@@ -26,10 +26,6 @@
 
 #include "app/app.h"
 #include "app/signal_handlers.h"
-#include "app/system.h"
-#if PLATFORM_WINDOWS
-    #include "app/system_windows.h"
-#endif
 
 #include "common/logger.h"
 #include "common/make_unique.h"
@@ -38,6 +34,11 @@
 
 #include "common/resources/resourcemanager.h"
 
+#include "common/system/system.h"
+#if PLATFORM_WINDOWS
+    #include "common/system/system_windows.h"
+#endif
+
 #if PLATFORM_WINDOWS
     #include <windows.h>
 #endif

src/app/pathman.cpp

@@ -23,15 +23,17 @@
 #include "common/config.h"
 
 #include "app/app.h"
-#include "app/system.h"
+
-#ifdef PLATFORM_WINDOWS
-    #include "app/system_windows.h"
-#endif
 
 #include "common/logger.h"
 
 #include "common/resources/resourcemanager.h"
 
+#include "common/system/system.h"
+#ifdef PLATFORM_WINDOWS
+    #include "common/system/system_windows.h"
+#endif
+
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
 

src/app/signal_handlers.cpp

@@ -19,13 +19,13 @@
 
 #include "app/signal_handlers.h"
 
-#include "app/system.h"
-
 #include "common/stringutils.h"
 #include "common/version.h"
 
 #include "common/resources/resourcemanager.h"
 
+#include "common/system/system.h"
+
 #include "level/robotmain.h"
 
 #include <csignal>

src/common/config_file.cpp

@@ -20,14 +20,14 @@
 
 #include "common/config_file.h"
 
-#include "app/system.h"
-
 #include "common/logger.h"
 #include "common/make_unique.h"
 
 #include "common/resources/inputstream.h"
 #include "common/resources/outputstream.h"
 
+#include "common/system/system.h"
+
 #include <memory>
 #include <utility>
 #include <cstring>

src/common/system/system.cpp

@@ -18,18 +18,18 @@
  */
 
 
-#include "app/system.h"
+#include "common/system/system.h"
 
 #include "common/config.h"
 
 #if defined(PLATFORM_WINDOWS)
-    #include "app/system_windows.h"
+    #include "common/system/system_windows.h"
 #elif defined(PLATFORM_LINUX)
-    #include "app/system_linux.h"
+    #include "common/system/system_linux.h"
 #elif defined(PLATFORM_MACOSX)
-    #include "app/system_macosx.h"
+    #include "common/system/system_macosx.h"
 #else
-    #include "app/system_other.h"
+    #include "common/system/system_other.h"
 #endif
 
 #include "common/make_unique.h"

src/common/system/system.h

@@ -18,7 +18,7 @@
  */
 
 /**
- * \file app/system.h
+ * \file common/system/system.h
  * \brief System functions: time stamps, info dialogs, etc.
  */
 

src/common/system/system_linux.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "app/system_linux.h"
+#include "common/system/system_linux.h"
 
 #include "common/logger.h"
 

src/common/system/system_linux.h

@@ -18,11 +18,11 @@
  */
 
 /**
- * \file app/system_linux.h
+ * \file common/system/system_linux.h
  * \brief Linux-specific implementation of system functions
  */
 
-#include "app/system.h"
+#include "common/system/system.h"
 
 #include <sys/time.h>
 

src/common/system/system_macosx.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "app/system_macosx.h"
+#include "common/system/system_macosx.h"
 
 #include "common/logger.h"
 

src/common/system/system_macosx.h

@@ -18,12 +18,12 @@
  */
 
 /**
- * \file app/system_macosx.h
+ * \file common/system/system_macosx.h
  * \brief MacOSX-specific implementation of system functions
  */
 
-#include "app/system.h"
+#include "common/system/system.h"
-#include "app/system_other.h"
+#include "common/system/system_other.h"
 
 //@colobot-lint-exclude UndefinedFunctionRule
 

src/common/system/system_other.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "app/system_other.h"
+#include "common/system/system_other.h"
 
 
 void CSystemUtilsOther::Init()

src/common/system/system_other.h

@@ -18,11 +18,11 @@
  */
 
 /**
- * \file app/system_other.h
+ * \file common/system/system_other.h
  * \brief Fallback code for other systems
  */
 
-#include "app/system.h"
+#include "common/system/system.h"
 
 #include <SDL.h>
 

src/common/system/system_windows.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "app/system_windows.h"
+#include "common/system/system_windows.h"
 
 #include "common/logger.h"
 

src/common/system/system_windows.h

@@ -18,11 +18,11 @@
  */
 
 /**
- * \file app/system_windows.h
+ * \file common/system/system_windows.h
  * \brief Windows-specific implementation of system functions
  */
 
-#include "app/system.h"
+#include "common/system/system.h"
 
 //@colobot-lint-exclude UndefinedFunctionRule
 

src/graphics/engine/engine.cpp

@@ -22,7 +22,6 @@
 
 #include "app/app.h"
 #include "app/input.h"
-#include "app/system.h"
 
 #include "common/image.h"
 #include "common/key.h"
@@ -30,6 +29,8 @@
 #include "common/make_unique.h"
 #include "common/stringutils.h"
 
+#include "common/system/system.h"
+
 #include "common/thread/resource_owning_thread.h"
 
 #include "graphics/core/device.h"

test/unit/CMakeLists.txt

@@ -1,8 +1,8 @@
 # Platform-dependent tests
 if(PLATFORM_WINDOWS)
-    set(PLATFORM_TESTS app/system_windows_test.cpp)
+    set(PLATFORM_TESTS common/system/system_windows_test.cpp)
 elseif(PLATFORM_LINUX)
-    set(PLATFORM_TESTS app/system_linux_test.cpp)
+    set(PLATFORM_TESTS common/system/system_linux_test.cpp)
 endif()
 
 # Sources

test/unit/app/app_test.cpp

@@ -19,10 +19,10 @@
 
 #include "app/app.h"
 
-#include "app/system_other.h"
-
 #include "common/make_unique.h"
 
+#include "common/system/system_other.h"
+
 #include <functional>
 #include <memory>
 

test/unit/common/config_file_test.cpp

@@ -17,11 +17,11 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "app/system.h"
-
 #include "common/config_file.h"
 #include "common/logger.h"
 
+#include "common/system/system.h"
+
 #include <iostream>
 #include <string>
 #include <vector>

test/unit/common/system/system_linux_test.cpp

@@ -17,8 +17,8 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "app/system.h"
+#include "common/system/system.h"
-#include "app/system_linux.h"
+#include "common/system/system_linux.h"
 
 #include <gtest/gtest.h>
 

test/unit/common/system/system_windows_test.cpp

@@ -17,8 +17,8 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "app/system.h"
+#include "common/system/system.h"
-#include "app/system_windows.h"
+#include "common/system/system_windows.h"
 
 #include <gtest/gtest.h>