summaryrefslogtreecommitdiff
path: root/src/modinfowithconflictinfo.cpp
diff options
context:
space:
mode:
authorSilarn <jrim@rimpo.org>2019-12-06 23:12:18 -0600
committerSilarn <jrim@rimpo.org>2019-12-06 23:12:18 -0600
commitb3331ef2c0b50ab2cea4c328e78f6ab58bca099d (patch)
treee0be0d00f40733baa4692120d0266ae797ab3785 /src/modinfowithconflictinfo.cpp
parentd42bca5bc0043337f8de72ea72544ebabc505f8b (diff)
Separate conflict flags and render them in separate columns
Diffstat (limited to 'src/modinfowithconflictinfo.cpp')
-rw-r--r--src/modinfowithconflictinfo.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modinfowithconflictinfo.cpp b/src/modinfowithconflictinfo.cpp
index 7a2b0071..f5a243ae 100644
--- a/src/modinfowithconflictinfo.cpp
+++ b/src/modinfowithconflictinfo.cpp
@@ -14,9 +14,9 @@ void ModInfoWithConflictInfo::clearCaches()
m_LastConflictCheck = QTime();
}
-std::vector<ModInfo::EFlag> ModInfoWithConflictInfo::getFlags() const
+std::vector<ModInfo::EConflictFlag> ModInfoWithConflictInfo::getConflictFlags() const
{
- std::vector<ModInfo::EFlag> result;
+ std::vector<ModInfo::EConflictFlag> result;
switch (isConflicted()) {
case CONFLICT_MIXED: {
result.push_back(ModInfo::FLAG_CONFLICT_MIXED);