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/pages/modplatform/ftb/FtbListModel.cpp | 8 ++++----
launcher/pages/modplatform/ftb/FtbPage.h | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'launcher/pages/modplatform/ftb')
diff --git a/launcher/pages/modplatform/ftb/FtbListModel.cpp b/launcher/pages/modplatform/ftb/FtbListModel.cpp
index c4c2c83e..16a744cf 100644
--- a/launcher/pages/modplatform/ftb/FtbListModel.cpp
+++ b/launcher/pages/modplatform/ftb/FtbListModel.cpp
@@ -2,7 +2,7 @@
#include "BuildConfig.h"
#include "Env.h"
-#include "Launcher.h"
+#include "Application.h"
#include "Json.h"
#include <QPainter>
@@ -46,7 +46,7 @@ QVariant ListModel::data(const QModelIndex &index, int role) const
}
else if(role == Qt::DecorationRole)
{
- QIcon placeholder = LAUNCHER->getThemedIcon("screenshot-placeholder");
+ QIcon placeholder = APPLICATION->getThemedIcon("screenshot-placeholder");
auto iter = m_logoMap.find(pack.name);
if (iter != m_logoMap.end()) {
@@ -78,7 +78,7 @@ void ListModel::getLogo(const QString &logo, const QString &logoUrl, LogoCallbac
{
if(m_logoMap.contains(logo))
{
- callback(ENV.metacache()->resolveEntry("ModpacksCHPacks", QString("logos/%1").arg(logo.section(".", 0, 0)))->getFullPath());
+ callback(ENV->metacache()->resolveEntry("ModpacksCHPacks", QString("logos/%1").arg(logo.section(".", 0, 0)))->getFullPath());
}
else
{
@@ -252,7 +252,7 @@ void ListModel::requestLogo(QString logo, QString url)
return;
}
- MetaEntryPtr entry = ENV.metacache()->resolveEntry("ModpacksCHPacks", QString("logos/%1").arg(logo.section(".", 0, 0)));
+ MetaEntryPtr entry = ENV->metacache()->resolveEntry("ModpacksCHPacks", QString("logos/%1").arg(logo.section(".", 0, 0)));
bool stale = entry->isStale();
diff --git a/launcher/pages/modplatform/ftb/FtbPage.h b/launcher/pages/modplatform/ftb/FtbPage.h
index 0a4a6cea..b8331f8f 100644
--- a/launcher/pages/modplatform/ftb/FtbPage.h
+++ b/launcher/pages/modplatform/ftb/FtbPage.h
@@ -20,7 +20,7 @@
#include <QWidget>
-#include "Launcher.h"
+#include "Application.h"
#include "pages/BasePage.h"
#include "tasks/Task.h"
@@ -44,7 +44,7 @@ public:
}
virtual QIcon icon() const override
{
- return LAUNCHER->getThemedIcon("ftb_logo");
+ return APPLICATION->getThemedIcon("ftb_logo");
}
virtual QString id() const override
{
--
cgit