From 31573bf6e8156b1d068db02fce8433d532ca4851 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Mon, 27 Oct 2025 18:50:19 -0400
Subject: [PATCH] chore: rm Unused ServerConfig::m_pMainwindow

---
 src/lib/gui/MainWindow.cpp          |  2 +-
 src/lib/gui/config/ServerConfig.cpp | 44 +++++++++++++----------------
 src/lib/gui/config/ServerConfig.h   |  4 +--
 3 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp
index 8624d74a4..b638fc1e1 100644
--- a/src/lib/gui/MainWindow.cpp
+++ b/src/lib/gui/MainWindow.cpp
@@ -62,7 +62,7 @@ using CoreProcessState = CoreProcess::ProcessState;
 
 MainWindow::MainWindow()
     : ui{std::make_unique<Ui::MainWindow>()},
-      m_serverConfig(*this),
+      m_serverConfig(),
       m_coreProcess(m_serverConfig),
       m_serverConnection(this, m_serverConfig),
       m_clientConnection(this),
diff --git a/src/lib/gui/config/ServerConfig.cpp b/src/lib/gui/config/ServerConfig.cpp
index bcc8145ae..844d01d86 100644
--- a/src/lib/gui/config/ServerConfig.cpp
+++ b/src/lib/gui/config/ServerConfig.cpp
@@ -9,7 +9,6 @@
 #include "ServerConfig.h"
 
 #include "Hotkey.h"
-#include "MainWindow.h"
 #include "common/Settings.h"
 #include "dialogs/AddClientDialog.h"
 
@@ -36,11 +35,7 @@ static const struct
 
 const int serverDefaultIndex = 7;
 
-ServerConfig::ServerConfig(MainWindow &mainWindow, int columns, int rows)
-    : m_pMainWindow(&mainWindow),
-      m_Screens(columns),
-      m_Columns(columns),
-      m_Rows(rows)
+ServerConfig::ServerConfig(int columns, int rows) : m_Screens(columns), m_Columns(columns), m_Rows(rows)
 {
   recall();
 }
@@ -59,25 +54,24 @@ bool ServerConfig::save(const QString &fileName) const
 
 bool ServerConfig::operator==(const ServerConfig &sc) const
 {
-  return m_Screens == sc.m_Screens &&                           //
-         m_Columns == sc.m_Columns &&                           //
-         m_Rows == sc.m_Rows &&                                 //
-         m_HasHeartbeat == sc.m_HasHeartbeat &&                 //
-         m_Heartbeat == sc.m_Heartbeat &&                       //
-         m_Protocol == sc.m_Protocol &&                         //
-         m_RelativeMouseMoves == sc.m_RelativeMouseMoves &&     //
-         m_Win32KeepForeground == sc.m_Win32KeepForeground &&   //
-         m_HasSwitchDelay == sc.m_HasSwitchDelay &&             //
-         m_SwitchDelay == sc.m_SwitchDelay &&                   //
-         m_HasSwitchDoubleTap == sc.m_HasSwitchDoubleTap &&     //
-         m_SwitchDoubleTap == sc.m_SwitchDoubleTap &&           //
-         m_SwitchCornerSize == sc.m_SwitchCornerSize &&         //
-         m_SwitchCorners == sc.m_SwitchCorners &&               //
-         m_Hotkeys == sc.m_Hotkeys &&                           //
-         m_DisableLockToScreen == sc.m_DisableLockToScreen &&   //
-         m_ClipboardSharing == sc.m_ClipboardSharing &&         //
-         m_ClipboardSharingSize == sc.m_ClipboardSharingSize && //
-         m_pMainWindow == sc.m_pMainWindow;
+  return m_Screens == sc.m_Screens &&                         //
+         m_Columns == sc.m_Columns &&                         //
+         m_Rows == sc.m_Rows &&                               //
+         m_HasHeartbeat == sc.m_HasHeartbeat &&               //
+         m_Heartbeat == sc.m_Heartbeat &&                     //
+         m_Protocol == sc.m_Protocol &&                       //
+         m_RelativeMouseMoves == sc.m_RelativeMouseMoves &&   //
+         m_Win32KeepForeground == sc.m_Win32KeepForeground && //
+         m_HasSwitchDelay == sc.m_HasSwitchDelay &&           //
+         m_SwitchDelay == sc.m_SwitchDelay &&                 //
+         m_HasSwitchDoubleTap == sc.m_HasSwitchDoubleTap &&   //
+         m_SwitchDoubleTap == sc.m_SwitchDoubleTap &&         //
+         m_SwitchCornerSize == sc.m_SwitchCornerSize &&       //
+         m_SwitchCorners == sc.m_SwitchCorners &&             //
+         m_Hotkeys == sc.m_Hotkeys &&                         //
+         m_DisableLockToScreen == sc.m_DisableLockToScreen && //
+         m_ClipboardSharing == sc.m_ClipboardSharing &&       //
+         m_ClipboardSharingSize == sc.m_ClipboardSharingSize;
 }
 
 void ServerConfig::save(QFile &file) const
diff --git a/src/lib/gui/config/ServerConfig.h b/src/lib/gui/config/ServerConfig.h
index 5507c3c49..d7dcb88c3 100644
--- a/src/lib/gui/config/ServerConfig.h
+++ b/src/lib/gui/config/ServerConfig.h
@@ -23,7 +23,6 @@ class QSettings;
 class QString;
 class QFile;
 class ServerConfigDialog;
-class MainWindow;
 
 namespace deskflow::gui {
 
@@ -46,7 +45,7 @@ class ServerConfig : public ScreenConfig, public deskflow::gui::IServerConfig
   friend QTextStream &operator<<(QTextStream &outStream, const ServerConfig &config);
 
 public:
-  explicit ServerConfig(MainWindow &mainWindow, int columns = kDefaultColumns, int rows = kDefaultRows);
+  explicit ServerConfig(int columns = kDefaultColumns, int rows = kDefaultRows);
   ~ServerConfig() override = default;
 
   bool operator==(const ServerConfig &sc) const;
@@ -266,7 +265,6 @@ private:
   QList<bool> m_SwitchCorners;
   HotkeyList m_Hotkeys;
 
-  MainWindow *m_pMainWindow;
   ScreenList m_Screens;
   int m_Columns;
   int m_Rows;