CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE replace std::shared_ptr with shared_qobject_ptr for all download tasks

Browse Source
This commit is contained in:
Petr Mrázek
2017-05-03 21:09:36 +02:00
parent 907aa36704
commit 0efa714ba5
10 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/logic/net/Download.cpp
View File

@ -40,7 +40,7 @@ Download::Ptr Download::makeCached(QUrl url, MetaEntryPtr entry, Options options
auto cachedNode = new MetaCacheSink(entry, md5Node);
dl->m_sink.reset(cachedNode);
dl->m_target_path = entry->getFullPath();
return std::shared_ptr<Download>(dl);
return dl;
}
Download::Ptr Download::makeByteArray(QUrl url, QByteArray *output, Options options)
@ -49,7 +49,7 @@ Download::Ptr Download::makeByteArray(QUrl url, QByteArray *output, Options opti
dl->m_url = url;
dl->m_options = options;
dl->m_sink.reset(new ByteArraySink(output));
return std::shared_ptr<Download>(dl);
return dl;
}
Download::Ptr Download::makeFile(QUrl url, QString path, Options options)
@ -58,7 +58,7 @@ Download::Ptr Download::makeFile(QUrl url, QString path, Options options)
dl->m_url = url;
dl->m_options = options;
dl->m_sink.reset(new FileSink(path));
return std::shared_ptr<Download>(dl);
return dl;
}
void Download::addValidator(Validator * v)

2
api/logic/net/Download.h
View File

@ -27,7 +27,7 @@ class MULTIMC_LOGIC_EXPORT Download : public NetAction
Q_OBJECT
public: /* types */
typedef std::shared_ptr<class Download> Ptr;
typedef shared_qobject_ptr<class Download> Ptr;
enum class Option
{
NoOptions = 0,

2
api/logic/net/NetAction.h
View File

@ -25,7 +25,7 @@
#include "multimc_logic_export.h"
typedef std::shared_ptr<class NetAction> NetActionPtr;
typedef shared_qobject_ptr<class NetAction> NetActionPtr;
class MULTIMC_LOGIC_EXPORT NetAction : public Task
{
Q_OBJECT