NOISSUE fix build

3 files changed, 8 insertions, 8 deletions

diff --git a/launcher/pages/instance/ScreenshotsPage.cpp b/launcher/pages/instance/ScreenshotsPage.cpp
index f24cf486..f303e9fa 100644
--- a/launcher/pages/instance/ScreenshotsPage.cpp
+++ b/launcher/pages/instance/ScreenshotsPage.cpp
@@ -347,8 +347,8 @@ void ScreenshotsPage::on_actionUpload_triggered()
     auto albumTask = NetJobPtr(new NetJob("Imgur Album Creation"));
     auto imgurAlbum = ImgurAlbumCreation::make(uploaded);
     albumTask->addNetAction(imgurAlbum);
-    task.addTask(job.unwrap());
-    task.addTask(albumTask.unwrap());
+    task.addTask(job);
+    task.addTask(albumTask);
     m_uploadActive = true;
     ProgressDialog prog(this);
     if (prog.execWithTask(&task) != QDialog::Accepted)
diff --git a/launcher/tasks/SequentialTask.cpp b/launcher/tasks/SequentialTask.cpp
index d0777132..f96f2cee 100644
--- a/launcher/tasks/SequentialTask.cpp
+++ b/launcher/tasks/SequentialTask.cpp
@@ -4,7 +4,7 @@ SequentialTask::SequentialTask(QObject *parent) : Task(parent), m_currentIndex(-
 {
 }
 
-void SequentialTask::addTask(std::shared_ptr<Task> task)
+void SequentialTask::addTask(shared_qobject_ptr<Task> task)
 {
     m_queue.append(task);
 }
@@ -19,7 +19,7 @@ void SequentialTask::startNext()
 {
     if (m_currentIndex != -1)
     {
-        std::shared_ptr<Task> previous = m_queue[m_currentIndex];
+        shared_qobject_ptr<Task> previous = m_queue[m_currentIndex];
         disconnect(previous.get(), 0, this, 0);
     }
     m_currentIndex++;
@@ -28,7 +28,7 @@ void SequentialTask::startNext()
         emitSucceeded();
         return;
     }
-    std::shared_ptr<Task> next = m_queue[m_currentIndex];
+    shared_qobject_ptr<Task> next = m_queue[m_currentIndex];
     connect(next.get(), SIGNAL(failed(QString)), this, SLOT(subTaskFailed(QString)));
     connect(next.get(), SIGNAL(status(QString)), this, SLOT(subTaskStatus(QString)));
     connect(next.get(), SIGNAL(progress(qint64, qint64)), this, SLOT(subTaskProgress(qint64, qint64)));
diff --git a/launcher/tasks/SequentialTask.h b/launcher/tasks/SequentialTask.h
index 6898c8a6..e3091176 100644
--- a/launcher/tasks/SequentialTask.h
+++ b/launcher/tasks/SequentialTask.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "Task.h"
+#include "QObjectPtr.h"
 
 #include <QQueue>
-#include <memory>
 
 class SequentialTask : public Task
 {
@@ -12,7 +12,7 @@ public:
     explicit SequentialTask(QObject *parent = 0);
     virtual ~SequentialTask() {};
 
-    void addTask(std::shared_ptr<Task> task);
+    void addTask(shared_qobject_ptr<Task> task);
 
 protected:
     void executeTask();
@@ -25,6 +25,6 @@ slots:
     void subTaskProgress(qint64 current, qint64 total);
 
 private:
-    QQueue<std::shared_ptr<Task> > m_queue;
+    QQueue<shared_qobject_ptr<Task> > m_queue;
     int m_currentIndex;
 };