From c4b2f91424ba57c9f8365f70fd810ee5687118d9 Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tcanabrava@kde.org>
Date: Wed, 9 Jul 2025 09:44:09 +0200
Subject: [PATCH] refactor: Move ServerConfig to the config folder

---
 src/lib/gui/CMakeLists.txt                 | 4 ++--
 src/lib/gui/MainWindow.h                   | 2 +-
 src/lib/gui/config/IServerConfig.h         | 1 +
 src/lib/gui/{ => config}/ServerConfig.cpp  | 0
 src/lib/gui/{ => config}/ServerConfig.h    | 2 +-
 src/lib/gui/dialogs/ActionDialog.cpp       | 2 +-
 src/lib/gui/dialogs/ServerConfigDialog.cpp | 2 --
 src/lib/gui/dialogs/ServerConfigDialog.h   | 2 +-
 8 files changed, 7 insertions(+), 8 deletions(-)
 rename src/lib/gui/{ => config}/ServerConfig.cpp (100%)
 rename src/lib/gui/{ => config}/ServerConfig.h (99%)

diff --git a/src/lib/gui/CMakeLists.txt b/src/lib/gui/CMakeLists.txt
index 13c9a06a4..f5c86ad34 100644
--- a/src/lib/gui/CMakeLists.txt
+++ b/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
diff --git a/src/lib/gui/MainWindow.h b/src/lib/gui/MainWindow.h
index 97590c6b2..bb3fcf57b 100644
--- a/src/lib/gui/MainWindow.h
+++ b/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"
diff --git a/src/lib/gui/config/IServerConfig.h b/src/lib/gui/config/IServerConfig.h
index 8c943fced..940918305 100644
--- a/src/lib/gui/config/IServerConfig.h
+++ b/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:
diff --git a/src/lib/gui/ServerConfig.cpp b/src/lib/gui/config/ServerConfig.cpp
similarity index 100%
rename from src/lib/gui/ServerConfig.cpp
rename to src/lib/gui/config/ServerConfig.cpp
diff --git a/src/lib/gui/ServerConfig.h b/src/lib/gui/config/ServerConfig.h
similarity index 99%
rename from src/lib/gui/ServerConfig.h
rename to src/lib/gui/config/ServerConfig.h
index c6691c350..e631705fc 100644
--- a/src/lib/gui/ServerConfig.h
+++ b/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"
diff --git a/src/lib/gui/dialogs/ActionDialog.cpp b/src/lib/gui/dialogs/ActionDialog.cpp
index 16f06950c..ccbfc46d0 100644
--- a/src/lib/gui/dialogs/ActionDialog.cpp
+++ b/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>
 
diff --git a/src/lib/gui/dialogs/ServerConfigDialog.cpp b/src/lib/gui/dialogs/ServerConfigDialog.cpp
index 0cf5648e6..9f1f9d732 100644
--- a/src/lib/gui/dialogs/ServerConfigDialog.cpp
+++ b/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>
 
diff --git a/src/lib/gui/dialogs/ServerConfigDialog.h b/src/lib/gui/dialogs/ServerConfigDialog.h
index 431362372..1971d8758 100644
--- a/src/lib/gui/dialogs/ServerConfigDialog.h
+++ b/src/lib/gui/dialogs/ServerConfigDialog.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "ScreenSetupModel.h"
-#include "ServerConfig.h"
+#include "config/ServerConfig.h"
 
 #include <QDialog>