From e76e6329cdf4f1613c6303debd3ca43493147f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Wed, 3 May 2017 23:11:52 +0200 Subject: NOISSUE Revert all recent changes to NetAction and NetJob --- api/logic/minecraft/forge/ForgeXzDownload.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'api/logic/minecraft/forge/ForgeXzDownload.h') diff --git a/api/logic/minecraft/forge/ForgeXzDownload.h b/api/logic/minecraft/forge/ForgeXzDownload.h index 8d6ad74a..ef23809b 100644 --- a/api/logic/minecraft/forge/ForgeXzDownload.h +++ b/api/logic/minecraft/forge/ForgeXzDownload.h @@ -19,9 +19,8 @@ #include "net/HttpMetaCache.h" #include #include -#include "QObjectPtr.h" -typedef shared_qobject_ptr ForgeXzDownloadPtr; +typedef std::shared_ptr ForgeXzDownloadPtr; class ForgeXzDownload : public NetAction { @@ -42,7 +41,7 @@ public: return ForgeXzDownloadPtr(new ForgeXzDownload(relative_path, entry)); } virtual ~ForgeXzDownload(){}; - bool canAbort() const override; + bool canAbort() override; protected slots: @@ -53,7 +52,7 @@ slots: public slots: - void executeTask() override; + void start() override; bool abort() override; private: -- cgit v1.2.3