Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-13 05:37:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

removed some unused QNetworkAccessManager references

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2024-11-01 18:13:47 +02:00
parent f9ab75868a
commit 3da94eeea2
9 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
launcher/minecraft/auth/AuthFlow.cpp
View File

@ -1,5 +1,4 @@
#include <QDebug> #include <QDebug>
#include <QNetworkAccessManager>
#include <QNetworkReply> #include <QNetworkReply>
#include <QNetworkRequest> #include <QNetworkRequest>

3
launcher/minecraft/auth/AuthSession.h
View File

@ -1,12 +1,9 @@
#pragma once #pragma once
#include <QMultiMap>
#include <QString> #include <QString>
#include <memory> #include <memory>
#include "QObjectPtr.h"
class MinecraftAccount; class MinecraftAccount;
class QNetworkAccessManager;
struct AuthSession { struct AuthSession {
bool MakeOffline(QString offline_playername); bool MakeOffline(QString offline_playername);

5
launcher/modplatform/flame/FileResolvingTask.cpp
View File

@ -20,7 +20,6 @@
#include <algorithm> #include <algorithm>
#include "Json.h" #include "Json.h"
#include "QObjectPtr.h"
#include "modplatform/ModIndex.h" #include "modplatform/ModIndex.h"
#include "modplatform/flame/FlameAPI.h" #include "modplatform/flame/FlameAPI.h"
#include "modplatform/flame/FlameModIndex.h" #include "modplatform/flame/FlameModIndex.h"
@ -33,9 +32,7 @@
static const FlameAPI flameAPI; static const FlameAPI flameAPI;
static ModrinthAPI modrinthAPI; static ModrinthAPI modrinthAPI;
Flame::FileResolvingTask::FileResolvingTask(const shared_qobject_ptr<QNetworkAccessManager>& network, Flame::Manifest& toProcess) Flame::FileResolvingTask::FileResolvingTask(Flame::Manifest& toProcess) : m_manifest(toProcess) {}
: m_network(network), m_manifest(toProcess)
{}
bool Flame::FileResolvingTask::abort() bool Flame::FileResolvingTask::abort()
{ {

5
launcher/modplatform/flame/FileResolvingTask.h
View File

@ -17,8 +17,6 @@
*/ */
#pragma once #pragma once
#include <QNetworkAccessManager>
#include "PackManifest.h" #include "PackManifest.h"
#include "tasks/Task.h" #include "tasks/Task.h"
@ -26,7 +24,7 @@ namespace Flame {
class FileResolvingTask : public Task { class FileResolvingTask : public Task {
Q_OBJECT Q_OBJECT
public: public:
explicit FileResolvingTask(const shared_qobject_ptr<QNetworkAccessManager>& network, Flame::Manifest& toProcess); explicit FileResolvingTask(Flame::Manifest& toProcess);
virtual ~FileResolvingTask() = default; virtual ~FileResolvingTask() = default;
bool canAbort() const override { return true; } bool canAbort() const override { return true; }
@ -44,7 +42,6 @@ class FileResolvingTask : public Task {
void getFlameProjects(); void getFlameProjects();
private: /* data */ private: /* data */
shared_qobject_ptr<QNetworkAccessManager> m_network;
Flame::Manifest m_manifest; Flame::Manifest m_manifest;
std::shared_ptr<QByteArray> m_result; std::shared_ptr<QByteArray> m_result;
Task::Ptr m_task; Task::Ptr m_task;

2
launcher/modplatform/flame/FlameInstanceCreationTask.cpp
View File

@ -437,7 +437,7 @@ bool FlameCreationTask::createInstance()
instance.setName(name()); instance.setName(name());
m_modIdResolver.reset(new Flame::FileResolvingTask(APPLICATION->network(), m_pack)); m_modIdResolver.reset(new Flame::FileResolvingTask(m_pack));
connect(m_modIdResolver.get(), &Flame::FileResolvingTask::succeeded, this, [this, &loop] { idResolverSucceeded(loop); }); connect(m_modIdResolver.get(), &Flame::FileResolvingTask::succeeded, this, [this, &loop] { idResolverSucceeded(loop); });
connect(m_modIdResolver.get(), &Flame::FileResolvingTask::failed, [this, &loop](QString reason) { connect(m_modIdResolver.get(), &Flame::FileResolvingTask::failed, [this, &loop](QString reason) {
m_modIdResolver.reset(); m_modIdResolver.reset();

5
launcher/modplatform/flame/FlameModIndex.cpp
View File

@ -76,10 +76,7 @@ static QString enumToString(int hash_algorithm)
} }
} }
void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack, void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack, QJsonArray& arr, const BaseInstance* inst)
QJsonArray& arr,
[[maybe_unused]] const shared_qobject_ptr<QNetworkAccessManager>& network,
const BaseInstance* inst)
{ {
QVector<ModPlatform::IndexedVersion> unsortedVersions; QVector<ModPlatform::IndexedVersion> unsortedVersions;
for (auto versionIter : arr) { for (auto versionIter : arr) {

6
launcher/modplatform/flame/FlameModIndex.h
View File

@ -6,7 +6,6 @@
#include "modplatform/ModIndex.h" #include "modplatform/ModIndex.h"
#include <QNetworkAccessManager>
#include "BaseInstance.h" #include "BaseInstance.h"
namespace FlameMod { namespace FlameMod {
@ -14,10 +13,7 @@ namespace FlameMod {
void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj); void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj);
void loadURLs(ModPlatform::IndexedPack& m, QJsonObject& obj); void loadURLs(ModPlatform::IndexedPack& m, QJsonObject& obj);
void loadBody(ModPlatform::IndexedPack& m, QJsonObject& obj); void loadBody(ModPlatform::IndexedPack& m, QJsonObject& obj);
void loadIndexedPackVersions(ModPlatform::IndexedPack& pack, void loadIndexedPackVersions(ModPlatform::IndexedPack& pack, QJsonArray& arr, const BaseInstance* inst);
QJsonArray& arr,
const shared_qobject_ptr<QNetworkAccessManager>& network,
const BaseInstance* inst);
auto loadIndexedPackVersion(QJsonObject& obj, bool load_changelog = false) -> ModPlatform::IndexedVersion; auto loadIndexedPackVersion(QJsonObject& obj, bool load_changelog = false) -> ModPlatform::IndexedVersion;
auto loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr, const BaseInstance* inst) -> ModPlatform::IndexedVersion; auto loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr, const BaseInstance* inst) -> ModPlatform::IndexedVersion;
} // namespace FlameMod } // namespace FlameMod

1
launcher/modplatform/modrinth/ModrinthPackIndex.h
View File

@ -19,7 +19,6 @@
#include "modplatform/ModIndex.h" #include "modplatform/ModIndex.h"
#include <QNetworkAccessManager>
#include "BaseInstance.h" #include "BaseInstance.h"
namespace Modrinth { namespace Modrinth {

8
launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp
View File

@ -32,7 +32,7 @@ void FlameModModel::loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject&
void FlameModModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) void FlameModModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr)
{ {
FlameMod::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance); FlameMod::loadIndexedPackVersions(m, arr, &m_base_instance);
} }
auto FlameModModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion auto FlameModModel::loadDependencyVersions(const ModPlatform::Dependency& m, QJsonArray& arr) -> ModPlatform::IndexedVersion
@ -65,7 +65,7 @@ void FlameResourcePackModel::loadExtraPackInfo(ModPlatform::IndexedPack& m, QJso
void FlameResourcePackModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) void FlameResourcePackModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr)
{ {
FlameMod::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance); FlameMod::loadIndexedPackVersions(m, arr, &m_base_instance);
} }
bool FlameResourcePackModel::optedOut(const ModPlatform::IndexedVersion& ver) const bool FlameResourcePackModel::optedOut(const ModPlatform::IndexedVersion& ver) const
@ -93,7 +93,7 @@ void FlameTexturePackModel::loadExtraPackInfo(ModPlatform::IndexedPack& m, QJson
void FlameTexturePackModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) void FlameTexturePackModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr)
{ {
FlameMod::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance); FlameMod::loadIndexedPackVersions(m, arr, &m_base_instance);
QVector<ModPlatform::IndexedVersion> filtered_versions(m.versions.size()); QVector<ModPlatform::IndexedVersion> filtered_versions(m.versions.size());
@ -157,7 +157,7 @@ void FlameShaderPackModel::loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonO
void FlameShaderPackModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) void FlameShaderPackModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr)
{ {
FlameMod::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance); FlameMod::loadIndexedPackVersions(m, arr, &m_base_instance);
} }
bool FlameShaderPackModel::optedOut(const ModPlatform::IndexedVersion& ver) const bool FlameShaderPackModel::optedOut(const ModPlatform::IndexedVersion& ver) const