smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: rm Unused ServerConfig::m_pMainwindow

Browse source
This commit is contained in:
sithlord48 2025-10-27 18:50:19 -04:00 committed by Nick Bolton
parent 2efcc76933
commit 31573bf6e8
3 changed files with 21 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/gui/MainWindow.cpp
View file

@ -62,7 +62,7 @@ using CoreProcessState = CoreProcess::ProcessState;
MainWindow::MainWindow() MainWindow::MainWindow()
: ui{std::make_unique<Ui::MainWindow>()}, : ui{std::make_unique<Ui::MainWindow>()},
m_serverConfig(*this), m_serverConfig(),
m_coreProcess(m_serverConfig), m_coreProcess(m_serverConfig),
m_serverConnection(this, m_serverConfig), m_serverConnection(this, m_serverConfig),
m_clientConnection(this), m_clientConnection(this),

44
src/lib/gui/config/ServerConfig.cpp
View file

@ -9,7 +9,6 @@
#include "ServerConfig.h" #include "ServerConfig.h"
#include "Hotkey.h" #include "Hotkey.h"
#include "MainWindow.h"
#include "common/Settings.h" #include "common/Settings.h"
#include "dialogs/AddClientDialog.h" #include "dialogs/AddClientDialog.h"
@ -36,11 +35,7 @@ static const struct
const int serverDefaultIndex = 7; const int serverDefaultIndex = 7;
ServerConfig::ServerConfig(MainWindow &mainWindow, int columns, int rows) ServerConfig::ServerConfig(int columns, int rows) : m_Screens(columns), m_Columns(columns), m_Rows(rows)
: m_pMainWindow(&mainWindow),
m_Screens(columns),
m_Columns(columns),
m_Rows(rows)
{ {
recall(); recall();
} }
@ -59,25 +54,24 @@ bool ServerConfig::save(const QString &fileName) const
bool ServerConfig::operator==(const ServerConfig &sc) const bool ServerConfig::operator==(const ServerConfig &sc) const
{ {
return m_Screens == sc.m_Screens && // return m_Screens == sc.m_Screens && //
m_Columns == sc.m_Columns && // m_Columns == sc.m_Columns && //
m_Rows == sc.m_Rows && // m_Rows == sc.m_Rows && //
m_HasHeartbeat == sc.m_HasHeartbeat && // m_HasHeartbeat == sc.m_HasHeartbeat && //
m_Heartbeat == sc.m_Heartbeat && // m_Heartbeat == sc.m_Heartbeat && //
m_Protocol == sc.m_Protocol && // m_Protocol == sc.m_Protocol && //
m_RelativeMouseMoves == sc.m_RelativeMouseMoves && // m_RelativeMouseMoves == sc.m_RelativeMouseMoves && //
m_Win32KeepForeground == sc.m_Win32KeepForeground && // m_Win32KeepForeground == sc.m_Win32KeepForeground && //
m_HasSwitchDelay == sc.m_HasSwitchDelay && // m_HasSwitchDelay == sc.m_HasSwitchDelay && //
m_SwitchDelay == sc.m_SwitchDelay && // m_SwitchDelay == sc.m_SwitchDelay && //
m_HasSwitchDoubleTap == sc.m_HasSwitchDoubleTap && // m_HasSwitchDoubleTap == sc.m_HasSwitchDoubleTap && //
m_SwitchDoubleTap == sc.m_SwitchDoubleTap && // m_SwitchDoubleTap == sc.m_SwitchDoubleTap && //
m_SwitchCornerSize == sc.m_SwitchCornerSize && // m_SwitchCornerSize == sc.m_SwitchCornerSize && //
m_SwitchCorners == sc.m_SwitchCorners && // m_SwitchCorners == sc.m_SwitchCorners && //
m_Hotkeys == sc.m_Hotkeys && // m_Hotkeys == sc.m_Hotkeys && //
m_DisableLockToScreen == sc.m_DisableLockToScreen && // m_DisableLockToScreen == sc.m_DisableLockToScreen && //
m_ClipboardSharing == sc.m_ClipboardSharing && // m_ClipboardSharing == sc.m_ClipboardSharing && //
m_ClipboardSharingSize == sc.m_ClipboardSharingSize && // m_ClipboardSharingSize == sc.m_ClipboardSharingSize;
m_pMainWindow == sc.m_pMainWindow;
} }
void ServerConfig::save(QFile &file) const void ServerConfig::save(QFile &file) const

4
src/lib/gui/config/ServerConfig.h
View file

@ -23,7 +23,6 @@ class QSettings;
class QString; class QString;
class QFile; class QFile;
class ServerConfigDialog; class ServerConfigDialog;
class MainWindow;
namespace deskflow::gui { namespace deskflow::gui {
@ -46,7 +45,7 @@ class ServerConfig : public ScreenConfig, public deskflow::gui::IServerConfig
friend QTextStream &operator<<(QTextStream &outStream, const ServerConfig &config); friend QTextStream &operator<<(QTextStream &outStream, const ServerConfig &config);
public: public:
explicit ServerConfig(MainWindow &mainWindow, int columns = kDefaultColumns, int rows = kDefaultRows); explicit ServerConfig(int columns = kDefaultColumns, int rows = kDefaultRows);
~ServerConfig() override = default; ~ServerConfig() override = default;
bool operator==(const ServerConfig &sc) const; bool operator==(const ServerConfig &sc) const;
@ -266,7 +265,6 @@ private:
QList<bool> m_SwitchCorners; QList<bool> m_SwitchCorners;
HotkeyList m_Hotkeys; HotkeyList m_Hotkeys;
MainWindow *m_pMainWindow;
ScreenList m_Screens; ScreenList m_Screens;
int m_Columns; int m_Columns;
int m_Rows; int m_Rows;