aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2023-08-06 21:54:00 +0200
committerSefa Eyeoglu <contact@scrumplex.net>2023-08-06 21:54:00 +0200
commit74fe2fb2a6282a9292cc912b865ce0179dbc3412 (patch)
treed006abece962a65d3538b9b0d8f4e3d264d59eca /launcher/modplatform/legacy_ftb/PackFetchTask.cpp
parenta83e5be8f2acd66f83ad181e54fe688ed08c1b6f (diff)
parentefaf4024ab22a53a3ef05f0a41b746b7561e087c (diff)
downloadPrismLauncher-74fe2fb2a6282a9292cc912b865ce0179dbc3412.tar.gz
PrismLauncher-74fe2fb2a6282a9292cc912b865ce0179dbc3412.tar.bz2
PrismLauncher-74fe2fb2a6282a9292cc912b865ce0179dbc3412.zip
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
Diffstat (limited to 'launcher/modplatform/legacy_ftb/PackFetchTask.cpp')
-rw-r--r--launcher/modplatform/legacy_ftb/PackFetchTask.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/launcher/modplatform/legacy_ftb/PackFetchTask.cpp b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
index a8a0fc2c..e5ad8244 100644
--- a/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
@@ -40,6 +40,8 @@
#include "BuildConfig.h"
#include "Application.h"
+#include "net/ApiDownload.h"
+
namespace LegacyFTB {
void PackFetchTask::fetch()
@@ -51,7 +53,7 @@ void PackFetchTask::fetch()
QUrl publicPacksUrl = QUrl(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/modpacks.xml");
qDebug() << "Downloading public version info from" << publicPacksUrl.toString();
- jobPtr->addNetAction(Net::Download::makeByteArray(publicPacksUrl, publicModpacksXmlFileData));
+ jobPtr->addNetAction(Net::ApiDownload::makeByteArray(publicPacksUrl, publicModpacksXmlFileData));
QUrl thirdPartyUrl = QUrl(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/thirdparty.xml");
qDebug() << "Downloading thirdparty version info from" << thirdPartyUrl.toString();
@@ -71,7 +73,7 @@ void PackFetchTask::fetchPrivate(const QStringList& toFetch)
for (auto& packCode : toFetch) {
auto data = std::make_shared<QByteArray>();
NetJob* job = new NetJob("Fetching private pack", m_network);
- job->addNetAction(Net::Download::makeByteArray(privatePackBaseUrl.arg(packCode), data));
+ job->addNetAction(Net::ApiDownload::makeByteArray(privatePackBaseUrl.arg(packCode), data));
QObject::connect(job, &NetJob::succeeded, this, [this, job, data, packCode] {
ModpackList packs;