fede/prismlauncher-crack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace qvector with qlist

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2025-03-26 08:29:40 +02:00
parent 3df98dd5e7
commit 49f0e8ef6b
45 changed files with 102 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
launcher/modplatform/ModIndex.h
View File

@@ -23,7 +23,6 @@
#include <QMetaType>
#include <QString>
#include <QVariant>
#include <QVector>
#include <memory>
class QIODevice;
@@ -141,7 +140,7 @@ struct IndexedPack {
QString side;
bool versionsLoaded = false;
QVector<IndexedVersion> versions;
QList<IndexedVersion> versions;
// Don't load by default, since some modplatform don't have that info
bool extraDataLoaded = true;

4
launcher/modplatform/atlauncher/ATLPackIndex.h
View File

@@ -18,9 +18,9 @@
#include "ATLPackManifest.h"
#include <QList>
#include <QMetaType>
#include <QString>
#include <QVector>
namespace ATLauncher {
@@ -34,7 +34,7 @@ struct IndexedPack {
int position;
QString name;
PackType type;
QVector<IndexedVersion> versions;
QList<IndexedVersion> versions;
bool system;
QString description;

4
launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
View File

@@ -689,7 +689,7 @@ void PackInstallTask::downloadMods()
{
qDebug() << "PackInstallTask::installMods: " << QThread::currentThreadId();
QVector<ATLauncher::VersionMod> optionalMods;
QList<ATLauncher::VersionMod> optionalMods;
for (const auto& mod : m_version.mods) {
if (mod.optional) {
optionalMods.push_back(mod);
@@ -697,7 +697,7 @@ void PackInstallTask::downloadMods()
}
// Select optional mods, if pack contains any
QVector<QString> selectedMods;
QList<QString> selectedMods;
if (!optionalMods.isEmpty()) {
setStatus(tr("Selecting optional mods..."));
auto mods = m_support->chooseOptionalMods(m_version, optionalMods);

2
launcher/modplatform/atlauncher/ATLPackInstallTask.h
View File

@@ -62,7 +62,7 @@ class UserInteractionSupport {
/**
* Requests a user interaction to select which optional mods should be installed.
*/
virtual std::optional<QVector<QString>> chooseOptionalMods(const PackVersion& version, QVector<ATLauncher::VersionMod> mods) = 0;
virtual std::optional<QList<QString>> chooseOptionalMods(const PackVersion& version, QList<ATLauncher::VersionMod> mods) = 0;
/**
* Requests a user interaction to select a component version from a given version list

16
launcher/modplatform/atlauncher/ATLPackManifest.h
View File

@@ -36,9 +36,9 @@
#pragma once
#include <QJsonObject>
#include <QList>
#include <QMap>
#include <QString>
#include <QVector>
namespace ATLauncher {
@@ -113,7 +113,7 @@ struct VersionMod {
bool hidden;
bool library;
QString group;
QVector<QString> depends;
QStringList depends;
QString colour;
QString warning;
@@ -139,8 +139,8 @@ struct VersionKeep {
};
struct VersionKeeps {
QVector<VersionKeep> files;
QVector<VersionKeep> folders;
QList<VersionKeep> files;
QList<VersionKeep> folders;
};
struct VersionDelete {
@@ -149,8 +149,8 @@ struct VersionDelete {
};
struct VersionDeletes {
QVector<VersionDelete> files;
QVector<VersionDelete> folders;
QList<VersionDelete> files;
QList<VersionDelete> folders;
};
struct PackVersionMainClass {
@@ -171,8 +171,8 @@ struct PackVersion {
PackVersionExtraArguments extraArguments;
VersionLoader loader;
QVector<VersionLibrary> libraries;
QVector<VersionMod> mods;
QList<VersionLibrary> libraries;
QList<VersionMod> mods;
VersionConfigs configs;
QMap<QString, QString> colours;

4
launcher/modplatform/atlauncher/ATLShareCode.h
View File

@@ -19,8 +19,8 @@
#pragma once
#include <QJsonObject>
#include <QList>
#include <QString>
#include <QVector>
namespace ATLauncher {
@@ -32,7 +32,7 @@ struct ShareCodeMod {
struct ShareCode {
QString pack;
QString version;
QVector<ShareCodeMod> mods;
QList<ShareCodeMod> mods;
};
struct ShareCodeResponse {

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

@@ -215,7 +215,7 @@ QList<ModPlatform::Category> FlameAPI::loadModCategories(std::shared_ptr<QByteAr
return categories;
};
std::optional<ModPlatform::IndexedVersion> FlameAPI::getLatestVersion(QVector<ModPlatform::IndexedVersion> versions,
std::optional<ModPlatform::IndexedVersion> FlameAPI::getLatestVersion(QList<ModPlatform::IndexedVersion> versions,
QList<ModPlatform::ModLoaderType> instanceLoaders,
ModPlatform::ModLoaderTypes modLoaders)
{

2
launcher/modplatform/flame/FlameAPI.h
View File

@@ -15,7 +15,7 @@ class FlameAPI : public NetworkResourceAPI {
QString getModFileChangelog(int modId, int fileId);
QString getModDescription(int modId);
std::optional<ModPlatform::IndexedVersion> getLatestVersion(QVector<ModPlatform::IndexedVersion> versions,
std::optional<ModPlatform::IndexedVersion> getLatestVersion(QList<ModPlatform::IndexedVersion> versions,
QList<ModPlatform::ModLoaderType> instanceLoaders,
ModPlatform::ModLoaderTypes fallback);

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

@@ -78,7 +78,7 @@ static QString enumToString(int hash_algorithm)
void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack, QJsonArray& arr)
{
QVector<ModPlatform::IndexedVersion> unsortedVersions;
QList<ModPlatform::IndexedVersion> unsortedVersions;
for (auto versionIter : arr) {
auto obj = versionIter.toObject();
@@ -208,7 +208,7 @@ ModPlatform::IndexedVersion FlameMod::loadDependencyVersions(const ModPlatform::
auto profile = (dynamic_cast<const MinecraftInstance*>(inst))->getPackProfile();
QString mcVersion = profile->getComponentVersion("net.minecraft");
auto loaders = profile->getSupportedModLoaders();
QVector<ModPlatform::IndexedVersion> versions;
QList<ModPlatform::IndexedVersion> versions;
for (auto versionIter : arr) {
auto obj = versionIter.toObject();

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

@@ -77,7 +77,7 @@ void Flame::loadIndexedInfo(IndexedPack& pack, QJsonObject& obj)
void Flame::loadIndexedPackVersions(Flame::IndexedPack& pack, QJsonArray& arr)
{
QVector<Flame::IndexedVersion> unsortedVersions;
QList<Flame::IndexedVersion> unsortedVersions;
for (auto versionIter : arr) {
auto version = Json::requireObject(versionIter);
Flame::IndexedVersion file;

3
launcher/modplatform/flame/FlamePackIndex.h
View File

@@ -3,7 +3,6 @@
#include <QList>
#include <QMetaType>
#include <QString>
#include <QVector>
#include "modplatform/ModIndex.h"
namespace Flame {
@@ -39,7 +38,7 @@ struct IndexedPack {
QString logoUrl;
bool versionsLoaded = false;
QVector<IndexedVersion> versions;
QList<IndexedVersion> versions;
bool extraInfoLoaded = false;
ModpackExtra extra;

4
launcher/modplatform/flame/PackManifest.h
View File

@@ -36,10 +36,10 @@
#pragma once
#include <QJsonObject>
#include <QList>
#include <QMap>
#include <QString>
#include <QUrl>
#include <QVector>
#include "minecraft/mod/tasks/LocalResourceParse.h"
#include "modplatform/ModIndex.h"
@@ -66,7 +66,7 @@ struct Modloader {
struct Minecraft {
QString version;
QString libraries;
QVector<Flame::Modloader> modLoaders;
QList<Flame::Modloader> modLoaders;
};
struct Manifest {

4
launcher/modplatform/modrinth/ModrinthPackIndex.cpp
View File

@@ -114,7 +114,7 @@ void Modrinth::loadExtraPackData(ModPlatform::IndexedPack& pack, QJsonObject& ob
void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack, QJsonArray& arr)
{
QVector<ModPlatform::IndexedVersion> unsortedVersions;
QList<ModPlatform::IndexedVersion> unsortedVersions;
for (auto versionIter : arr) {
auto obj = versionIter.toObject();
auto file = loadIndexedPackVersion(obj);
@@ -253,7 +253,7 @@ ModPlatform::IndexedVersion Modrinth::loadDependencyVersions([[maybe_unused]] co
QString mcVersion = profile->getComponentVersion("net.minecraft");
auto loaders = profile->getSupportedModLoaders();
QVector<ModPlatform::IndexedVersion> versions;
QList<ModPlatform::IndexedVersion> versions;
for (auto versionIter : arr) {
auto obj = versionIter.toObject();
auto file = loadIndexedPackVersion(obj);

2
launcher/modplatform/modrinth/ModrinthPackManifest.cpp
View File

@@ -99,7 +99,7 @@ void loadIndexedInfo(Modpack& pack, QJsonObject& obj)
void loadIndexedVersions(Modpack& pack, QJsonDocument& doc)
{
QVector<ModpackVersion> unsortedVersions;
QList<ModpackVersion> unsortedVersions;
auto arr = Json::requireArray(doc);

4
launcher/modplatform/modrinth/ModrinthPackManifest.h
View File

@@ -40,10 +40,10 @@
#include <QByteArray>
#include <QCryptographicHash>
#include <QList>
#include <QQueue>
#include <QString>
#include <QUrl>
#include <QVector>
#include "modplatform/ModIndex.h"
@@ -110,7 +110,7 @@ struct Modpack {
bool extraInfoLoaded = false;
ModpackExtra extra;
QVector<ModpackVersion> versions;
QList<ModpackVersion> versions;
};
void loadIndexedPack(Modpack&, QJsonObject&);

6
launcher/modplatform/technic/SolderPackManifest.h
View File

@@ -19,15 +19,15 @@
#pragma once
#include <QJsonObject>
#include <QList>
#include <QString>
#include <QVector>
namespace TechnicSolder {
struct Pack {
QString recommended;
QString latest;
QVector<QString> builds;
QList<QString> builds;
};
void loadPack(Pack& v, QJsonObject& obj);
@@ -41,7 +41,7 @@ struct PackBuildMod {
struct PackBuild {
QString minecraft;
QVector<PackBuildMod> mods;
QList<PackBuildMod> mods;
};
void loadPackBuild(PackBuild& v, QJsonObject& obj);