From 2ffad7edf2946e66585a67c4ab58c0522cd8e412 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 17 Aug 2019 13:20:53 -0400
Subject: made member variables in SettingsTab private, added accessors
 SettingsDialog now uses GeometrySaver

---
 src/settingsdialognexus.cpp | 66 ++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'src/settingsdialognexus.cpp')

diff --git a/src/settingsdialognexus.cpp b/src/settingsdialognexus.cpp
index 575f54d0..b1964069 100644
--- a/src/settingsdialognexus.cpp
+++ b/src/settingsdialognexus.cpp
@@ -69,18 +69,18 @@ private:
 };
 
 
-NexusSettingsTab::NexusSettingsTab(Settings *parent, SettingsDialog &dialog)
-  : SettingsTab(parent, dialog)
+NexusSettingsTab::NexusSettingsTab(Settings& s, SettingsDialog& d)
+  : SettingsTab(s, d)
 {
-  ui->offlineBox->setChecked(parent->offlineMode());
-  ui->proxyBox->setChecked(parent->useProxy());
-  ui->endorsementBox->setChecked(parent->endorsementIntegration());
-  ui->hideAPICounterBox->setChecked(parent->hideAPICounter());
+  ui->offlineBox->setChecked(settings().offlineMode());
+  ui->proxyBox->setChecked(settings().useProxy());
+  ui->endorsementBox->setChecked(settings().endorsementIntegration());
+  ui->hideAPICounterBox->setChecked(settings().hideAPICounter());
 
   // display server preferences
-  m_Settings.beginGroup("Servers");
-  for (const QString &key : m_Settings.childKeys()) {
-    QVariantMap val = m_Settings.value(key).toMap();
+  qsettings().beginGroup("Servers");
+  for (const QString &key : qsettings().childKeys()) {
+    QVariantMap val = qsettings().value(key).toMap();
     QString descriptor = key;
     if (!descriptor.compare("CDN", Qt::CaseInsensitive)) {
       descriptor += QStringLiteral(" (automatic)");
@@ -101,7 +101,7 @@ NexusSettingsTab::NexusSettingsTab(Settings *parent, SettingsDialog &dialog)
     }
     ui->preferredServersList->sortItems(Qt::DescendingOrder);
   }
-  m_Settings.endGroup();
+  qsettings().endGroup();
 
   QObject::connect(ui->nexusConnect, &QPushButton::clicked, [&]{ on_nexusConnect_clicked(); });
   QObject::connect(ui->nexusManualKey, &QPushButton::clicked, [&]{ on_nexusManualKey_clicked(); });
@@ -114,27 +114,27 @@ NexusSettingsTab::NexusSettingsTab(Settings *parent, SettingsDialog &dialog)
 
 void NexusSettingsTab::update()
 {
-  m_Settings.setValue("Settings/offline_mode", ui->offlineBox->isChecked());
-  m_Settings.setValue("Settings/use_proxy", ui->proxyBox->isChecked());
-  m_Settings.setValue("Settings/endorsement_integration", ui->endorsementBox->isChecked());
-  m_Settings.setValue("Settings/hide_api_counter", ui->hideAPICounterBox->isChecked());
+  qsettings().setValue("Settings/offline_mode", ui->offlineBox->isChecked());
+  qsettings().setValue("Settings/use_proxy", ui->proxyBox->isChecked());
+  qsettings().setValue("Settings/endorsement_integration", ui->endorsementBox->isChecked());
+  qsettings().setValue("Settings/hide_api_counter", ui->hideAPICounterBox->isChecked());
 
   // store server preference
-  m_Settings.beginGroup("Servers");
+  qsettings().beginGroup("Servers");
   for (int i = 0; i < ui->knownServersList->count(); ++i) {
     QString key = ui->knownServersList->item(i)->data(Qt::UserRole).toString();
-    QVariantMap val = m_Settings.value(key).toMap();
+    QVariantMap val = qsettings().value(key).toMap();
     val["preferred"] = 0;
-    m_Settings.setValue(key, val);
+    qsettings().setValue(key, val);
   }
   int count = ui->preferredServersList->count();
   for (int i = 0; i < count; ++i) {
     QString key = ui->preferredServersList->item(i)->data(Qt::UserRole).toString();
-    QVariantMap val = m_Settings.value(key).toMap();
+    QVariantMap val = qsettings().value(key).toMap();
     val["preferred"] = count - i;
-    m_Settings.setValue(key, val);
+    qsettings().setValue(key, val);
   }
-  m_Settings.endGroup();
+  qsettings().endGroup();
 }
 
 void NexusSettingsTab::on_nexusConnect_clicked()
@@ -168,12 +168,12 @@ void NexusSettingsTab::on_nexusManualKey_clicked()
     return;
   }
 
-  NexusManualKeyDialog dialog(parentWidget());
-  if (dialog.exec() != QDialog::Accepted) {
+  NexusManualKeyDialog d(&dialog());
+  if (d.exec() != QDialog::Accepted) {
     return;
   }
 
-  const auto key = dialog.key();
+  const auto key = d.key();
   if (key.isEmpty()) {
     clearKey();
     return;
@@ -193,7 +193,7 @@ void NexusSettingsTab::on_nexusDisconnect_clicked()
 void NexusSettingsTab::on_clearCacheButton_clicked()
 {
   QDir(Settings::instance().getCacheDirectory()).removeRecursively();
-  NexusInterface::instance(m_dialog.m_PluginContainer)->clearCache();
+  NexusInterface::instance(dialog().m_PluginContainer)->clearCache();
 }
 
 void NexusSettingsTab::on_associateButton_clicked()
@@ -205,7 +205,7 @@ void NexusSettingsTab::validateKey(const QString& key)
 {
   if (!m_nexusValidator) {
     m_nexusValidator.reset(new NexusKeyValidator(
-      *NexusInterface::instance(m_dialog.m_PluginContainer)->getAccessManager()));
+      *NexusInterface::instance(dialog().m_PluginContainer)->getAccessManager()));
 
     m_nexusValidator->stateChanged = [&](auto&& s, auto&& e){
       onValidatorStateChanged(s, e);
@@ -261,7 +261,7 @@ void NexusSettingsTab::onValidatorStateChanged(
 
 void NexusSettingsTab::onValidatorFinished(const APIUserAccount& user)
 {
-  NexusInterface::instance(m_dialog.m_PluginContainer)->setUserAccount(user);
+  NexusInterface::instance(dialog().m_PluginContainer)->setUserAccount(user);
 
   if (!user.apiKey().isEmpty()) {
     if (setKey(user.apiKey())) {
@@ -278,18 +278,18 @@ void NexusSettingsTab::addNexusLog(const QString& s)
 
 bool NexusSettingsTab::setKey(const QString& key)
 {
-  m_dialog.m_keyChanged = true;
-  const bool ret = m_parent->setNexusApiKey(key);
+  dialog().m_keyChanged = true;
+  const bool ret = settings().setNexusApiKey(key);
   updateNexusState();
   return ret;
 }
 
 bool NexusSettingsTab::clearKey()
 {
-  m_dialog.m_keyChanged = true;
-  const auto ret = m_parent->clearNexusApiKey();
+  dialog().m_keyChanged = true;
+  const auto ret = settings().clearNexusApiKey();
 
-  NexusInterface::instance(m_dialog.m_PluginContainer)->getAccessManager()->clearApiKey();
+  NexusInterface::instance(dialog().m_PluginContainer)->getAccessManager()->clearApiKey();
   updateNexusState();
 
   return ret;
@@ -319,7 +319,7 @@ void NexusSettingsTab::updateNexusButtons()
     ui->nexusManualKey->setText(QObject::tr("Cancel"));
     ui->nexusManualKey->setEnabled(true);
   }
-  else if (m_parent->hasNexusApiKey()) {
+  else if (settings().hasNexusApiKey()) {
     // api key is present
     ui->nexusConnect->setText(QObject::tr("Connect to Nexus"));
     ui->nexusConnect->setEnabled(false);
@@ -338,7 +338,7 @@ void NexusSettingsTab::updateNexusButtons()
 
 void NexusSettingsTab::updateNexusData()
 {
-  const auto user = NexusInterface::instance(m_dialog.m_PluginContainer)
+  const auto user = NexusInterface::instance(dialog().m_PluginContainer)
     ->getAPIUserAccount();
 
   if (user.isValid()) {
-- 
cgit v1.3.1