aboutsummaryrefslogtreecommitdiff
path: root/launcher/Application.h
diff options
context:
space:
mode:
Diffstat (limited to 'launcher/Application.h')
-rw-r--r--launcher/Application.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/launcher/Application.h b/launcher/Application.h
index a7938629..1b3dc499 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -43,7 +43,6 @@
#include <QIcon>
#include <QDateTime>
#include <QUrl>
-#include <updater/GoUpdate.h>
#include <BaseInstance.h>
@@ -63,7 +62,7 @@ class AccountList;
class IconList;
class QNetworkAccessManager;
class JavaInstallList;
-class UpdateChecker;
+class ExternalUpdater;
class BaseProfilerFactory;
class BaseDetachedToolFactory;
class TranslationsModel;
@@ -126,10 +125,12 @@ public:
void setApplicationTheme(const QString& name);
- shared_qobject_ptr<UpdateChecker> updateChecker() {
- return m_updateChecker;
+ shared_qobject_ptr<ExternalUpdater> updater() {
+ return m_updater;
}
+ void triggerUpdateCheck();
+
std::shared_ptr<TranslationsModel> translations();
std::shared_ptr<JavaInstallList> javalist();
@@ -208,6 +209,7 @@ signals:
void updateAllowedChanged(bool status);
void globalSettingsAboutToOpen();
void globalSettingsClosed();
+ int currentCatChanged(int index);
#ifdef Q_OS_MACOS
void clickedOnDock();
@@ -250,7 +252,7 @@ private:
shared_qobject_ptr<QNetworkAccessManager> m_network;
- shared_qobject_ptr<UpdateChecker> m_updateChecker;
+ shared_qobject_ptr<ExternalUpdater> m_updater;
shared_qobject_ptr<AccountList> m_accounts;
shared_qobject_ptr<HttpMetaCache> m_metacache;
@@ -305,8 +307,7 @@ public:
QString m_serverToJoin;
QString m_profileToUse;
bool m_liveCheck = false;
- QUrl m_zipToImport;
+ QList<QUrl> m_zipsToImport;
QString m_instanceIdToShowWindowOf;
std::unique_ptr<QFile> logFile;
};
-