From 531b988dd11b29a6ccd13444d267597f2eb5f3b0 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Fri, 14 Mar 2025 22:35:40 -0400
Subject: [PATCH] refacator: remove use of app config in server settings

---
 src/apps/deskflow-gui/MainWindow.cpp   | 2 +-
 src/apps/deskflow-gui/ServerConfig.cpp | 8 +++-----
 src/apps/deskflow-gui/ServerConfig.h   | 4 +---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp
index ea586a611..08e92b9de 100644
--- a/src/apps/deskflow-gui/MainWindow.cpp
+++ b/src/apps/deskflow-gui/MainWindow.cpp
@@ -63,7 +63,7 @@ MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig)
     : ui{std::make_unique<Ui::MainWindow>()},
       m_configScopes(configScopes),
       m_appConfig(appConfig),
-      m_serverConfig(appConfig, *this),
+      m_serverConfig(*this),
       m_coreProcess(m_serverConfig),
       m_serverConnection(this, m_serverConfig),
       m_clientConnection(this),
diff --git a/src/apps/deskflow-gui/ServerConfig.cpp b/src/apps/deskflow-gui/ServerConfig.cpp
index d5c524fa7..9fc4ae527 100644
--- a/src/apps/deskflow-gui/ServerConfig.cpp
+++ b/src/apps/deskflow-gui/ServerConfig.cpp
@@ -36,9 +36,8 @@ static const struct
 
 const int serverDefaultIndex = 7;
 
-ServerConfig::ServerConfig(AppConfig &appConfig, MainWindow &mainWindow, int columns, int rows)
-    : m_pAppConfig(&appConfig),
-      m_pMainWindow(&mainWindow),
+ServerConfig::ServerConfig(MainWindow &mainWindow, int columns, int rows)
+    : m_pMainWindow(&mainWindow),
       m_Screens(columns),
       m_Columns(columns),
       m_Rows(rows),
@@ -76,7 +75,6 @@ bool ServerConfig::operator==(const ServerConfig &sc) const
          m_SwitchCornerSize == sc.m_SwitchCornerSize &&         //
          m_SwitchCorners == sc.m_SwitchCorners &&               //
          m_Hotkeys == sc.m_Hotkeys &&                           //
-         m_pAppConfig == sc.m_pAppConfig &&                     //
          m_EnableDragAndDrop == sc.m_EnableDragAndDrop &&       //
          m_DisableLockToScreen == sc.m_DisableLockToScreen &&   //
          m_ClipboardSharing == sc.m_ClipboardSharing &&         //
@@ -540,5 +538,5 @@ size_t ServerConfig::setClipboardSharingSize(size_t size)
 
 QSettingsProxy &ServerConfig::settings()
 {
-  return m_pAppConfig->scopes().activeSettings();
+  return Settings::proxy();
 }
diff --git a/src/apps/deskflow-gui/ServerConfig.h b/src/apps/deskflow-gui/ServerConfig.h
index 5ff4de6a9..8665abe58 100644
--- a/src/apps/deskflow-gui/ServerConfig.h
+++ b/src/apps/deskflow-gui/ServerConfig.h
@@ -23,7 +23,6 @@ class QString;
 class QFile;
 class ServerConfigDialog;
 class MainWindow;
-class AppConfig;
 
 namespace synergy::gui {
 
@@ -46,7 +45,7 @@ class ServerConfig : public ScreenConfig, public deskflow::gui::IServerConfig
   friend QTextStream &operator<<(QTextStream &outStream, const ServerConfig &config);
 
 public:
-  ServerConfig(AppConfig &appConfig, MainWindow &mainWindow, int columns = kDefaultColumns, int rows = kDefaultRows);
+  ServerConfig(MainWindow &mainWindow, int columns = kDefaultColumns, int rows = kDefaultRows);
   ~ServerConfig() override = default;
 
   bool operator==(const ServerConfig &sc) const;
@@ -277,7 +276,6 @@ private:
   QList<bool> m_SwitchCorners;
   HotkeyList m_Hotkeys;
 
-  AppConfig *m_pAppConfig;
   MainWindow *m_pMainWindow;
   ScreenList m_Screens;
   int m_Columns;