mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor: replace std::list with std::vector

Browse source 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2026-01-21 12:19:55 +05:00
parent ef747055af
commit 19b9557c19
No known key found for this signature in database
GPG key ID: B77C34313AEE1FFF
14 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
launcher/modplatform/CheckUpdateTask.h
View file

@ -12,7 +12,7 @@ class CheckUpdateTask : public Task {
public:
CheckUpdateTask(QList<Resource*>& resources,
std::list<Version>& mcVersions,
std::vector<Version>& mcVersions,
QList<ModPlatform::ModLoaderType> loadersList,
ResourceFolderModel* resourceModel)
: Task(), m_resources(resources), m_gameVersions(mcVersions), m_loadersList(std::move(loadersList)), m_resourceModel(resourceModel)
@ -65,7 +65,7 @@ class CheckUpdateTask : public Task {
protected:
QList<Resource*>& m_resources;
std::list<Version>& m_gameVersions;
std::vector<Version>& m_gameVersions;
QList<ModPlatform::ModLoaderType> m_loadersList;
ResourceFolderModel* m_resourceModel;

2
launcher/modplatform/ResourceAPI.cpp
View file

@ -262,7 +262,7 @@ Task::Ptr ResourceAPI::getDependencyVersion(DependencySearchArgs&& args, Callbac
return netJob;
}
QString ResourceAPI::getGameVersionsString(std::list<Version> mcVersions) const
QString ResourceAPI::getGameVersionsString(std::vector<Version> mcVersions) const
{
QString s;
for (auto& ver : mcVersions) {

6
launcher/modplatform/ResourceAPI.h
View file

@ -81,7 +81,7 @@ class ResourceAPI {
std::optional<QString> search;
std::optional<SortingMethod> sorting;
std::optional<ModPlatform::ModLoaderTypes> loaders;
std::optional<std::list<Version>> versions;
std::optional<std::vector<Version>> versions;
std::optional<ModPlatform::Side> side;
std::optional<QStringList> categoryIds;
bool openSource;
@ -90,7 +90,7 @@ class ResourceAPI {
struct VersionSearchArgs {
ModPlatform::IndexedPack::Ptr pack;
std::optional<std::list<Version>> mcVersions;
std::optional<std::vector<Version>> mcVersions;
std::optional<ModPlatform::ModLoaderTypes> loaders;
ModPlatform::ResourceType resourceType;
};
@ -124,7 +124,7 @@ class ResourceAPI {
QString mapMCVersionToModrinth(Version v) const;
QString getGameVersionsString(std::list<Version> mcVersions) const;
QString getGameVersionsString(std::vector<Version> mcVersions) const;
public:
virtual auto getSearchURL(SearchArgs const& args) const -> std::optional<QString> = 0;

2
launcher/modplatform/flame/FlameCheckUpdate.h
View file

@ -7,7 +7,7 @@ class FlameCheckUpdate : public CheckUpdateTask {
public:
FlameCheckUpdate(QList<Resource*>& resources,
std::list<Version>& mcVersions,
std::vector<Version>& mcVersions,
QList<ModPlatform::ModLoaderType> loadersList,
ResourceFolderModel* resourceModel)
: CheckUpdateTask(resources, mcVersions, std::move(loadersList), resourceModel)

4
launcher/modplatform/modrinth/ModrinthAPI.cpp
View file

@ -40,7 +40,7 @@ Task::Ptr ModrinthAPI::currentVersions(const QStringList& hashes, QString hash_f
Task::Ptr ModrinthAPI::latestVersion(QString hash,
QString hash_format,
std::optional<std::list<Version>> mcVersions,
std::optional<std::vector<Version>> mcVersions,
std::optional<ModPlatform::ModLoaderTypes> loaders,
QByteArray* response)
{
@ -70,7 +70,7 @@ Task::Ptr ModrinthAPI::latestVersion(QString hash,
Task::Ptr ModrinthAPI::latestVersions(const QStringList& hashes,
QString hash_format,
std::optional<std::list<Version>> mcVersions,
std::optional<std::vector<Version>> mcVersions,
std::optional<ModPlatform::ModLoaderTypes> loaders,
QByteArray* response)
{

6
launcher/modplatform/modrinth/ModrinthAPI.h
View file

@ -20,13 +20,13 @@ class ModrinthAPI : public ResourceAPI {
Task::Ptr latestVersion(QString hash,
QString hash_format,
std::optional<std::list<Version>> mcVersions,
std::optional<std::vector<Version>> mcVersions,
std::optional<ModPlatform::ModLoaderTypes> loaders,
QByteArray* response);
Task::Ptr latestVersions(const QStringList& hashes,
QString hash_format,
std::optional<std::list<Version>> mcVersions,
std::optional<std::vector<Version>> mcVersions,
std::optional<ModPlatform::ModLoaderTypes> loaders,
QByteArray* response);
@ -192,7 +192,7 @@ class ModrinthAPI : public ResourceAPI {
.arg(BuildConfig.MODRINTH_PROD_URL, args.pack->addonId.toString(), get_arguments.isEmpty() ? "" : "?", get_arguments.join('&'));
};
QString getGameVersionsArray(std::list<Version> mcVersions) const
QString getGameVersionsArray(std::vector<Version> mcVersions) const
{
QString s;
for (auto& ver : mcVersions) {

2
launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
View file

@ -16,7 +16,7 @@
static ModrinthAPI api;
ModrinthCheckUpdate::ModrinthCheckUpdate(QList<Resource*>& resources,
std::list<Version>& mcVersions,
std::vector<Version>& mcVersions,
QList<ModPlatform::ModLoaderType> loadersList,
ResourceFolderModel* resourceModel)
: CheckUpdateTask(resources, mcVersions, std::move(loadersList), resourceModel)

2
launcher/modplatform/modrinth/ModrinthCheckUpdate.h
View file

@ -7,7 +7,7 @@ class ModrinthCheckUpdate : public CheckUpdateTask {
public:
ModrinthCheckUpdate(QList<Resource*>& resources,
std::list<Version>& mcVersions,
std::vector<Version>& mcVersions,
QList<ModPlatform::ModLoaderType> loadersList,
ResourceFolderModel* resourceModel);

2
launcher/ui/dialogs/ResourceUpdateDialog.cpp
View file

@ -29,7 +29,7 @@
#include <optional>
static std::list<Version> mcVersions(BaseInstance* inst)
static std::vector<Version> mcVersions(BaseInstance* inst)
{
return { static_cast<MinecraftInstance*>(inst)->getPackProfile()->getComponent("net.minecraft")->getVersion() };
}

4
launcher/ui/pages/modplatform/ModModel.cpp
View file

@ -27,7 +27,7 @@ ResourceAPI::SearchArgs ModModel::createSearchArguments()
Q_ASSERT(profile);
Q_ASSERT(m_filter);
std::optional<std::list<Version>> versions{};
std::optional<std::vector<Version>> versions{};
std::optional<QStringList> categories{};
auto loaders = profile->getSupportedModLoaders();
@ -55,7 +55,7 @@ ResourceAPI::VersionSearchArgs ModModel::createVersionsArguments(const QModelInd
Q_ASSERT(profile);
Q_ASSERT(m_filter);
std::optional<std::list<Version>> versions{};
std::optional<std::vector<Version>> versions{};
auto loaders = profile->getSupportedModLoaders();
if (!m_filter->versions.empty())
versions = m_filter->versions;

2
launcher/ui/pages/modplatform/TexturePackModel.cpp
View file

@ -9,7 +9,7 @@
#include "meta/Index.h"
#include "meta/Version.h"
static std::list<Version> s_availableVersions = {};
static std::vector<Version> s_availableVersions = {};
namespace ResourceDownload {
TexturePackResourceModel::TexturePackResourceModel(BaseInstance const& inst, ResourceAPI* api, QString debugName, QString metaEntryBase)

2
launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
View file

@ -98,7 +98,7 @@ class ModpackListModel : public QAbstractListModel {
protected:
void requestLogo(QString file, QString url);
inline auto getMineVersions() const -> std::list<Version>;
inline auto getMineVersions() const -> std::vector<Version>;
protected:
ModrinthPage* m_parent;

6
launcher/ui/widgets/ModFilterWidget.cpp
View file

@ -243,7 +243,7 @@ void ModFilterWidget::prepareBasicFilter()
ui->liteLoader->setChecked(loaders & ModPlatform::LiteLoader);
m_filter->loaders = loaders;
auto def = m_instance->getPackProfile()->getComponentVersion("net.minecraft");
m_filter->versions.emplace_front(def);
m_filter->versions.emplace_back(def);
ui->versions->setCheckedItems({ def });
ui->version->setCurrentIndex(ui->version->findText(def));
} else {
@ -263,7 +263,7 @@ void ModFilterWidget::onVersionFilterChanged(int)
{
auto versions = ui->versions->checkedItems();
versions.sort();
std::list<Version> current_list;
std::vector<Version> current_list;
for (const QString& version : versions)
current_list.emplace_back(version);
@ -385,7 +385,7 @@ void ModFilterWidget::onOpenSourceFilterChanged()
void ModFilterWidget::onReleaseFilterChanged()
{
std::list<ModPlatform::IndexedVersionType> releases;
std::vector<ModPlatform::IndexedVersionType> releases;
if (ui->releaseCb->isChecked())
releases.push_back(ModPlatform::IndexedVersionType::Release);
if (ui->betaCb->isChecked())

4
launcher/ui/widgets/ModFilterWidget.h
View file

@ -58,8 +58,8 @@ class ModFilterWidget : public QTabWidget {
Q_OBJECT
public:
struct Filter {
std::list<Version> versions;
std::list<ModPlatform::IndexedVersionType> releases;
std::vector<Version> versions;
std::vector<ModPlatform::IndexedVersionType> releases;
ModPlatform::ModLoaderTypes loaders;
ModPlatform::Side side;
bool hideInstalled;