split directoryentry

made classes noncopyable, fixed a few unintended copies

1 files changed, 7 insertions, 7 deletions

diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h
index c4845019..945f464d 100644
--- a/src/modinfodialogconflicts.h
+++ b/src/modinfodialogconflicts.h
@@ -4,7 +4,7 @@
 #include "modinfodialogtab.h"
 #include "expanderwidget.h"
 #include "filterwidget.h"
-#include "directoryentry.h"
+#include "shared/fileregisterfwd.h"
 #include <QTreeWidget>
 #include <optional>
 
@@ -52,16 +52,16 @@ private:
   FilterWidget m_filterNoConflicts;
 
   ConflictItem createOverwriteItem(
-    MOShared::FileEntry::Index index, bool archive,
+    MOShared::FileIndex index, bool archive,
     QString fileName, QString relativeName,
-    const MOShared::FileEntry::AlternativesVector& alternatives);
+    const MOShared::AlternativesVector& alternatives);
 
   ConflictItem createNoConflictItem(
-    MOShared::FileEntry::Index index, bool archive,
+    MOShared::FileIndex index, bool archive,
     QString fileName, QString relativeName);
 
   ConflictItem createOverwrittenItem(
-    MOShared::FileEntry::Index index, int fileOrigin, bool archive,
+    MOShared::FileIndex index, int fileOrigin, bool archive,
     QString fileName, QString relativeName);
 
   void onOverwriteActivated(const QModelIndex& index);
@@ -94,9 +94,9 @@ private:
   ConflictListModel* m_model;
 
   std::optional<ConflictItem> createItem(
-    MOShared::FileEntry::Index index, int fileOrigin, bool archive,
+    MOShared::FileIndex index, int fileOrigin, bool archive,
     QString fileName, QString relativeName,
-    const MOShared::FileEntry::AlternativesVector& alternatives);
+    const MOShared::AlternativesVector& alternatives);
 };