aboutsummaryrefslogtreecommitdiff
path: root/launcher/Application.h
diff options
context:
space:
mode:
Diffstat (limited to 'launcher/Application.h')
-rw-r--r--launcher/Application.h17
1 files changed, 5 insertions, 12 deletions
diff --git a/launcher/Application.h b/launcher/Application.h
index cf7967a5..7185886d 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -71,6 +71,7 @@ class TranslationsModel;
class ITheme;
class MCEditTool;
class ThemeManager;
+class IconTheme;
namespace Meta {
class Index;
@@ -109,17 +110,7 @@ class Application : public QApplication {
QIcon getThemedIcon(const QString& name);
- void setIconTheme(const QString& name);
-
- void applyCurrentlySelectedTheme(bool initial = false);
-
- QList<ITheme*> getValidApplicationThemes();
-
- void setApplicationTheme(const QString& name);
-
- QList<CatPack*> getValidCatPacks();
-
- QString getCatPack(QString catName = "");
+ ThemeManager* themeManager() { return m_themeManager.get(); }
shared_qobject_ptr<ExternalUpdater> updater() { return m_updater; }
@@ -186,6 +177,8 @@ class Application : public QApplication {
int suitableMaxMem();
+ QUrl normalizeImportUrl(QString const& url);
+
signals:
void updateAllowedChanged(bool status);
void globalSettingsAboutToOpen();
@@ -288,7 +281,7 @@ class Application : public QApplication {
QString m_serverToJoin;
QString m_profileToUse;
bool m_liveCheck = false;
- QList<QUrl> m_zipsToImport;
+ QList<QUrl> m_urlsToImport;
QString m_instanceIdToShowWindowOf;
std::unique_ptr<QFile> logFile;
};