From f9f70b224e25c2d5bff017fd08d32521d39d5b08 Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Thu, 2 Aug 2018 11:54:48 -0500
Subject: Add loose file/archive conflict icons

---
 src/modinfo.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/modinfo.h')

diff --git a/src/modinfo.h b/src/modinfo.h
index c763e69b..99ce35b5 100644
--- a/src/modinfo.h
+++ b/src/modinfo.h
@@ -69,10 +69,12 @@ public:
     FLAG_NOTENDORSED,
     FLAG_NOTES,
     FLAG_CONFLICT_OVERWRITE,
-	FLAG_CONFLICT_LOOSE_OVERWRITE_ARCHIVE,
     FLAG_CONFLICT_OVERWRITTEN,
     FLAG_CONFLICT_MIXED,
     FLAG_CONFLICT_REDUNDANT,
+    FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE,
+    FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN,
+    FLAG_ARCHIVE_LOOSE_CONFLICT_MIXED,
     FLAG_ARCHIVE_CONFLICT_OVERWRITE,
     FLAG_ARCHIVE_CONFLICT_OVERWRITTEN,
     FLAG_ARCHIVE_CONFLICT_MIXED,
@@ -648,6 +650,16 @@ public:
   */
   virtual std::set<unsigned int> getModArchiveOverwritten() { return std::set<unsigned int>(); }
 
+  /**
+  * @return retrieve list of mods (as mod index) with archives that are overwritten by thos mod's loose files. Updates may be delayed
+  */
+  virtual std::set<unsigned int> getModArchiveLooseOverwrite() { return std::set<unsigned int>(); }
+
+  /**
+  * @return list of mods (as mod index) with loose files that overwrite this one's archive files. Updates may be delayed
+  */
+  virtual std::set<unsigned int> getModArchiveLooseOverwritten() { return std::set<unsigned int>(); }
+
   /**
    * @brief update conflict information
    */
-- 
cgit v1.3.1