diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp index 92043bfbb..895a37c33 100644 --- a/src/apps/deskflow-gui/MainWindow.cpp +++ b/src/apps/deskflow-gui/MainWindow.cpp @@ -616,7 +616,7 @@ void MainWindow::updateSecurityIcon(bool visible) void MainWindow::serverConnectionConfigureClient(const QString &clientName) { m_serverConfigDialogState.setVisible(true); - ServerConfigDialog dialog(this, m_serverConfig, m_appConfig); + ServerConfigDialog dialog(this, m_serverConfig); if (dialog.addClient(clientName) && dialog.exec() == QDialog::Accepted) { m_coreProcess.restart(); } @@ -1075,7 +1075,7 @@ void MainWindow::hide() void MainWindow::showConfigureServer(const QString &message) { - ServerConfigDialog dialog(this, serverConfig(), m_appConfig); + ServerConfigDialog dialog(this, serverConfig()); dialog.message(message); if ((dialog.exec() == QDialog::Accepted) && m_coreProcess.isStarted()) { m_coreProcess.restart(); diff --git a/src/apps/deskflow-gui/dialogs/ServerConfigDialog.cpp b/src/apps/deskflow-gui/dialogs/ServerConfigDialog.cpp index e5bed9050..d9793ec93 100644 --- a/src/apps/deskflow-gui/dialogs/ServerConfigDialog.cpp +++ b/src/apps/deskflow-gui/dialogs/ServerConfigDialog.cpp @@ -22,7 +22,7 @@ using enum ScreenConfig::SwitchCorner; using ServerProtocol = synergy::gui::ServerProtocol; -ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config, AppConfig &appConfig) +ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), ui{std::make_unique()}, m_OriginalServerConfig(config), @@ -30,8 +30,7 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config, Ap m_OriginalServerConfigUsesExternalFile(config.configFile()), m_ServerConfig(config), m_ScreenSetupModel(serverConfig().screens(), serverConfig().numColumns(), serverConfig().numRows()), - m_Message(""), - m_appConfig(appConfig) + m_Message("") { ui->setupUi(this); diff --git a/src/apps/deskflow-gui/dialogs/ServerConfigDialog.h b/src/apps/deskflow-gui/dialogs/ServerConfigDialog.h index 5f294f703..7a651999f 100644 --- a/src/apps/deskflow-gui/dialogs/ServerConfigDialog.h +++ b/src/apps/deskflow-gui/dialogs/ServerConfigDialog.h @@ -25,7 +25,7 @@ class ServerConfigDialog : public QDialog Q_OBJECT public: - ServerConfigDialog(QWidget *parent, ServerConfig &config, AppConfig &appConfig); + ServerConfigDialog(QWidget *parent, ServerConfig &config); ~ServerConfigDialog(); bool addClient(const QString &clientName); @@ -93,10 +93,6 @@ protected: { return m_ScreenSetupModel; } - AppConfig &appConfig() - { - return m_appConfig; - } private: std::unique_ptr ui; @@ -106,7 +102,6 @@ private: QString m_OriginalServerConfigUsesExternalFile; ScreenSetupModel m_ScreenSetupModel; QString m_Message; - AppConfig &m_appConfig; private slots: void onChange();