summaryrefslogtreecommitdiff
path: root/src/modlistsortproxy.cpp
diff options
context:
space:
mode:
authorMikaël Capelle <capelle.mikael@gmail.com>2020-05-25 19:53:21 +0200
committerMikaël Capelle <capelle.mikael@gmail.com>2020-05-25 19:54:15 +0200
commitcf1bbdd13e0db8856df672c367d3ec1610f6c556 (patch)
tree461a6b7623a186502f00b07df689ffebfea620b0 /src/modlistsortproxy.cpp
parenta721347fd130fcab19f2709892093f087bfac19e (diff)
Switch to using the ModDataContent feature from the game plugin.
Diffstat (limited to 'src/modlistsortproxy.cpp')
-rw-r--r--src/modlistsortproxy.cpp19
1 files changed, 2 insertions, 17 deletions
diff --git a/src/modlistsortproxy.cpp b/src/modlistsortproxy.cpp
index 018b9760..99dba913 100644
--- a/src/modlistsortproxy.cpp
+++ b/src/modlistsortproxy.cpp
@@ -177,22 +177,7 @@ bool ModListSortProxy::lessThan(const QModelIndex &left,
}
} break;
case ModList::COL_CONTENT: {
- std::vector<ModInfo::EContent> lContent = leftMod->getContents();
- std::vector<ModInfo::EContent> rContent = rightMod->getContents();
- if (lContent.size() != rContent.size()) {
- lt = lContent.size() < rContent.size();
- }
-
- int lValue = 0;
- int rValue = 0;
- for (ModInfo::EContent content : lContent) {
- lValue += 2 << (unsigned int)content;
- }
- for (ModInfo::EContent content : rContent) {
- rValue += 2 << (unsigned int)content;
- }
-
- lt = lValue < rValue;
+ lt = leftMod->getContents() < rightMod->getContents();
} break;
case ModList::COL_NAME: {
int comp = QString::compare(leftMod->name(), rightMod->name(), Qt::CaseInsensitive);
@@ -449,7 +434,7 @@ bool ModListSortProxy::categoryMatchesMod(
bool ModListSortProxy::contentMatchesMod(ModInfo::Ptr info, bool enabled, int content) const
{
- return info->hasContent(static_cast<ModInfo::EContent>(content));
+ return info->hasContent(content);
}
bool ModListSortProxy::filterMatchesMod(ModInfo::Ptr info, bool enabled) const