diff options
author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-14 12:41:21 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-14 12:41:21 -0700 |
commit | 37fb52aada16fa8533ecee3932e10fcbee0ca1d5 (patch) | |
tree | 126942b7f0b952a8ef6ff59af93f8cba42d0000d /launcher/modplatform/legacy_ftb/PackInstallTask.h | |
parent | 094af0f78f76d9d20cdbc034074d39afcc8ed34c (diff) | |
parent | c8533c0b0d4e510bfe6c6818a25f5c45bc796a53 (diff) | |
download | PrismLauncher-37fb52aada16fa8533ecee3932e10fcbee0ca1d5.tar.gz PrismLauncher-37fb52aada16fa8533ecee3932e10fcbee0ca1d5.tar.bz2 PrismLauncher-37fb52aada16fa8533ecee3932e10fcbee0ca1d5.zip |
Merge pull request #1351 from Trial97/ftb_import
fixed substatus on ftb_import
Diffstat (limited to 'launcher/modplatform/legacy_ftb/PackInstallTask.h')
-rw-r--r-- | launcher/modplatform/legacy_ftb/PackInstallTask.h | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.h b/launcher/modplatform/legacy_ftb/PackInstallTask.h index da791e06..30ff4859 100644 --- a/launcher/modplatform/legacy_ftb/PackInstallTask.h +++ b/launcher/modplatform/legacy_ftb/PackInstallTask.h @@ -1,12 +1,12 @@ #pragma once -#include "InstanceTask.h" -#include "net/NetJob.h" #include <quazip/quazip.h> #include <quazip/quazipdir.h> +#include "InstanceTask.h" +#include "PackHelpers.h" #include "meta/Index.h" #include "meta/Version.h" #include "meta/VersionList.h" -#include "PackHelpers.h" +#include "net/NetJob.h" #include "net/NetJob.h" @@ -14,36 +14,31 @@ namespace LegacyFTB { -class PackInstallTask : public InstanceTask -{ +class PackInstallTask : public InstanceTask { Q_OBJECT -public: + public: explicit PackInstallTask(shared_qobject_ptr<QNetworkAccessManager> network, Modpack pack, QString version); - virtual ~PackInstallTask(){} + virtual ~PackInstallTask() {} bool canAbort() const override { return true; } bool abort() override; -protected: + protected: //! Entry point for tasks. virtual void executeTask() override; -private: + private: void downloadPack(); void unzip(); void install(); -private slots: - void onDownloadSucceeded(); - void onDownloadFailed(QString reason); - void onDownloadProgress(qint64 current, qint64 total); - void onDownloadAborted(); + private slots: void onUnzipFinished(); void onUnzipCanceled(); -private: /* data */ + private: /* data */ shared_qobject_ptr<QNetworkAccessManager> m_network; bool abortable = false; std::unique_ptr<QuaZip> m_packZip; @@ -56,4 +51,4 @@ private: /* data */ QString m_version; }; -} +} // namespace LegacyFTB |