From 6938241ebce940bc55aa4f0bb3e77361a1a0211a Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Mon, 18 Feb 2013 23:49:33 +0100 Subject: Remove items from m_filteredItems if their parent is deleted Fixes the problem that filtered children of expanded deleted folders reappear if the filter is cleared. BUG: 315210 FIXED-IN: 4.10.1 REVIEW: 108976 --- src/kitemviews/kfileitemmodel.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'src/kitemviews/kfileitemmodel.cpp') diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 6c015db37..d4c08a52e 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -795,6 +795,33 @@ void KFileItemModel::slotItemsDeleted(const KFileItemList& items) foreach (const KFileItem& item, itemsToRemove) { m_filteredItems.remove(item); } + + if (m_requestRole[ExpandedParentsCountRole] && m_expandedParentsCountRoot >= 0) { + // Remove all filtered children of deleted items. First, we put the + // deleted URLs into a set to provide fast lookup while iterating + // over m_filteredItems and prevent quadratic complexity if there + // are N removed items and N filtered items. + QSet urlsToRemove; + urlsToRemove.reserve(itemsToRemove.count()); + foreach (const KFileItem& item, itemsToRemove) { + KUrl url = item.url(); + url.adjustPath(KUrl::RemoveTrailingSlash); + urlsToRemove.insert(url); + } + + QSet::iterator it = m_filteredItems.begin(); + while (it != m_filteredItems.end()) { + const KUrl url = it->url(); + KUrl parentUrl = url.upUrl(); + parentUrl.adjustPath(KUrl::RemoveTrailingSlash); + + if (urlsToRemove.contains(parentUrl)) { + it = m_filteredItems.erase(it); + } else { + ++it; + } + } + } } removeItems(itemsToRemove); -- cgit v1.3