From 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Thu, 19 Sep 2019 00:41:48 -0700
Subject: merged from 0.6.7 codebase

---
 api/logic/modplatform/ftb/FtbPackInstallTask.h | 51 +++++++++++++-------------
 1 file changed, 25 insertions(+), 26 deletions(-)

(limited to 'api/logic/modplatform/ftb/FtbPackInstallTask.h')

diff --git a/api/logic/modplatform/ftb/FtbPackInstallTask.h b/api/logic/modplatform/ftb/FtbPackInstallTask.h
index 0bfba3d6..3319025e 100644
--- a/api/logic/modplatform/ftb/FtbPackInstallTask.h
+++ b/api/logic/modplatform/ftb/FtbPackInstallTask.h
@@ -1,6 +1,5 @@
 #pragma once
 #include "InstanceTask.h"
-#include "BaseInstanceProvider.h"
 #include "net/NetJob.h"
 #include "quazip.h"
 #include "quazipdir.h"
@@ -9,41 +8,41 @@
 #include "meta/VersionList.h"
 #include "modplatform/ftb/PackHelpers.h"
 
-class MULTIMC_LOGIC_EXPORT FtbPackInstallTask : public InstanceTask {
-
-	Q_OBJECT
+class MULTIMC_LOGIC_EXPORT FtbPackInstallTask : public InstanceTask
+{
+    Q_OBJECT
 
 public:
-	explicit FtbPackInstallTask(FtbModpack pack, QString version);
-	virtual ~FtbPackInstallTask(){}
+    explicit FtbPackInstallTask(FtbModpack pack, QString version);
+    virtual ~FtbPackInstallTask(){}
 
-	bool abort() override;
+    bool abort() override;
 
 protected:
-	//! Entry point for tasks.
-	virtual void executeTask() override;
+    //! Entry point for tasks.
+    virtual void executeTask() override;
 
 private:
-	void downloadPack();
-	void unzip();
-	void install();
+    void downloadPack();
+    void unzip();
+    void install();
 
 private slots:
-	void onDownloadSucceeded();
-	void onDownloadFailed(QString reason);
-	void onDownloadProgress(qint64 current, qint64 total);
+    void onDownloadSucceeded();
+    void onDownloadFailed(QString reason);
+    void onDownloadProgress(qint64 current, qint64 total);
 
-	void onUnzipFinished();
-	void onUnzipCanceled();
+    void onUnzipFinished();
+    void onUnzipCanceled();
 
 private: /* data */
-	bool abortable = false;
-	std::unique_ptr<QuaZip> m_packZip;
-	QFuture<QStringList> m_extractFuture;
-	QFutureWatcher<QStringList> m_extractFutureWatcher;
-	NetJobPtr netJobContainer;
-	QString archivePath;
-
-	FtbModpack m_pack;
-	QString m_version;
+    bool abortable = false;
+    std::unique_ptr<QuaZip> m_packZip;
+    QFuture<QStringList> m_extractFuture;
+    QFutureWatcher<QStringList> m_extractFutureWatcher;
+    NetJobPtr netJobContainer;
+    QString archivePath;
+
+    FtbModpack m_pack;
+    QString m_version;
 };
-- 
cgit v1.2.3