From a1abbd9e05c80584d831b1d12c27c5f7d731cece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 28 May 2016 19:54:17 +0200 Subject: NOISSUE refactor *Download into more, smaller pieces * Download is now Download. * Download uses Sink subclasses to process various events. * Validators can be used to further customize the Sink behaviour. --- api/logic/minecraft/liteloader/LiteLoaderVersionList.cpp | 8 +++----- api/logic/minecraft/liteloader/LiteLoaderVersionList.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'api/logic/minecraft/liteloader') diff --git a/api/logic/minecraft/liteloader/LiteLoaderVersionList.cpp b/api/logic/minecraft/liteloader/LiteLoaderVersionList.cpp index b0c9736a..f8bf095f 100644 --- a/api/logic/minecraft/liteloader/LiteLoaderVersionList.cpp +++ b/api/logic/minecraft/liteloader/LiteLoaderVersionList.cpp @@ -146,8 +146,7 @@ void LLListLoadTask::executeTask() // verify by poking the server. liteloaderEntry->setStale(true); - job->addNetAction(listDownload = CacheDownload::make(QUrl(URLConstants::LITELOADER_URL), - liteloaderEntry)); + job->addNetAction(listDownload = Net::Download::makeCached(QUrl(URLConstants::LITELOADER_URL), liteloaderEntry)); connect(listDownload.get(), SIGNAL(failed(int)), SLOT(listFailed())); @@ -167,8 +166,7 @@ void LLListLoadTask::listDownloaded() { QByteArray data; { - auto dlJob = listDownload; - auto filename = std::dynamic_pointer_cast(dlJob)->getTargetFilepath(); + auto filename = listDownload->getTargetFilepath(); QFile listFile(filename); if (!listFile.open(QIODevice::ReadOnly)) { @@ -177,7 +175,7 @@ void LLListLoadTask::listDownloaded() } data = listFile.readAll(); listFile.close(); - dlJob.reset(); + listDownload.reset(); } QJsonParseError jsonError; diff --git a/api/logic/minecraft/liteloader/LiteLoaderVersionList.h b/api/logic/minecraft/liteloader/LiteLoaderVersionList.h index 1dba4b6a..ae8bee92 100644 --- a/api/logic/minecraft/liteloader/LiteLoaderVersionList.h +++ b/api/logic/minecraft/liteloader/LiteLoaderVersionList.h @@ -112,7 +112,7 @@ slots: protected: NetJobPtr listJob; - CacheDownloadPtr listDownload; + Net::Download::Ptr listDownload; LiteLoaderVersionList *m_list; }; -- cgit v1.2.3