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/modinfo.h | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'src/modinfo.h')

diff --git a/src/modinfo.h b/src/modinfo.h
index 30a115c7..7c41e0a1 100644
--- a/src/modinfo.h
+++ b/src/modinfo.h
@@ -60,14 +60,7 @@ public:
 
   static QString s_HiddenExt;
 
-  enum EFlag {
-    FLAG_INVALID,
-    FLAG_BACKUP,
-    FLAG_SEPARATOR,
-    FLAG_OVERWRITE,
-    FLAG_FOREIGN,
-    FLAG_NOTENDORSED,
-    FLAG_NOTES,
+  enum EConflictFlag {
     FLAG_CONFLICT_OVERWRITE,
     FLAG_CONFLICT_OVERWRITTEN,
     FLAG_CONFLICT_MIXED,
@@ -77,6 +70,17 @@ public:
     FLAG_ARCHIVE_CONFLICT_OVERWRITE,
     FLAG_ARCHIVE_CONFLICT_OVERWRITTEN,
     FLAG_ARCHIVE_CONFLICT_MIXED,
+    FLAG_OVERWRITE_CONFLICT,
+  };
+
+  enum EFlag {
+    FLAG_INVALID,
+    FLAG_BACKUP,
+    FLAG_SEPARATOR,
+    FLAG_OVERWRITE,
+    FLAG_FOREIGN,
+    FLAG_NOTENDORSED,
+    FLAG_NOTES,
     FLAG_PLUGIN_SELECTED,
     FLAG_ALTERNATE_GAME,
     FLAG_TRACKED,
@@ -519,6 +523,11 @@ public:
    */
   virtual std::vector<EFlag> getFlags() const = 0;
 
+  /**
+   * @return a list of conflict flags for this mod
+   */
+  virtual std::vector<EConflictFlag> getConflictFlags() const = 0;
+
   /**
    * @return a list of content types contained in a mod
    */
-- 
cgit v1.3.1