diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-08-04 20:31:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-04 20:31:43 +0200 |
| commit | 304e294ea701e595b21c0a8a8236ca53828f2b3b (patch) | |
| tree | 66770810d344120899cf8ba07f279bac784f4877 /launcher/ui/pages/modplatform/flame | |
| parent | 50c7d39e082f0a7dbd977401e16d5adf534d9770 (diff) | |
| parent | f19e8dd086cd046c694a4a9a02d83827b08952b0 (diff) | |
| download | PrismLauncher-304e294ea701e595b21c0a8a8236ca53828f2b3b.tar.gz PrismLauncher-304e294ea701e595b21c0a8a8236ca53828f2b3b.tar.bz2 PrismLauncher-304e294ea701e595b21c0a8a8236ca53828f2b3b.zip | |
Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-class
Diffstat (limited to 'launcher/ui/pages/modplatform/flame')
| -rw-r--r-- | launcher/ui/pages/modplatform/flame/FlameModel.cpp | 6 | ||||
| -rw-r--r-- | launcher/ui/pages/modplatform/flame/FlamePage.cpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/launcher/ui/pages/modplatform/flame/FlameModel.cpp b/launcher/ui/pages/modplatform/flame/FlameModel.cpp index fa55aa68..19ae40f3 100644 --- a/launcher/ui/pages/modplatform/flame/FlameModel.cpp +++ b/launcher/ui/pages/modplatform/flame/FlameModel.cpp @@ -3,6 +3,8 @@ #include "Application.h" #include "ui/widgets/ProjectItem.h" +#include "net/ApiDownload.h" + #include <Version.h> #include <QtMath> @@ -104,7 +106,7 @@ void ListModel::requestLogo(QString logo, QString url) MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("FlamePacks", QString("logos/%1").arg(logo.section(".", 0, 0))); auto job = new NetJob(QString("Flame Icon Download %1").arg(logo), APPLICATION->network()); - job->addNetAction(Net::Download::makeCached(QUrl(url), entry)); + job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry)); auto fullPath = entry->getFullPath(); QObject::connect(job, &NetJob::succeeded, this, [this, logo, fullPath, job] { @@ -171,7 +173,7 @@ void ListModel::performPaginatedSearch() .arg(currentSearchTerm) .arg(currentSort + 1); - netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), response)); + netJob->addNetAction(Net::ApiDownload::makeByteArray(QUrl(searchUrl), response)); jobPtr = netJob; jobPtr->start(); QObject::connect(netJob.get(), &NetJob::succeeded, this, &ListModel::searchRequestFinished); diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.cpp b/launcher/ui/pages/modplatform/flame/FlamePage.cpp index cef26bb6..534819d7 100644 --- a/launcher/ui/pages/modplatform/flame/FlamePage.cpp +++ b/launcher/ui/pages/modplatform/flame/FlamePage.cpp @@ -46,6 +46,8 @@ #include "ui/widgets/ProjectItem.h" #include "modplatform/flame/FlameAPI.h" +#include "net/ApiDownload.h" + static FlameAPI api; FlamePage::FlamePage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), ui(new Ui::FlamePage), dialog(dialog) @@ -132,7 +134,7 @@ void FlamePage::onSelectionChanged(QModelIndex curr, QModelIndex prev) auto netJob = new NetJob(QString("Flame::PackVersions(%1)").arg(current.name), APPLICATION->network()); auto response = std::make_shared<QByteArray>(); int addonId = current.addonId; - netJob->addNetAction(Net::Download::makeByteArray(QString("https://api.curseforge.com/v1/mods/%1/files").arg(addonId), response)); + netJob->addNetAction(Net::ApiDownload::makeByteArray(QString("https://api.curseforge.com/v1/mods/%1/files").arg(addonId), response)); QObject::connect(netJob, &NetJob::succeeded, this, [this, response, addonId, curr] { if (addonId != current.addonId) { |