From 0c861db7a201c813530e703257f286257f39872f Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Sat, 20 Nov 2021 16:22:22 +0100
Subject: NOISSUE Some happy little refactors

---
 launcher/setupwizard/AnalyticsWizardPage.cpp | 6 +++---
 launcher/setupwizard/JavaWizardPage.cpp      | 6 +++---
 launcher/setupwizard/LanguageWizardPage.cpp  | 6 +++---
 launcher/setupwizard/SetupWizard.cpp         | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'launcher/setupwizard')

diff --git a/launcher/setupwizard/AnalyticsWizardPage.cpp b/launcher/setupwizard/AnalyticsWizardPage.cpp
index f1d7b006..3db2f6dc 100644
--- a/launcher/setupwizard/AnalyticsWizardPage.cpp
+++ b/launcher/setupwizard/AnalyticsWizardPage.cpp
@@ -1,5 +1,5 @@
 #include "AnalyticsWizardPage.h"
-#include <Launcher.h>
+#include <Application.h>
 
 #include <QVBoxLayout>
 #include <QTextBrowser>
@@ -33,8 +33,8 @@ AnalyticsWizardPage::~AnalyticsWizardPage()
 
 bool AnalyticsWizardPage::validatePage()
 {
-    auto settings = LAUNCHER->settings();
-    auto analytics = LAUNCHER->analytics();
+    auto settings = APPLICATION->settings();
+    auto analytics = APPLICATION->analytics();
     auto status = checkBox->isChecked();
     settings->set("AnalyticsSeen", analytics->version());
     settings->set("Analytics", status);
diff --git a/launcher/setupwizard/JavaWizardPage.cpp b/launcher/setupwizard/JavaWizardPage.cpp
index a60090ce..8251e2ac 100644
--- a/launcher/setupwizard/JavaWizardPage.cpp
+++ b/launcher/setupwizard/JavaWizardPage.cpp
@@ -1,5 +1,5 @@
 #include "JavaWizardPage.h"
-#include <Launcher.h>
+#include <Application.h>
 
 #include <QVBoxLayout>
 #include <QGroupBox>
@@ -55,7 +55,7 @@ bool JavaWizardPage::wantsRefreshButton()
 
 bool JavaWizardPage::validatePage()
 {
-    auto settings = LAUNCHER->settings();
+    auto settings = APPLICATION->settings();
     auto result = m_java_widget->validate();
     switch(result)
     {
@@ -71,7 +71,7 @@ bool JavaWizardPage::validatePage()
         case JavaSettingsWidget::ValidationStatus::JavaBad:
         {
             // Memory
-            auto s = LAUNCHER->settings();
+            auto s = APPLICATION->settings();
             s->set("MinMemAlloc", m_java_widget->minHeapSize());
             s->set("MaxMemAlloc", m_java_widget->maxHeapSize());
             if (m_java_widget->permGenEnabled())
diff --git a/launcher/setupwizard/LanguageWizardPage.cpp b/launcher/setupwizard/LanguageWizardPage.cpp
index e352ccca..ccdc0c90 100644
--- a/launcher/setupwizard/LanguageWizardPage.cpp
+++ b/launcher/setupwizard/LanguageWizardPage.cpp
@@ -1,5 +1,5 @@
 #include "LanguageWizardPage.h"
-#include <Launcher.h>
+#include <Application.h>
 #include <translations/TranslationsModel.h>
 
 #include "widgets/LanguageSelectionWidget.h"
@@ -29,13 +29,13 @@ bool LanguageWizardPage::wantsRefreshButton()
 
 void LanguageWizardPage::refresh()
 {
-    auto translations = LAUNCHER->translations();
+    auto translations = APPLICATION->translations();
     translations->downloadIndex();
 }
 
 bool LanguageWizardPage::validatePage()
 {
-    auto settings = LAUNCHER->settings();
+    auto settings = APPLICATION->settings();
     QString key = mainWidget->getSelectedLanguageKey();
     settings->set("Language", key);
     return true;
diff --git a/launcher/setupwizard/SetupWizard.cpp b/launcher/setupwizard/SetupWizard.cpp
index 46b2ef79..5af5ba91 100644
--- a/launcher/setupwizard/SetupWizard.cpp
+++ b/launcher/setupwizard/SetupWizard.cpp
@@ -5,7 +5,7 @@
 #include "AnalyticsWizardPage.h"
 
 #include "translations/TranslationsModel.h"
-#include <Launcher.h>
+#include <Application.h>
 #include <FileSystem.h>
 #include <ganalytics.h>
 
-- 
cgit