Merge pull request #754 from isanae/conflict-lists-sort

Natural sort for conflict lists

1 files changed, 0 insertions, 21 deletions

diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index 8510c96d..c4f65d8a 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -460,28 +460,12 @@ private:
     const QString& fileName, const QString& relativeName,

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

 

-  void setConflictItem(

-    QTreeWidgetItem* item, FileEntry::Index index,

-    const QString& fileName, bool hasAltOrigins, const QString& altOrigin,

-    bool archive) const;

-

-  QString conflictFileName(const QTreeWidgetItem* conflictItem) const;

-  QString conflictAltOrigin(const QTreeWidgetItem* conflictItem) const;

-  bool conflictHasAlts(const QTreeWidgetItem* conflictItem) const;

-  bool conflictIsArchive(const QTreeWidgetItem* conflictItem) const;

-  FileEntry::Index conflictFileIndex(const QTreeWidgetItem* conflictItem) const;

-

   void restoreTabState(const QByteArray &state);

   void restoreConflictsState(const QByteArray &state);

 

   QByteArray saveTabState() const;

   QByteArray saveConflictsState() const;

 

-  bool canHideConflictItem(const QTreeWidgetItem* item) const;

-  bool canUnhideConflictItem(const QTreeWidgetItem* item) const;

-  bool canOpenConflictItem(const QTreeWidgetItem* item) const;

-  bool canPreviewConflictItem(const QTreeWidgetItem* item) const;

-

   void changeFiletreeVisibility(bool visible);

 

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

@@ -489,11 +473,6 @@ private:
   void changeConflictItemsVisibility(

     const QList<QTreeWidgetItem*>& items, bool visible);

 

-  bool canPreviewFile(bool isArchive, const QString& filename) const;

-  bool canOpenFile(bool isArchive, const QString& filename) const;

-  bool canHideFile(bool isArchive, const QString& filename) const;

-  bool canUnhideFile(bool isArchive, const QString& filename) const;

-

   void showConflictMenu(const QPoint &pos, QTreeWidget* tree);

 

   ConflictActions createConflictMenuActions(