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/modlist.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/modlist.h')

diff --git a/src/modlist.h b/src/modlist.h
index 631401c0..8841ec29 100644
--- a/src/modlist.h
+++ b/src/modlist.h
@@ -57,6 +57,7 @@ public:
 
   enum EColumn {
     COL_NAME,
+    COL_CONFLICTFLAGS,
     COL_FLAGS,
     COL_CONTENT,
     COL_CATEGORY,
@@ -289,6 +290,8 @@ private:
 
   QString getFlagText(ModInfo::EFlag flag, ModInfo::Ptr modInfo) const;
 
+  QString getConflictFlagText(ModInfo::EConflictFlag flag, ModInfo::Ptr modInfo) const;
+
   static QString getColumnToolTip(int column);
 
   QVariantList contentsToIcons(const std::vector<ModInfo::EContent> &content) const;
-- 
cgit v1.3.1