From 0efa714ba55a33ea6dbcbd08b50c0b09675ce83b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Wed, 3 May 2017 21:09:36 +0200
Subject: NOISSUE replace std::shared_ptr with shared_qobject_ptr for all
 download tasks

---
 api/logic/minecraft/Library.cpp             |  2 +-
 api/logic/minecraft/forge/ForgeXzDownload.h |  3 ++-
 api/logic/minecraft/onesix/OneSixUpdate.cpp | 10 +++++-----
 api/logic/minecraft/onesix/OneSixUpdate.h   |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'api/logic/minecraft')

diff --git a/api/logic/minecraft/Library.cpp b/api/logic/minecraft/Library.cpp
index 22e1bd33..0fdc2e12 100644
--- a/api/logic/minecraft/Library.cpp
+++ b/api/logic/minecraft/Library.cpp
@@ -51,7 +51,7 @@ void Library::getApplicableFiles(OpSys system, QStringList& jar, QStringList& na
 	}
 }
 
-QList< std::shared_ptr< NetAction > > Library::getDownloads(OpSys system, class HttpMetaCache* cache,
+QList<NetActionPtr> Library::getDownloads(OpSys system, class HttpMetaCache* cache,
 															QStringList& failedFiles, const QString & overridePath) const
 {
 	QList<NetActionPtr> out;
diff --git a/api/logic/minecraft/forge/ForgeXzDownload.h b/api/logic/minecraft/forge/ForgeXzDownload.h
index ede4e6ce..8d6ad74a 100644
--- a/api/logic/minecraft/forge/ForgeXzDownload.h
+++ b/api/logic/minecraft/forge/ForgeXzDownload.h
@@ -19,8 +19,9 @@
 #include "net/HttpMetaCache.h"
 #include <QFile>
 #include <QTemporaryFile>
+#include "QObjectPtr.h"
 
-typedef std::shared_ptr<class ForgeXzDownload> ForgeXzDownloadPtr;
+typedef shared_qobject_ptr<class ForgeXzDownload> ForgeXzDownloadPtr;
 
 class ForgeXzDownload : public NetAction
 {
diff --git a/api/logic/minecraft/onesix/OneSixUpdate.cpp b/api/logic/minecraft/onesix/OneSixUpdate.cpp
index c45dada1..163cb1a3 100644
--- a/api/logic/minecraft/onesix/OneSixUpdate.cpp
+++ b/api/logic/minecraft/onesix/OneSixUpdate.cpp
@@ -41,7 +41,7 @@ OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent)
 {
 	// create folders
 	{
-		m_tasks.append(std::make_shared<FoldersTask>(m_inst));
+		m_tasks.append(new FoldersTask(m_inst));
 	}
 
 	// add metadata update tasks, if necessary
@@ -66,7 +66,7 @@ OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent)
 				if(task)
 				{
 					qDebug() << "Loading remote meta patch" << id;
-					m_tasks.append(task.unwrap());
+					m_tasks.append(task);
 				}
 			}
 			else
@@ -78,17 +78,17 @@ OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent)
 
 	// libraries download
 	{
-		m_tasks.append(std::make_shared<LibrariesTask>(m_inst));
+		m_tasks.append(new LibrariesTask(m_inst));
 	}
 
 	// FML libraries download and copy into the instance
 	{
-		m_tasks.append(std::make_shared<FMLLibrariesTask>(m_inst));
+		m_tasks.append(new FMLLibrariesTask(m_inst));
 	}
 
 	// assets update
 	{
-		m_tasks.append(std::make_shared<AssetUpdateTask>(m_inst));
+		m_tasks.append(new AssetUpdateTask(m_inst));
 	}
 }
 
diff --git a/api/logic/minecraft/onesix/OneSixUpdate.h b/api/logic/minecraft/onesix/OneSixUpdate.h
index 6bcfd41a..7b6fa5ca 100644
--- a/api/logic/minecraft/onesix/OneSixUpdate.h
+++ b/api/logic/minecraft/onesix/OneSixUpdate.h
@@ -46,7 +46,7 @@ private:
 
 private:
 	OneSixInstance *m_inst = nullptr;
-	QList<std::shared_ptr<Task>> m_tasks;
+	QList<shared_qobject_ptr<Task>> m_tasks;
 	QString m_preFailure;
 	int m_currentTask = -1;
 	bool m_abort = false;
-- 
cgit v1.2.3