AstralTransRocketries/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-08-03 19:37:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

change to QSet to remove duplicates

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2025-07-20 20:10:00 +03:00
parent 7dd1690947
commit 15a5e99a8a
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
2 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
launcher/minecraft/mod/ModFolderModel.cpp
View File

@ -303,24 +303,6 @@ void ModFolderModel::onParseFinished()
} }
} }
} }
auto removeDuplicates = [](QList<Mod*>& list) {
std::set<QString> seen;
auto it = std::remove_if(list.begin(), list.end(), [&seen](Mod* m) {
auto id = m->mod_id();
if (seen.count(id) > 0) {
return true;
}
seen.insert(id);
return false;
});
list.erase(it, list.end());
};
for (auto key : m_requiredBy.keys()) {
removeDuplicates(m_requiredBy[key]);
}
for (auto key : m_requires.keys()) {
removeDuplicates(m_requires[key]);
}
for (auto mod : mods) { for (auto mod : mods) {
auto id = mod->mod_id(); auto id = mod->mod_id();
mod->setRequiredByCount(m_requiredBy[id].count()); mod->setRequiredByCount(m_requiredBy[id].count());
@ -348,7 +330,7 @@ QModelIndexList ModFolderModel::getAffectedMods(const QModelIndexList& indexes,
bool shouldBeEnabled = action == EnableAction::ENABLE; bool shouldBeEnabled = action == EnableAction::ENABLE;
for (auto mod : indexedMods) { for (auto mod : indexedMods) {
auto id = mod->mod_id(); auto id = mod->mod_id();
QList<Mod*> mods; QSet<Mod*> mods;
switch (action) { switch (action) {
case EnableAction::DISABLE: { case EnableAction::DISABLE: {
mods = m_requiredBy[id]; mods = m_requiredBy[id];
@ -386,7 +368,7 @@ bool ModFolderModel::setResourceEnabled(const QModelIndexList& indexes, EnableAc
return ResourceFolderModel::setResourceEnabled(indexes + affected, action); return ResourceFolderModel::setResourceEnabled(indexes + affected, action);
} }
QStringList reqToList(QList<Mod*> l) QStringList reqToList(QSet<Mod*> l)
{ {
QStringList req; QStringList req;
for (auto m : l) { for (auto m : l) {

5
launcher/minecraft/mod/ModFolderModel.h
View File

@ -40,7 +40,6 @@
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QDir> #include <QDir>
#include <QHash> #include <QHash>
#include <QList>
#include <QMap> #include <QMap>
#include <QSet> #include <QSet>
#include <QString> #include <QString>
@ -104,6 +103,6 @@ class ModFolderModel : public ResourceFolderModel {
void onParseFinished(); void onParseFinished();
private: private:
QHash<QString, QList<Mod*>> m_requiredBy; QHash<QString, QSet<Mod*>> m_requiredBy;
QHash<QString, QList<Mod*>> m_requires; QHash<QString, QSet<Mod*>> m_requires;
}; };