hidden unique_ptr into FileTreeItem

refactored pruning
don't show shell menu for directories
added collapse all in context menu

1 files changed, 4 insertions, 4 deletions

diff --git a/src/filetreemodel.h b/src/filetreemodel.h
index 23640ac5..03bae602 100644
--- a/src/filetreemodel.h
+++ b/src/filetreemodel.h
@@ -69,7 +69,7 @@ private:
 
   using DirectoryIterator = std::vector<MOShared::DirectoryEntry*>::const_iterator;
   OrganizerCore& m_core;
-  mutable FileTreeItem m_root;
+  mutable FileTreeItem::Ptr m_root;
   Flags m_flags;
   mutable IconFetcher m_iconFetcher;
   mutable std::vector<QModelIndex> m_iconPending;
@@ -117,11 +117,11 @@ private:
     const std::unordered_set<MOShared::FileEntry::Index>& seen);
 
 
-  std::unique_ptr<FileTreeItem> createDirectoryItem(
+  FileTreeItem::Ptr createDirectoryItem(
     FileTreeItem& parentItem, const std::wstring& parentPath,
     const MOShared::DirectoryEntry& d);
 
-  std::unique_ptr<FileTreeItem> createFileItem(
+  FileTreeItem::Ptr createFileItem(
     FileTreeItem& parentItem, const std::wstring& parentPath,
     const MOShared::FileEntry& file);
 
@@ -134,7 +134,7 @@ private:
   void removePendingIcons(const QModelIndex& parent, int first, int last);
 
   bool shouldShowFile(const MOShared::FileEntry& file) const;
-  bool hasFilesAnywhere(const MOShared::DirectoryEntry& dir) const;
+  bool shouldShowFolder(const MOShared::DirectoryEntry& dir, const FileTreeItem* item) const;
   QString makeTooltip(const FileTreeItem& item) const;
   QVariant makeIcon(const FileTreeItem& item, const QModelIndex& index) const;