From aedddb10f820dc61cc9aeb164b3318871ac5a15d Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Tue, 4 Jun 2019 23:31:29 -0400 Subject: refactored conflict list items: - use new ConflictItem class derived from QTreeWidgetItem - that class has all the various conflict*() member functions that were previously in the dialog - moved some of the can*() member functions out to namespace level so they can be used by ConflictItem, no real need to have them as members anyway --- src/modinfodialog.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'src/modinfodialog.h') 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& items); @@ -489,11 +473,6 @@ private: void changeConflictItemsVisibility( const QList& 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( -- cgit v1.3.1