aboutsummaryrefslogtreecommitdiff
path: root/launcher/Application.cpp
diff options
context:
space:
mode:
authorTayou <tayou@gmx.net>2022-11-01 15:41:08 +0100
committerTayou <tayou@gmx.net>2022-11-01 20:17:53 +0100
commita3f5ea359827abb7949070cdcd8d56be50ab3360 (patch)
tree65bb5898e45aae3fcad239e0b88673e84adc28aa /launcher/Application.cpp
parentfef60a9da0216bdcb266d935bbfea03aba8905b4 (diff)
downloadPrismLauncher-a3f5ea359827abb7949070cdcd8d56be50ab3360.tar.gz
PrismLauncher-a3f5ea359827abb7949070cdcd8d56be50ab3360.tar.bz2
PrismLauncher-a3f5ea359827abb7949070cdcd8d56be50ab3360.zip
added suggested changes
Signed-off-by: Tayou <tayou@gmx.net>
Diffstat (limited to 'launcher/Application.cpp')
-rw-r--r--launcher/Application.cpp18
1 files changed, 5 insertions, 13 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 7b33361c..fa202312 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -2,10 +2,8 @@
/*
* Prism Launcher
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- * Copyright (C) 2022 Tayou <tayou@gmx.net>
- *
- * PolyMC - Minecraft Launcher
* Copyright (C) 2022 Lenny McLennington <lenny@sneed.church>
+ * Copyright (C) 2022 Tayou <tayou@gmx.net>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -71,6 +69,8 @@
#include "ui/pagedialog/PageDialog.h"
+#include "ui/themes/ThemeManager.h"
+
#include "ApplicationMessage.h"
#include <iostream>
@@ -747,11 +747,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
}
// Themes
- {
- m_themeManager = new ThemeManager(m_mainWindow);
-
- m_themeManager->InitializeThemes();
- }
+ m_themeManager = std::make_unique<ThemeManager>(m_mainWindow);
// initialize and load all instances
{
@@ -860,10 +856,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
performMainStartupAction();
}
-ThemeManager* Application::getThemeManager() {
- return Application::m_themeManager;
-}
-
bool Application::createSetupWizard()
{
bool javaRequired = [&]()
@@ -1109,7 +1101,7 @@ std::shared_ptr<JavaInstallList> Application::javalist()
return m_javalist;
}
-std::vector<ITheme *> Application::getValidApplicationThemes()
+QList<ITheme*> Application::getValidApplicationThemes()
{
return m_themeManager->getValidApplicationThemes();
}