From b3331ef2c0b50ab2cea4c328e78f6ab58bca099d Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Fri, 6 Dec 2019 23:12:18 -0600
Subject: Separate conflict flags and render them in separate columns

---
 src/modinfooverwrite.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/modinfooverwrite.cpp')

diff --git a/src/modinfooverwrite.cpp b/src/modinfooverwrite.cpp
index fb110abb..9a6a22c1 100644
--- a/src/modinfooverwrite.cpp
+++ b/src/modinfooverwrite.cpp
@@ -37,6 +37,15 @@ std::vector<ModInfo::EFlag> ModInfoOverwrite::getFlags() const
   return result;
 }
 
+std::vector<ModInfo::EConflictFlag> ModInfoOverwrite::getConflictFlags() const
+{
+  std::vector<ModInfo::EConflictFlag> result;
+  result.push_back(FLAG_OVERWRITE_CONFLICT);
+  for (auto flag : ModInfoWithConflictInfo::getConflictFlags())
+    result.push_back(flag);
+  return result;
+}
+
 int ModInfoOverwrite::getHighlight() const
 {
   int highlight = (isValid() ? HIGHLIGHT_IMPORTANT : HIGHLIGHT_INVALID) | HIGHLIGHT_CENTER;
-- 
cgit v1.3.1