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

#6538 Changed mainwindow to grab settings from appconfig instead of maintaining its own pointer

Browse source 
Signed-off-by: jnewbon <jamie@symless.com>
This commit is contained in:
jnewbon 2020-02-25 14:41:11 +00:00
parent 969595dfe0
commit 87692ad0a5
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/src/AppConfig.h
View file

@ -64,6 +64,10 @@ class AppConfig: public QObject
~AppConfig();
public:
/// @brief Gets the current settings.
/// @return The scoped setting currently selected
QSettings& settings();
const QString& screenName() const;
int port() const;
const QString& networkInterface() const;

5
src/gui/src/MainWindow.cpp
View file

@ -97,7 +97,7 @@ static const char* synergyDefaultIconFiles[] =
#ifdef SYNERGY_ENTERPRISE
MainWindow::MainWindow (QSettings& settings, AppConfig& appConfig)
#else
MainWindow::MainWindow (QSettings& settings, AppConfig& appConfig,
MainWindow::MainWindow (AppConfig& appConfig,
LicenseManager& licenseManager)
#endif
:
@ -106,11 +106,10 @@ MainWindow::MainWindow (QSettings& settings, AppConfig& appConfig,
m_ActivationDialogRunning(false),
#endif
m_pZeroconf(nullptr),
m_Settings(settings),
m_AppConfig(&appConfig),
m_pSynergy(NULL),
m_SynergyState(synergyDisconnected),
m_ServerConfig(&m_Settings, 5, 3, m_AppConfig->screenName(), this),
m_ServerConfig(&appConfig.settings(), 5, 3, m_AppConfig->screenName(), this),
m_pTempConfigFile(NULL),
m_pTrayIcon(NULL),
m_pTrayIconMenu(NULL),

5
src/gui/src/MainWindow.h
View file

@ -97,7 +97,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
#ifdef SYNERGY_ENTERPRISE
MainWindow(QSettings& settings, AppConfig& appConfig);
#else
MainWindow(QSettings& settings, AppConfig& appConfig,
MainWindow(AppConfig& appConfig,
LicenseManager& licenseManager);
#endif
~MainWindow();
@ -160,7 +160,7 @@ public slots:
void saveSettings();
protected:
QSettings& settings() { return m_Settings; }
QSettings& settings() { return appConfig().settings(); }
AppConfig& appConfig() { return *m_AppConfig; }
QProcess* synergyProcess() { return m_pSynergy; }
void setSynergyProcess(QProcess* p) { m_pSynergy = p; }
@ -212,7 +212,6 @@ public slots:
QStringList m_PendingClientNames;
#endif
Zeroconf* m_pZeroconf;
QSettings& m_Settings;
AppConfig* m_AppConfig;
QProcess* m_pSynergy;
int m_SynergyState;

2
src/gui/src/main.cpp
View file

@ -110,7 +110,7 @@ int main(int argc, char* argv[])
#ifdef SYNERGY_ENTERPRISE
MainWindow mainWindow(settings, appConfig);
#else
MainWindow mainWindow(userSettings, appConfig, licenseManager);
MainWindow mainWindow(appConfig, licenseManager);
#endif
QObject::connect(dynamic_cast<QObject*>(&app), SIGNAL(aboutToQuit()),