summaryrefslogtreecommitdiffstats
path: root/api/logic/minecraft/ftb
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-08-14 02:33:31 +0200
committerPetr Mrázek <peterix@gmail.com>2016-08-14 23:22:54 +0200
commit042f3ef55c0b469f438542152c4eb02b0789ea3c (patch)
tree03e0c15b200786558babd0fe58edac88ed1bfd1e /api/logic/minecraft/ftb
parent2f0441b3c1cd9fc3bcb176d2852da8f92a6e6777 (diff)
downloadMultiMC-042f3ef55c0b469f438542152c4eb02b0789ea3c.tar
MultiMC-042f3ef55c0b469f438542152c4eb02b0789ea3c.tar.gz
MultiMC-042f3ef55c0b469f438542152c4eb02b0789ea3c.tar.lz
MultiMC-042f3ef55c0b469f438542152c4eb02b0789ea3c.tar.xz
MultiMC-042f3ef55c0b469f438542152c4eb02b0789ea3c.zip
GH-352 Make OneSix instance update downloads cancellable
Diffstat (limited to 'api/logic/minecraft/ftb')
-rw-r--r--api/logic/minecraft/ftb/OneSixFTBInstance.cpp2
-rw-r--r--api/logic/minecraft/ftb/OneSixFTBInstance.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/logic/minecraft/ftb/OneSixFTBInstance.cpp b/api/logic/minecraft/ftb/OneSixFTBInstance.cpp
index 81e939a1..5edad080 100644
--- a/api/logic/minecraft/ftb/OneSixFTBInstance.cpp
+++ b/api/logic/minecraft/ftb/OneSixFTBInstance.cpp
@@ -125,7 +125,7 @@ void OneSixFTBInstance::createProfile()
m_profile.reset(new MinecraftProfile(new FTBProfileStrategy(this)));
}
-std::shared_ptr<Task> OneSixFTBInstance::createUpdateTask()
+shared_qobject_ptr<Task> OneSixFTBInstance::createUpdateTask()
{
return OneSixInstance::createUpdateTask();
}
diff --git a/api/logic/minecraft/ftb/OneSixFTBInstance.h b/api/logic/minecraft/ftb/OneSixFTBInstance.h
index e7f8f485..a5621685 100644
--- a/api/logic/minecraft/ftb/OneSixFTBInstance.h
+++ b/api/logic/minecraft/ftb/OneSixFTBInstance.h
@@ -13,7 +13,7 @@ public:
virtual void createProfile() override;
- virtual std::shared_ptr<Task> createUpdateTask() override;
+ virtual shared_qobject_ptr<Task> createUpdateTask() override;
virtual QString id() const override;