refactor: Move ServerConfig to the config folder

src/lib/gui/CMakeLists.txt

@@ -38,8 +38,6 @@ add_library(${target} STATIC
   Messages.h
   ScreenSetupModel.cpp
   ScreenSetupModel.h
-  ServerConfig.cpp
-  ServerConfig.h
   Styles.h
   StyleUtils.h
   VersionChecker.cpp
@@ -51,6 +49,8 @@ add_library(${target} STATIC
   config/ScreenConfig.h
   config/ScreenList.cpp
   config/ScreenList.h
+  config/ServerConfig.cpp
+  config/ServerConfig.h
   core/ClientConnection.cpp
   core/ClientConnection.h
   core/CommandProcess.cpp

src/lib/gui/MainWindow.h

@@ -16,8 +16,8 @@
 #include <QSystemTrayIcon>
 #include <QThread>
 
-#include "ServerConfig.h"
 #include "VersionChecker.h"
+#include "config/ServerConfig.h"
 #include "gui/core/ClientConnection.h"
 #include "gui/core/CoreProcess.h"
 #include "gui/core/ServerConnection.h"

src/lib/gui/config/IServerConfig.h

@@ -13,6 +13,7 @@
 
 namespace deskflow::gui {
 
+// TODO: Remove this class, when the ServerConnectionTests are ported to QTests
 class IServerConfig
 {
 public:

src/lib/gui/config/ServerConfig.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "Hotkey.h"
 #include "base/NetworkProtocol.h"
+#include "gui/Hotkey.h"
 #include "gui/config/IServerConfig.h"
 #include "gui/config/ScreenConfig.h"
 #include "gui/config/ScreenList.h"

src/lib/gui/dialogs/ActionDialog.cpp

@@ -12,7 +12,7 @@
 #include "Action.h"
 #include "Hotkey.h"
 #include "KeySequence.h"
-#include "ServerConfig.h"
+#include "config/ServerConfig.h"
 
 #include <QTimer>
 

src/lib/gui/dialogs/ServerConfigDialog.cpp

@@ -15,8 +15,6 @@
 #include "dialogs/HotkeyDialog.h"
 #include "dialogs/ScreenSettingsDialog.h"
 
-#include "ServerConfig.h"
-
 #include <QFileDialog>
 #include <QMessageBox>
 

src/lib/gui/dialogs/ServerConfigDialog.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "ScreenSetupModel.h"
-#include "ServerConfig.h"
+#include "config/ServerConfig.h"
 
 #include <QDialog>