From 4c5e3da2334a1d0c474148be8881b46d6ca6d3fa Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Mon, 17 Aug 2020 05:06:26 -0400
Subject: moved nexus api stuff to GlobalSettings pass a pointer to Settings
 around for things that can be called without settings, when creating the
 first instance added dummy plugin list, mod list and iorganizer to initialize
 plugins without an instance moved PluginContainer into the core filter, had
 nothing to do with the plugins list NexusInterface is now created manually
 instead of being a static singleton because it needs to know if the settings
 are available

---
 src/settings.cpp | 62 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

(limited to 'src/settings.cpp')

diff --git a/src/settings.cpp b/src/settings.cpp
index b286510d..593d66bf 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1812,37 +1812,6 @@ NexusSettings::NexusSettings(Settings& parent, QSettings& settings)
 {
 }
 
-bool NexusSettings::apiKey(QString& apiKey) const
-{
-  QString tempKey = getWindowsCredential("APIKEY");
-  if (tempKey.isEmpty())
-    return false;
-
-  apiKey = tempKey;
-  return true;
-}
-
-bool NexusSettings::setApiKey(const QString& apiKey)
-{
-  if (!setWindowsCredential("APIKEY", apiKey)) {
-    const auto e = GetLastError();
-    log::error("Storing API key failed: {}", formatSystemMessage(e));
-    return false;
-  }
-
-  return true;
-}
-
-bool NexusSettings::clearApiKey()
-{
-  return setApiKey("");
-}
-
-bool NexusSettings::hasApiKey() const
-{
-  return !getWindowsCredential("APIKEY").isEmpty();
-}
-
 bool NexusSettings::endorsementIntegration() const
 {
   return get<bool>(m_Settings, "Settings", "endorsement_integration", true);
@@ -2224,6 +2193,37 @@ void GlobalSettings::setHideTutorialQuestion(bool b)
   settings().setValue("HideTutorialQuestion", b);
 }
 
+bool GlobalSettings::nexusApiKey(QString& apiKey)
+{
+  QString tempKey = getWindowsCredential("APIKEY");
+  if (tempKey.isEmpty())
+    return false;
+
+  apiKey = tempKey;
+  return true;
+}
+
+bool GlobalSettings::setNexusApiKey(const QString& apiKey)
+{
+  if (!setWindowsCredential("APIKEY", apiKey)) {
+    const auto e = GetLastError();
+    log::error("Storing API key failed: {}", formatSystemMessage(e));
+    return false;
+  }
+
+  return true;
+}
+
+bool GlobalSettings::clearNexusApiKey()
+{
+  return setNexusApiKey("");
+}
+
+bool GlobalSettings::hasNexusApiKey()
+{
+  return !getWindowsCredential("APIKEY").isEmpty();
+}
+
 void GlobalSettings::resetDialogs()
 {
   setHideCreateInstanceIntro(false);
-- 
cgit v1.3.1