From: Peter Penz <peter.penz19@gmail.com>
Date: Tue, 25 Sep 2007 13:16:17 +0000 (+0000)
Subject: fix filtering issues for views that show a directory hierarchy like a tree view or... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/1db9b6c3c4d494e055696e5d96629f33ea109abc

fix filtering issues for views that show a directory hierarchy like a tree view or a column view: the directories should not get filtered

svn path=/trunk/KDE/kdebase/apps/; revision=716873
---

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 5194646f6..a2902afd7 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -452,18 +452,8 @@ void DolphinViewContainer::changeNameFilter(const QString& nameFilter)
     adjustedFilter.insert(0, '*');
     adjustedFilter.append('*');
 
-    // Use the ProxyModel to filter:
-    // This code is #ifdefed as setNameFilter behaves
-    // slightly different than the QSortFilterProxyModel
-    // as it will not remove directories. I will ask
-    // our beloved usability experts for input
-    // -- z.
-#if 0
     m_dirLister->setNameFilter(adjustedFilter);
     m_dirLister->emitChanges();
-#else
-    m_proxyModel->setFilterRegExp(nameFilter);
-#endif
 
     updateStatusBar();
 }