replaced all the manual UserRole stuff with a few constants and helper functions

setConflictItem() is now used by all conflict lists to setup the data (filename, archive, etc.) and visuals (italic for archives)
merged openDataFile() and previewDataFile() into their caller as they weren't used anywhere else
previewDataFile() used to do a fromNativeSeparators() before previewing, moved that to previewFileWithAlternatives() instead
brought overwrittenTree double click in line with overwriteTree, there's no difference between apply() and close() because there's only a close button

1 files changed, 8 insertions, 2 deletions

diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index 40e45eb4..59912127 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -368,6 +368,7 @@ private slots:
   void on_overwriteTree_customContextMenuRequested(const QPoint &pos);

   void on_overwrittenTree_customContextMenuRequested(const QPoint &pos);

   void on_noConflictTree_customContextMenuRequested(const QPoint &pos);

+  void on_conflictsAdvancedList_customContextMenuRequested(const QPoint &pos);

   void on_fileTree_customContextMenuRequested(const QPoint &pos);

 

   void on_refreshButton_clicked();

@@ -450,6 +451,13 @@ private:
     const QString& fileName, const QString& relativeName,

     const MOShared::FileEntry::AlternativesVector& alternatives);

 

+  void setConflictItem(

+    QTreeWidgetItem* item,

+    const QString& fileName, const QString& origin, bool archive) const;

+

+  QString conflictFileName(const QTreeWidgetItem* conflictItem) const;

+  QString conflictOrigin(const QTreeWidgetItem* conflictItem) const;

+  bool conflictIsArchive(const QTreeWidgetItem* conflictItem) const;

 

   void restoreTabState(const QByteArray &state);

   void restoreConflictsState(const QByteArray &state);

@@ -461,8 +469,6 @@ private:
   bool canUnhideConflictItem(const QTreeWidgetItem* item) const;

   bool canPreviewConflictItem(const QTreeWidgetItem* item) const;

 

-  void openDataFile(const QTreeWidgetItem* item);

-  void previewDataFile(const QTreeWidgetItem* item);

   void changeFiletreeVisibility(bool visible);

 

   void openConflictItems(const QList<QTreeWidgetItem*>& items);