Merge branch 'develop' into chore/add-compiler-warnings

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

1 files changed, 38 insertions, 35 deletions

diff --git a/launcher/modplatform/technic/SolderPackInstallTask.h b/launcher/modplatform/technic/SolderPackInstallTask.h
index aa14ce88..f2c6a83a 100644
--- a/launcher/modplatform/technic/SolderPackInstallTask.h
+++ b/launcher/modplatform/technic/SolderPackInstallTask.h
@@ -40,45 +40,48 @@
 #include <tasks/Task.h>
 
 #include <QUrl>
+#include <memory>
 
-namespace Technic
-{
-    class SolderPackInstallTask : public InstanceTask
-    {
-        Q_OBJECT
-    public:
-        explicit SolderPackInstallTask(shared_qobject_ptr<QNetworkAccessManager> network, const QUrl &solderUrl, const QString& pack, const QString& version, const QString &minecraftVersion);
+namespace Technic {
+class SolderPackInstallTask : public InstanceTask {
+    Q_OBJECT
+   public:
+    explicit SolderPackInstallTask(shared_qobject_ptr<QNetworkAccessManager> network,
+                                   const QUrl& solderUrl,
+                                   const QString& pack,
+                                   const QString& version,
+                                   const QString& minecraftVersion);
 
-        bool canAbort() const override { return true; }
-        bool abort() override;
+    bool canAbort() const override { return true; }
+    bool abort() override;
 
-    protected:
-        //! Entry point for tasks.
-        virtual void executeTask() override;
+   protected:
+    //! Entry point for tasks.
+    virtual void executeTask() override;
 
-    private slots:
-        void fileListSucceeded();
-        void downloadSucceeded();
-        void downloadFailed(QString reason);
-        void downloadProgressChanged(qint64 current, qint64 total);
-        void downloadAborted();
-        void extractFinished();
-        void extractAborted();
+   private slots:
+    void fileListSucceeded();
+    void downloadSucceeded();
+    void downloadFailed(QString reason);
+    void downloadProgressChanged(qint64 current, qint64 total);
+    void downloadAborted();
+    void extractFinished();
+    void extractAborted();
 
-    private:
-        bool m_abortable = false;
+   private:
+    bool m_abortable = false;
 
-        shared_qobject_ptr<QNetworkAccessManager> m_network;
+    shared_qobject_ptr<QNetworkAccessManager> m_network;
 
-        NetJob::Ptr m_filesNetJob;
-        QUrl m_solderUrl;
-        QString m_pack;
-        QString m_version;
-        QString m_minecraftVersion;
-        QByteArray m_response;
-        QTemporaryDir m_outputDir;
-        int m_modCount;
-        QFuture<bool> m_extractFuture;
-        QFutureWatcher<bool> m_extractFutureWatcher;
-    };
-}
+    NetJob::Ptr m_filesNetJob;
+    QUrl m_solderUrl;
+    QString m_pack;
+    QString m_version;
+    QString m_minecraftVersion;
+    std::shared_ptr<QByteArray> m_response = std::make_shared<QByteArray>();
+    QTemporaryDir m_outputDir;
+    int m_modCount;
+    QFuture<bool> m_extractFuture;
+    QFutureWatcher<bool> m_extractFutureWatcher;
+};
+}  // namespace Technic