Restore filtering of items. The DolphinView just tells the controller about the filter, the views (1:1 iconView + detailView, 1:n columnView) connect to the filter-changed signal and apply it to their proxy model.

svn path=/trunk/KDE/kdebase/apps/; revision=1016782

1 files changed, 1 insertions, 22 deletions

diff --git a/src/dolphincolumnviewcontainer.cpp b/src/dolphincolumnviewcontainer.cpp
index 242821301..80c4ff7a0 100644
--- a/src/dolphincolumnviewcontainer.cpp
+++ b/src/dolphincolumnviewcontainer.cpp
@@ -40,8 +40,7 @@ DolphinColumnViewContainer::DolphinColumnViewContainer(QWidget* parent, DolphinC
     m_contentX(0),
     m_columns(),
     m_emptyViewport(0),
-    m_animation(0),
-    m_nameFilter()
+    m_animation(0)
 {
     Q_ASSERT(controller != 0);
 
@@ -75,22 +74,6 @@ DolphinColumnViewContainer::~DolphinColumnViewContainer()
 {
 }
 
-void DolphinColumnViewContainer::setNameFilter(const QString& nameFilter)
-{
-    if (nameFilter != m_nameFilter) {
-        m_nameFilter = nameFilter;
-        foreach (DolphinColumnView* column, m_columns) {
-            DolphinSortFilterProxyModel* proxyModel = static_cast<DolphinSortFilterProxyModel*>(column->model());
-            proxyModel->setFilterRegExp(nameFilter);
-        }
-    }
-}
-
-QString DolphinColumnViewContainer::nameFilter() const
-{
-    return m_nameFilter;
-}
-
 KUrl DolphinColumnViewContainer::rootUrl() const
 {
     return m_columns[0]->url();
@@ -167,10 +150,6 @@ bool DolphinColumnViewContainer::showColumn(const KUrl& url)
             columnIndex++;
 
             DolphinColumnView* column = new DolphinColumnView(viewport(), this, childUrl);
-            if (!m_nameFilter.isEmpty()) {
-                DolphinSortFilterProxyModel* proxyModel = static_cast<DolphinSortFilterProxyModel*>(column->model());
-                proxyModel->setFilterRegExp(m_nameFilter);
-            }
             column->setActive(false);
 
             m_columns.append(column);