diff options
| author | isanae <14251494+isanae@users.noreply.github.com> | 2020-02-02 14:23:14 -0500 |
|---|---|---|
| committer | isanae <14251494+isanae@users.noreply.github.com> | 2020-02-04 03:33:23 -0500 |
| commit | 97b91b5fe5077228a82c622e4af6a9b698396fda (patch) | |
| tree | 5acd8b48685200e90c901543fdd1473cc66591f3 /src/filetreemodel.h | |
| parent | 34bc2191e6ebb1458438180bd75a5cd2cd7e4f7b (diff) | |
prune empty directories
Diffstat (limited to 'src/filetreemodel.h')
| -rw-r--r-- | src/filetreemodel.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/filetreemodel.h b/src/filetreemodel.h index 0fbcf521..23640ac5 100644 --- a/src/filetreemodel.h +++ b/src/filetreemodel.h @@ -15,9 +15,10 @@ class FileTreeModel : public QAbstractItemModel public: enum Flag { - NoFlags = 0x00, - Conflicts = 0x01, - Archives = 0x02 + NoFlags = 0x00, + ConflictsOnly = 0x01, + Archives = 0x02, + PruneDirectories = 0x04 }; enum Columns @@ -58,12 +59,6 @@ public: FileTreeItem* itemFromIndex(const QModelIndex& index) const; private: - enum class FillFlag - { - None = 0x00, - PruneDirectories = 0x01 - }; - struct Sort { int column = 0; @@ -72,8 +67,6 @@ private: class Range; - Q_DECLARE_FLAGS(FillFlags, FillFlag); - using DirectoryIterator = std::vector<MOShared::DirectoryEntry*>::const_iterator; OrganizerCore& m_core; mutable FileTreeItem m_root; @@ -83,9 +76,9 @@ private: mutable QTimer m_iconPendingTimer; Sort m_sort; - bool showConflicts() const + bool showConflictsOnly() const { - return (m_flags & Conflicts); + return (m_flags & ConflictsOnly); } bool showArchives() const; @@ -98,7 +91,7 @@ private: bool updateDirectories( FileTreeItem& parentItem, const std::wstring& path, - const MOShared::DirectoryEntry& parentEntry, FillFlags flags); + const MOShared::DirectoryEntry& parentEntry); void removeDisappearingDirectories( FileTreeItem& parentItem, const MOShared::DirectoryEntry& parentEntry, |