aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/MinecraftLoadAndCheck.h
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-08-05 19:09:10 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-08-05 19:09:10 +0300
commitb2fdd8359405c93d0d93aa8c68971c986a1f68cb (patch)
tree59859119373213ce04b2f5e2d7a95227b57be609 /launcher/minecraft/MinecraftLoadAndCheck.h
parent149b6d59cf848a3b3cd50b3aee1c112e9c47e633 (diff)
parentae793f6cf11658c9abc5111e82d5ba7b3e6af127 (diff)
downloadPrismLauncher-b2fdd8359405c93d0d93aa8c68971c986a1f68cb.tar.gz
PrismLauncher-b2fdd8359405c93d0d93aa8c68971c986a1f68cb.tar.bz2
PrismLauncher-b2fdd8359405c93d0d93aa8c68971c986a1f68cb.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/minecraft/MinecraftLoadAndCheck.h')
-rw-r--r--launcher/minecraft/MinecraftLoadAndCheck.h20
1 files changed, 9 insertions, 11 deletions
diff --git a/launcher/minecraft/MinecraftLoadAndCheck.h b/launcher/minecraft/MinecraftLoadAndCheck.h
index d9af3ace..9556c1d6 100644
--- a/launcher/minecraft/MinecraftLoadAndCheck.h
+++ b/launcher/minecraft/MinecraftLoadAndCheck.h
@@ -15,34 +15,32 @@
#pragma once
-#include <QObject>
#include <QList>
+#include <QObject>
#include <QUrl>
-#include "tasks/Task.h"
#include <quazip/quazip.h>
+#include "tasks/Task.h"
#include "QObjectPtr.h"
class MinecraftVersion;
class MinecraftInstance;
-class MinecraftLoadAndCheck : public Task
-{
+class MinecraftLoadAndCheck : public Task {
Q_OBJECT
-public:
- explicit MinecraftLoadAndCheck(MinecraftInstance *inst, QObject *parent = 0);
- virtual ~MinecraftLoadAndCheck() {};
+ public:
+ explicit MinecraftLoadAndCheck(MinecraftInstance* inst, QObject* parent = 0);
+ virtual ~MinecraftLoadAndCheck(){};
void executeTask() override;
-private slots:
+ private slots:
void subtaskSucceeded();
void subtaskFailed(QString error);
-private:
- MinecraftInstance *m_inst = nullptr;
+ private:
+ MinecraftInstance* m_inst = nullptr;
Task::Ptr m_task;
QString m_preFailure;
QString m_fail_reason;
};
-