diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-08-02 19:27:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-02 19:27:14 +0200 |
| commit | 01e17806f67534140a6db6cf90191f4db4dd30ac (patch) | |
| tree | 069c327c4eae07613607d673a198e2def10c3aa2 /launcher/modplatform/flame/FlamePackExportTask.h | |
| parent | f561e7febfdbc7124dc27804dfc3c6e90553803e (diff) | |
| parent | 62aa7a52c4f10848b5645b57332afd26421a1f4e (diff) | |
| download | PrismLauncher-01e17806f67534140a6db6cf90191f4db4dd30ac.tar.gz PrismLauncher-01e17806f67534140a6db6cf90191f4db4dd30ac.tar.bz2 PrismLauncher-01e17806f67534140a6db6cf90191f4db4dd30ac.zip | |
Merge pull request #1391 from Trial97/prism_export2
Diffstat (limited to 'launcher/modplatform/flame/FlamePackExportTask.h')
| -rw-r--r-- | launcher/modplatform/flame/FlamePackExportTask.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/launcher/modplatform/flame/FlamePackExportTask.h b/launcher/modplatform/flame/FlamePackExportTask.h index 3dee0a7e..d3dc6281 100644 --- a/launcher/modplatform/flame/FlamePackExportTask.h +++ b/launcher/modplatform/flame/FlamePackExportTask.h @@ -19,8 +19,6 @@ #pragma once -#include <QFuture> -#include <QFutureWatcher> #include "BaseInstance.h" #include "MMCZip.h" #include "minecraft/MinecraftInstance.h" @@ -52,7 +50,6 @@ class FlamePackExportTask : public Task { const QString output; const MMCZip::FilterFunction filter; - typedef std::optional<QString> BuildZipResult; struct ResolvedFile { int addonId; int version; @@ -76,15 +73,13 @@ class FlamePackExportTask : public Task { QMap<QString, HashInfo> pendingHashes{}; QMap<QString, ResolvedFile> resolvedFiles{}; Task::Ptr task; - QFuture<BuildZipResult> buildZipFuture; - QFutureWatcher<BuildZipResult> buildZipWatcher; void collectFiles(); void collectHashes(); void makeApiRequest(); void getProjectsInfo(); void buildZip(); - void finish(); QByteArray generateIndex(); + QByteArray generateHTML(); }; |