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

#6538 Updated AppConfig constructor, and removed some save settings calls

Browse source
This commit is contained in:
Jamie Newbon 2020-04-27 13:03:42 +01:00
parent ad1429e9aa
commit f50d2065e4
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,7 @@ static const char* synergyDefaultIconFiles[] =
}; };
#ifdef SYNERGY_ENTERPRISE #ifdef SYNERGY_ENTERPRISE
MainWindow::MainWindow (QSettings& settings, AppConfig& appConfig) MainWindow::MainWindow (AppConfig& appConfig)
#else #else
MainWindow::MainWindow (AppConfig& appConfig, MainWindow::MainWindow (AppConfig& appConfig,
LicenseManager& licenseManager) LicenseManager& licenseManager)
@ -111,7 +111,7 @@ MainWindow::MainWindow (AppConfig& appConfig,
m_AppConfig(&appConfig), m_AppConfig(&appConfig),
m_pSynergy(NULL), m_pSynergy(NULL),
m_SynergyState(synergyDisconnected), m_SynergyState(synergyDisconnected),
m_ServerConfig(m_AppConfig, 5, 3, m_AppConfig->screenName(), this), m_ServerConfig(5, 3, m_AppConfig->screenName(), this),
m_pTempConfigFile(NULL), m_pTempConfigFile(NULL),
m_pTrayIcon(NULL), m_pTrayIcon(NULL),
m_pTrayIconMenu(NULL), m_pTrayIconMenu(NULL),
@ -195,7 +195,6 @@ MainWindow::MainWindow (AppConfig& appConfig,
QString currentVersion = m_VersionChecker.getVersion(); QString currentVersion = m_VersionChecker.getVersion();
if (lastVersion != currentVersion) { if (lastVersion != currentVersion) {
m_AppConfig->setLastVersion (currentVersion); m_AppConfig->setLastVersion (currentVersion);
m_AppConfig->saveSettings();
#ifndef SYNERGY_ENTERPRISE #ifndef SYNERGY_ENTERPRISE
m_LicenseManager->notifyUpdate (lastVersion, currentVersion); m_LicenseManager->notifyUpdate (lastVersion, currentVersion);
#endif #endif
@ -497,7 +496,6 @@ void MainWindow::checkConnected(const QString& line)
"the background.")); "the background."));
appConfig().setStartedBefore(true); appConfig().setStartedBefore(true);
appConfig().saveSettings();
} }
} }
else if (line.contains("started server")) else if (line.contains("started server"))
@ -1460,7 +1458,6 @@ void MainWindow::on_m_pLabelAutoConfig_linkActivated(const QString &)
void MainWindow::on_m_pComboServerList_currentIndexChanged(const QString &server) void MainWindow::on_m_pComboServerList_currentIndexChanged(const QString &server)
{ {
appConfig().setAutoConfigServer(server); appConfig().setAutoConfigServer(server);
appConfig().saveSettings();
} }
void MainWindow::windowStateChanged() void MainWindow::windowStateChanged()

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

@ -96,7 +96,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
public: public:
#ifdef SYNERGY_ENTERPRISE #ifdef SYNERGY_ENTERPRISE
MainWindow(QSettings& settings, AppConfig& appConfig); MainWindow(AppConfig& appConfig);
#else #else
MainWindow(AppConfig& appConfig, MainWindow(AppConfig& appConfig,
LicenseManager& licenseManager); LicenseManager& licenseManager);