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

refacator: remove use of app config in server settings

Browse source
This commit is contained in:
sithlord48 2025-03-14 22:35:40 -04:00 committed by Nick Bolton
parent 5647121dd8
commit 531b988dd1
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/apps/deskflow-gui/MainWindow.cpp
View file

@ -63,7 +63,7 @@ MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig)
: ui{std::make_unique<Ui::MainWindow>()}, : ui{std::make_unique<Ui::MainWindow>()},
m_configScopes(configScopes), m_configScopes(configScopes),
m_appConfig(appConfig), m_appConfig(appConfig),
m_serverConfig(appConfig, *this), m_serverConfig(*this),
m_coreProcess(m_serverConfig), m_coreProcess(m_serverConfig),
m_serverConnection(this, m_serverConfig), m_serverConnection(this, m_serverConfig),
m_clientConnection(this), m_clientConnection(this),

8
src/apps/deskflow-gui/ServerConfig.cpp
View file

@ -36,9 +36,8 @@ static const struct
const int serverDefaultIndex = 7; const int serverDefaultIndex = 7;
ServerConfig::ServerConfig(AppConfig &appConfig, MainWindow &mainWindow, int columns, int rows) ServerConfig::ServerConfig(MainWindow &mainWindow, int columns, int rows)
: m_pAppConfig(&appConfig), : m_pMainWindow(&mainWindow),
m_pMainWindow(&mainWindow),
m_Screens(columns), m_Screens(columns),
m_Columns(columns), m_Columns(columns),
m_Rows(rows), m_Rows(rows),
@ -76,7 +75,6 @@ bool ServerConfig::operator==(const ServerConfig &sc) const
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_pAppConfig == sc.m_pAppConfig && //
m_EnableDragAndDrop == sc.m_EnableDragAndDrop && // m_EnableDragAndDrop == sc.m_EnableDragAndDrop && //
m_DisableLockToScreen == sc.m_DisableLockToScreen && // m_DisableLockToScreen == sc.m_DisableLockToScreen && //
m_ClipboardSharing == sc.m_ClipboardSharing && // m_ClipboardSharing == sc.m_ClipboardSharing && //
@ -540,5 +538,5 @@ size_t ServerConfig::setClipboardSharingSize(size_t size)
QSettingsProxy &ServerConfig::settings() QSettingsProxy &ServerConfig::settings()
{ {
return m_pAppConfig->scopes().activeSettings(); return Settings::proxy();
} }

4
src/apps/deskflow-gui/ServerConfig.h
View file

@ -23,7 +23,6 @@ class QString;
class QFile; class QFile;
class ServerConfigDialog; class ServerConfigDialog;
class MainWindow; class MainWindow;
class AppConfig;
namespace synergy::gui { namespace synergy::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:
ServerConfig(AppConfig &appConfig, MainWindow &mainWindow, int columns = kDefaultColumns, int rows = kDefaultRows); ServerConfig(MainWindow &mainWindow, int columns = kDefaultColumns, int rows = kDefaultRows);
~ServerConfig() override = default; ~ServerConfig() override = default;
bool operator==(const ServerConfig &sc) const; bool operator==(const ServerConfig &sc) const;
@ -277,7 +276,6 @@ private:
QList<bool> m_SwitchCorners; QList<bool> m_SwitchCorners;
HotkeyList m_Hotkeys; HotkeyList m_Hotkeys;
AppConfig *m_pAppConfig;
MainWindow *m_pMainWindow; MainWindow *m_pMainWindow;
ScreenList m_Screens; ScreenList m_Screens;
int m_Columns; int m_Columns;