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/InstanceImportTask.h | 53 +++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

(limited to 'api/logic/InstanceImportTask.h')

diff --git a/api/logic/InstanceImportTask.h b/api/logic/InstanceImportTask.h
index 06778dfe..d326391b 100644
--- a/api/logic/InstanceImportTask.h
+++ b/api/logic/InstanceImportTask.h
@@ -10,46 +10,45 @@
 #include "QObjectPtr.h"
 
 class QuaZip;
-class BaseInstanceProvider;
 namespace Flame
 {
-	class FileResolvingTask;
+    class FileResolvingTask;
 }
 
 class MULTIMC_LOGIC_EXPORT InstanceImportTask : public InstanceTask
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit InstanceImportTask(const QUrl sourceUrl);
+    explicit InstanceImportTask(const QUrl sourceUrl);
 
 protected:
-	//! Entry point for tasks.
-	virtual void executeTask() override;
+    //! Entry point for tasks.
+    virtual void executeTask() override;
 
 private:
-	void processZipPack();
-	void processMultiMC();
-	void processFlame();
+    void processZipPack();
+    void processMultiMC();
+    void processFlame();
 
 private slots:
-	void downloadSucceeded();
-	void downloadFailed(QString reason);
-	void downloadProgressChanged(qint64 current, qint64 total);
-	void extractFinished();
-	void extractAborted();
+    void downloadSucceeded();
+    void downloadFailed(QString reason);
+    void downloadProgressChanged(qint64 current, qint64 total);
+    void extractFinished();
+    void extractAborted();
 
 private: /* data */
-	NetJobPtr m_filesNetJob;
-	shared_qobject_ptr<Flame::FileResolvingTask> m_modIdResolver;
-	QUrl m_sourceUrl;
-	QString m_archivePath;
-	bool m_downloadRequired = false;
-	std::unique_ptr<QuaZip> m_packZip;
-	QFuture<QStringList> m_extractFuture;
-	QFutureWatcher<QStringList> m_extractFutureWatcher;
-	enum class ModpackType{
-		Unknown,
-		MultiMC,
-		Flame
-	} m_modpackType = ModpackType::Unknown;
+    NetJobPtr m_filesNetJob;
+    shared_qobject_ptr<Flame::FileResolvingTask> m_modIdResolver;
+    QUrl m_sourceUrl;
+    QString m_archivePath;
+    bool m_downloadRequired = false;
+    std::unique_ptr<QuaZip> m_packZip;
+    QFuture<QStringList> m_extractFuture;
+    QFutureWatcher<QStringList> m_extractFutureWatcher;
+    enum class ModpackType{
+        Unknown,
+        MultiMC,
+        Flame
+    } m_modpackType = ModpackType::Unknown;
 };
-- 
cgit v1.2.3