diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-10-26 20:23:26 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-10-26 20:23:26 +0200 |
| commit | c46292c9b1c153f2d17554690e90db1c8efe4d23 (patch) | |
| tree | a54a29be846e76b2b57fed03e74eb6fa5ddcf978 /logic/OneSixUpdate.cpp | |
| parent | 1f28a3b8af228ec40412571859f15ea216ccb52a (diff) | |
| parent | 923347729557eed76e4f7e9f6f5f1a79216de0a4 (diff) | |
| download | PrismLauncher-c46292c9b1c153f2d17554690e90db1c8efe4d23.tar.gz PrismLauncher-c46292c9b1c153f2d17554690e90db1c8efe4d23.tar.bz2 PrismLauncher-c46292c9b1c153f2d17554690e90db1c8efe4d23.zip | |
Merge branch 'develop'
Diffstat (limited to 'logic/OneSixUpdate.cpp')
| -rw-r--r-- | logic/OneSixUpdate.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/logic/OneSixUpdate.cpp b/logic/OneSixUpdate.cpp index b5f1d78b..5c421fbf 100644 --- a/logic/OneSixUpdate.cpp +++ b/logic/OneSixUpdate.cpp @@ -72,8 +72,8 @@ void OneSixUpdate::versionFileStart() QString urlstr("http://s3.amazonaws.com/Minecraft.Download/versions/"); urlstr += targetVersion->descriptor() + "/" + targetVersion->descriptor() + ".json"; - auto job = new DownloadJob("Version index"); - job->addByteArrayDownload(QUrl(urlstr)); + auto job = new NetJob("Version index"); + job->addNetAction(ByteArrayDownload::make(QUrl(urlstr))); specificVersionDownloadJob.reset(job); connect(specificVersionDownloadJob.get(), SIGNAL(succeeded()), SLOT(versionFileFinished())); connect(specificVersionDownloadJob.get(), SIGNAL(failed()), SLOT(versionFileFailed())); @@ -84,7 +84,7 @@ void OneSixUpdate::versionFileStart() void OneSixUpdate::versionFileFinished() { - DownloadPtr DlJob = specificVersionDownloadJob->first(); + NetActionPtr DlJob = specificVersionDownloadJob->first(); OneSixInstance *inst = (OneSixInstance *)m_inst; QString version_id = targetVersion->descriptor(); @@ -154,8 +154,8 @@ void OneSixUpdate::jarlibStart() QString targetstr("versions/"); targetstr += version->id + "/" + version->id + ".jar"; - auto job = new DownloadJob("Libraries for instance " + inst->name()); - job->addFileDownload(QUrl(urlstr), targetstr); + auto job = new NetJob("Libraries for instance " + inst->name()); + job->addNetAction(FileDownload::make(QUrl(urlstr), targetstr)); jarlibDownloadJob.reset(job); auto libs = version->getActiveNativeLibs(); @@ -171,9 +171,9 @@ void OneSixUpdate::jarlibStart() if (entry->stale) { if (lib->hint() == "forge-pack-xz") - jarlibDownloadJob->addForgeXzDownload(download_path, entry); + jarlibDownloadJob->addNetAction(ForgeXzDownload::make(download_path, entry)); else - jarlibDownloadJob->addCacheDownload(download_path, entry); + jarlibDownloadJob->addNetAction(CacheDownload::make(download_path, entry)); } } connect(jarlibDownloadJob.get(), SIGNAL(succeeded()), SLOT(jarlibFinished())); |