NOISSUE Some happy little refactors

3 files changed, 15 insertions, 15 deletions

diff --git a/launcher/widgets/JavaSettingsWidget.cpp b/launcher/widgets/JavaSettingsWidget.cpp
index 11f0653a..cfcba428 100644
--- a/launcher/widgets/JavaSettingsWidget.cpp
+++ b/launcher/widgets/JavaSettingsWidget.cpp
@@ -1,5 +1,5 @@
 #include "JavaSettingsWidget.h"
-#include <Launcher.h>
+#include <Application.h>
 
 #include <java/JavaInstall.h>
 #include <dialogs/CustomMessageBox.h>
@@ -22,9 +22,9 @@ JavaSettingsWidget::JavaSettingsWidget(QWidget* parent) : QWidget(parent)
 {
     m_availableMemory = Sys::getSystemRam() / Sys::mebibyte;
 
-    goodIcon = LAUNCHER->getThemedIcon("status-good");
-    yellowIcon = LAUNCHER->getThemedIcon("status-yellow");
-    badIcon = LAUNCHER->getThemedIcon("status-bad");
+    goodIcon = APPLICATION->getThemedIcon("status-good");
+    yellowIcon = APPLICATION->getThemedIcon("status-yellow");
+    badIcon = APPLICATION->getThemedIcon("status-bad");
     setupUi();
 
     connect(m_minMemSpinBox, SIGNAL(valueChanged(int)), this, SLOT(memoryValueChanged(int)));
@@ -116,9 +116,9 @@ void JavaSettingsWidget::setupUi()
 
 void JavaSettingsWidget::initialize()
 {
-    m_versionWidget->initialize(LAUNCHER->javalist().get());
+    m_versionWidget->initialize(APPLICATION->javalist().get());
     m_versionWidget->setResizeOn(2);
-    auto s = LAUNCHER->settings();
+    auto s = APPLICATION->settings();
     // Memory
     observedMinMemory = s->get("MinMemAlloc").toInt();
     observedMaxMemory = s->get("MaxMemAlloc").toInt();
diff --git a/launcher/widgets/LanguageSelectionWidget.cpp b/launcher/widgets/LanguageSelectionWidget.cpp
index 2b972ba7..cf70c7b4 100644
--- a/launcher/widgets/LanguageSelectionWidget.cpp
+++ b/launcher/widgets/LanguageSelectionWidget.cpp
@@ -4,7 +4,7 @@
 #include <QTreeView>
 #include <QHeaderView>
 #include <QLabel>
-#include "Launcher.h"
+#include "Application.h"
 #include "translations/TranslationsModel.h"
 
 LanguageSelectionWidget::LanguageSelectionWidget(QWidget *parent) :
@@ -29,7 +29,7 @@ LanguageSelectionWidget::LanguageSelectionWidget(QWidget *parent) :
     helpUsLabel->setWordWrap(true);
     verticalLayout->addWidget(helpUsLabel);
 
-    auto translations = LAUNCHER->translations();
+    auto translations = APPLICATION->translations();
     auto index = translations->selectedIndex();
     languageView->setModel(translations.get());
     languageView->setCurrentIndex(index);
@@ -41,7 +41,7 @@ LanguageSelectionWidget::LanguageSelectionWidget(QWidget *parent) :
 
 QString LanguageSelectionWidget::getSelectedLanguageKey() const
 {
-    auto translations = LAUNCHER->translations();
+    auto translations = APPLICATION->translations();
     return translations->data(languageView->currentIndex(), Qt::UserRole).toString();
 }
 
@@ -59,7 +59,7 @@ void LanguageSelectionWidget::languageRowChanged(const QModelIndex& current, con
     {
         return;
     }
-    auto translations = LAUNCHER->translations();
+    auto translations = APPLICATION->translations();
     QString key = translations->data(current, Qt::UserRole).toString();
     translations->selectLanguage(key);
     translations->updateLanguage(key);
diff --git a/launcher/widgets/PageContainer.cpp b/launcher/widgets/PageContainer.cpp
index 25e3b676..0bae2b27 100644
--- a/launcher/widgets/PageContainer.cpp
+++ b/launcher/widgets/PageContainer.cpp
@@ -26,11 +26,11 @@
 #include <QDialogButtonBox>
 #include <QGridLayout>
 
-#include "Launcher.h"
+#include "Application.h"
 #include "settings/SettingsObject.h"
 #include "widgets/IconLabel.h"
 #include "PageContainer_p.h"
-#include <Launcher.h>
+#include <Application.h>
 #include <DesktopServices.h>
 
 class PageEntryFilterModel : public QSortFilterProxyModel
@@ -139,12 +139,12 @@ void PageContainer::createUI()
     m_header->setFont(headerLabelFont);
 
     QHBoxLayout *headerHLayout = new QHBoxLayout;
-    const int leftMargin = LAUNCHER->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
+    const int leftMargin = APPLICATION->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
     headerHLayout->addSpacerItem(new QSpacerItem(leftMargin, 0, QSizePolicy::Fixed, QSizePolicy::Ignored));
     headerHLayout->addWidget(m_header);
     headerHLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Ignored));
     headerHLayout->addWidget(m_iconHeader);
-    const int rightMargin = LAUNCHER->style()->pixelMetric(QStyle::PM_LayoutRightMargin);
+    const int rightMargin = APPLICATION->style()->pixelMetric(QStyle::PM_LayoutRightMargin);
     headerHLayout->addSpacerItem(new QSpacerItem(rightMargin, 0, QSizePolicy::Fixed, QSizePolicy::Ignored));
     headerHLayout->setContentsMargins(0, 6, 0, 0);
 
@@ -195,7 +195,7 @@ void PageContainer::showPage(int row)
     {
         m_pageStack->setCurrentIndex(0);
         m_header->setText(QString());
-        m_iconHeader->setIcon(LAUNCHER->getThemedIcon("bug"));
+        m_iconHeader->setIcon(APPLICATION->getThemedIcon("bug"));
     }
 }