Skip to content

Commit

Permalink
#5629 Fix main window AppConfig naming conventions
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Nelless committed Oct 4, 2016
1 parent 783056f commit 002bceb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions src/gui/src/SettingsDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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()
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/gui/src/SettingsDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 002bceb

Please sign in to comment.