GH-352 Make OneSix instance update downloads cancellable

2016-08-14 02:33:31 +02:00
parent 2f0441b3c1
commit 042f3ef55c
32 changed files with 796 additions and 360 deletions
--- a/api/logic/minecraft/onesix/OneSixInstance.cpp
+++ b/api/logic/minecraft/onesix/OneSixInstance.cpp
@ -60,9 +60,9 @@ QSet<QString> OneSixInstance::traits()
 	}
 }

-std::shared_ptr<Task> OneSixInstance::createUpdateTask()
+shared_qobject_ptr<Task> OneSixInstance::createUpdateTask()
 {
-	return std::shared_ptr<Task>(new OneSixUpdate(this));
+	return shared_qobject_ptr<Task>(new OneSixUpdate(this));
 }

 QString replaceTokensIn(QString text, QMap<QString, QString> with)