From 8d6c715672023577dca5a6528ff49081dede1052 Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Wed, 11 Apr 2018 17:46:59 -0500
Subject: Initial archive conflict parsing

Squashed commit:
  Basic archive conflict parsing - pass 1
  Merge fixes for archive parsing
  Basic archive conflict parsing - pass 1
  Merge fixes for archive parsing
  Should fix conflict detection for archive files
---
 src/modinfowithconflictinfo.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/modinfowithconflictinfo.h')

diff --git a/src/modinfowithconflictinfo.h b/src/modinfowithconflictinfo.h
index 6c1591c5..5cf2d24e 100644
--- a/src/modinfowithconflictinfo.h
+++ b/src/modinfowithconflictinfo.h
@@ -23,6 +23,10 @@ public:
 
   virtual std::set<unsigned int> getModOverwritten() { return m_OverwrittenList; }
 
+  virtual std::set<unsigned int> getModArchiveOverwrite() { return m_ArchiveOverwriteList; }
+
+  virtual std::set<unsigned int> getModArchiveOverwritten() { return m_ArchiveOverwrittenList; }
+
   virtual void doConflictCheck() const;
 
 private:
@@ -42,6 +46,11 @@ private:
    */
   EConflictType isConflicted() const;
 
+  /**
+   * @return true if there are archive conflicts for files in this mod
+   */
+  EConflictType isArchiveConflicted() const;
+
   /**
    * @return true if this mod is completely replaced by others
    */
@@ -52,10 +61,13 @@ private:
   MOShared::DirectoryEntry **m_DirectoryStructure;
 
   mutable EConflictType m_CurrentConflictState;
+  mutable EConflictType m_ArchiveConflictState;
   mutable QTime m_LastConflictCheck;
 
   mutable std::set<unsigned int> m_OverwriteList;   // indices of mods overritten by this mod
   mutable std::set<unsigned int> m_OverwrittenList; // indices of mods overwriting this mod
+  mutable std::set<unsigned int> m_ArchiveOverwriteList;   // indices of mods with archive files overritten by this mod
+  mutable std::set<unsigned int> m_ArchiveOverwrittenList; // indices of mods with archive files overwriting this mod
 
 };
 
-- 
cgit v1.3.1