From 002bcebbd2010b6ec06275f67725091843022d99 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Tue, 4 Oct 2016 13:47:28 +0100 Subject: [PATCH] #5629 Fix main window AppConfig naming conventions --- src/gui/src/SettingsDialog.cpp | 10 +++++----- src/gui/src/SettingsDialog.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/src/SettingsDialog.cpp b/src/gui/src/SettingsDialog.cpp index 813eac36..9b1d1b0e 100644 --- a/src/gui/src/SettingsDialog.cpp +++ b/src/gui/src/SettingsDialog.cpp @@ -38,7 +38,7 @@ static const char networkSecurity[] = "ns"; SettingsDialog::SettingsDialog(QWidget* parent, AppConfig& config) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), Ui::SettingsDialogBase(), - m_AppConfig(config) + m_appConfig(config) { setupUi(this); @@ -63,8 +63,8 @@ SettingsDialog::SettingsDialog(QWidget* parent, AppConfig& config) : m_pComboElevate->hide(); #endif - m_pCheckBoxEnableCrypto->setChecked(m_AppConfig.getCryptoEnabled()); - m_pCheckBoxEnableCrypto->setEnabled(m_AppConfig.edition() == Pro); + m_pCheckBoxEnableCrypto->setChecked(m_appConfig.getCryptoEnabled()); + m_pCheckBoxEnableCrypto->setEnabled(m_appConfig.edition() == Pro); } void SettingsDialog::accept() @@ -144,8 +144,8 @@ void SettingsDialog::on_m_pComboLanguage_currentIndexChanged(int index) void SettingsDialog::on_m_pCheckBoxEnableCrypto_toggled(bool checked) { - m_AppConfig.setCryptoEnabled(checked); - m_AppConfig.saveSettings(); + m_appConfig.setCryptoEnabled(checked); + m_appConfig.saveSettings(); if (checked) { SslCertificate sslCertificate; sslCertificate.generateCertificate(); diff --git a/src/gui/src/SettingsDialog.h b/src/gui/src/SettingsDialog.h index 656323a6..841ffff8 100644 --- a/src/gui/src/SettingsDialog.h +++ b/src/gui/src/SettingsDialog.h @@ -40,10 +40,10 @@ class SettingsDialog : public QDialog, public Ui::SettingsDialogBase void accept(); void reject(); void changeEvent(QEvent* event); - AppConfig& appConfig() { return m_AppConfig; } + AppConfig& appConfig() { return m_appConfig; } private: - AppConfig& m_AppConfig; + AppConfig& m_appConfig; SynergyLocale m_Locale; CoreInterface m_CoreInterface;