Merge pull request #1338 from Holt59/collapsible-separators

Collapsible separators (and refactoring).

1 files changed, 1 insertions, 9 deletions

diff --git a/src/modinfowithconflictinfo.h b/src/modinfowithconflictinfo.h
index 0d11fcb1..889f1246 100644
--- a/src/modinfowithconflictinfo.h
+++ b/src/modinfowithconflictinfo.h
@@ -91,10 +91,7 @@ protected:
    **/
   virtual std::set<int> doGetContents() const { return {}; }
 
-  ModInfoWithConflictInfo(
-    PluginContainer* pluginContainer,
-    const MOBase::IPluginGame* gamePlugin,
-    MOShared::DirectoryEntry** directoryStructure);
+  ModInfoWithConflictInfo(OrganizerCore& core);
 
 private:
 
@@ -142,17 +139,12 @@ protected:
    */
   virtual void prefetch() override;
 
-  // Current game plugin running in MO2:
-  MOBase::IPluginGame const * const m_GamePlugin;
-
 private:
 
   MOBase::MemoizedLocked<std::shared_ptr<const MOBase::IFileTree>> m_FileTree;
   MOBase::MemoizedLocked<bool> m_Valid;
   MOBase::MemoizedLocked<std::set<int>> m_Contents;
 
-  MOShared::DirectoryEntry **m_DirectoryStructure;
-
   mutable EConflictType m_CurrentConflictState;
   mutable EConflictType m_ArchiveConflictState;
   mutable EConflictType m_ArchiveConflictLooseState;