From c93cf33c8324052b321fc0428c394016abcee115 Mon Sep 17 00:00:00 2001 From: Mikaël Capelle Date: Wed, 13 Jan 2021 13:00:54 +0100 Subject: Remove OrganizerCore::modsSortedByProfilePriority. --- src/modlist.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/modlist.cpp') diff --git a/src/modlist.cpp b/src/modlist.cpp index f820e4d1..d4ffbeff 100644 --- a/src/modlist.cpp +++ b/src/modlist.cpp @@ -900,7 +900,19 @@ QStringList ModList::allModsByProfilePriority(MOBase::IProfile* profile) const { Profile* mo2Profile = profile == nullptr ? m_Organizer->currentProfile() : static_cast(profile); - return m_Organizer->modsSortedByProfilePriority(mo2Profile); + + QStringList res; + for (int i = mo2Profile->getPriorityMinimum(); + i < mo2Profile->getPriorityMinimum() + (int)mo2Profile->numRegularMods(); + ++i) { + int modIndex = mo2Profile->modIndexByPriority(i); + auto modInfo = ModInfo::getByIndex(modIndex); + if (!modInfo->hasFlag(ModInfo::FLAG_OVERWRITE) && + !modInfo->hasFlag(ModInfo::FLAG_BACKUP)) { + res.push_back(ModInfo::getByIndex(modIndex)->internalName()); + } + } + return res; } MOBase::IModInterface* ModList::getMod(const QString& name) const -- cgit v1.3.1 From 853db4a60a0a701b92d3eb7be7c3a0d8d8f6f2b1 Mon Sep 17 00:00:00 2001 From: Mikaël Capelle Date: Wed, 13 Jan 2021 13:27:36 +0100 Subject: Use isBackup() and isOverwrite() instead of testing flags. --- src/modlist.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/modlist.cpp') diff --git a/src/modlist.cpp b/src/modlist.cpp index d4ffbeff..1c097db4 100644 --- a/src/modlist.cpp +++ b/src/modlist.cpp @@ -907,9 +907,8 @@ QStringList ModList::allModsByProfilePriority(MOBase::IProfile* profile) const ++i) { int modIndex = mo2Profile->modIndexByPriority(i); auto modInfo = ModInfo::getByIndex(modIndex); - if (!modInfo->hasFlag(ModInfo::FLAG_OVERWRITE) && - !modInfo->hasFlag(ModInfo::FLAG_BACKUP)) { - res.push_back(ModInfo::getByIndex(modIndex)->internalName()); + if (!modInfo->isBackup() && !modInfo->isOverwrite()) { + res.push_back(modInfo->internalName()); } } return res; -- cgit v1.3.1