centralize namefilter handling

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

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 6f1b5dc77fbfca780e22a1145ad5ac115272dfde..b431c27292b4bf9d3da01d5351c7347fa0734a96 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -141,8 +141,6 @@ DolphinColumnView::DolphinColumnView(QWidget* parent,
     if (!nameFilter.isEmpty()) {
         m_proxyModel->setFilterRegExp(nameFilter);
     }
-    connect(controller, SIGNAL(nameFilterChanged(const QString&)),
-            this, SLOT(setNameFilter(const QString&)));
 
     m_extensionsFactory = new ViewExtensionsFactory(this, controller);
     updateDecorationSize(dolphinView->showPreview());
@@ -387,11 +385,6 @@ void DolphinColumnView::currentChanged(const QModelIndex& current, const QModelI
     m_extensionsFactory->handleCurrentIndexChange(current, previous);
 }
 
-void DolphinColumnView::setNameFilter(const QString& nameFilter)
-{
-    m_proxyModel->setFilterRegExp(nameFilter);
-}
-
 void DolphinColumnView::setZoomLevel(int level)
 {
     const int size = ZoomLevelInfo::iconSizeForZoomLevel(level);

diff --git a/src/dolphincolumnview.h b/src/dolphincolumnview.h
index 3d7432bd4d3c09f38e6776891d26756d1443acd1..d2354a9ad5cb8e85834358d9e6bcdadc7ca50a74 100644 (file)
--- a/src/dolphincolumnview.h
+++ b/src/dolphincolumnview.h
@@ -102,7 +102,6 @@ protected:
     virtual void currentChanged(const QModelIndex& current, const QModelIndex& previous);
 
 private slots:
-    void setNameFilter(const QString& nameFilter);
     void setZoomLevel(int level);
 
     void slotEntered(const QModelIndex& index);

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 9d37fa674c098eef63100cde12d94b2ce6895732..f0671db55259b4a52bc1c61c7542a9801c604b44 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -114,8 +114,6 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent,
             this, SLOT(slotEntered(const QModelIndex&)));
     connect(this, SIGNAL(viewportEntered()),
             controller, SLOT(emitViewportEntered()));
-    connect(controller, SIGNAL(nameFilterChanged(const QString&)),
-            this, SLOT(setNameFilter(const QString&)));
     connect(controller, SIGNAL(zoomLevelChanged(int)),
             this, SLOT(setZoomLevel(int)));
     connect(controller->dolphinView(), SIGNAL(additionalInfoChanged()),
@@ -525,12 +523,6 @@ QRect DolphinDetailsView::elasticBandRect() const
     return QRect(topLeft, bottomRight).normalized();
 }
 
-void DolphinDetailsView::setNameFilter(const QString& nameFilter)
-{
-    DolphinSortFilterProxyModel* proxyModel = static_cast<DolphinSortFilterProxyModel*>(model());
-    proxyModel->setFilterRegExp(nameFilter);
-}
-
 void DolphinDetailsView::setZoomLevel(int level)
 {
     const int size = ZoomLevelInfo::iconSizeForZoomLevel(level);

diff --git a/src/dolphindetailsview.h b/src/dolphindetailsview.h
index a099d96e7dd21013f4c9c52c85885a82885a8ff1..e0f34d3495ad37bf639c961bfbcfd4751d2861cb 100644 (file)
--- a/src/dolphindetailsview.h
+++ b/src/dolphindetailsview.h
@@ -113,8 +113,6 @@ private slots:
      */
     QRect elasticBandRect() const;
 
-    void setNameFilter(const QString& nameFilter);
-
     void setZoomLevel(int level);
 
     void slotShowPreviewChanged();

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index e06b7b3780aea508c7a2a9e993b3e0dff4006495..50a08f4ed92bfdabd6bcbe34b45e53730de914cc 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -78,8 +78,6 @@ DolphinIconsView::DolphinIconsView(QWidget* parent,
             controller, SLOT(emitItemEntered(const QModelIndex&)));
     connect(this, SIGNAL(viewportEntered()),
             controller, SLOT(emitViewportEntered()));
-    connect(controller, SIGNAL(nameFilterChanged(const QString&)),
-            this, SLOT(setNameFilter(const QString&)));
     connect(controller, SIGNAL(zoomLevelChanged(int)),
             this, SLOT(setZoomLevel(int)));
 
@@ -384,12 +382,6 @@ void DolphinIconsView::slotAdditionalInfoChanged()
     updateGridSize(showPreview, view->additionalInfo().count());
 }
 
-void DolphinIconsView::setNameFilter(const QString& nameFilter)
-{
-    DolphinSortFilterProxyModel* proxyModel = static_cast<DolphinSortFilterProxyModel*>(model());
-    proxyModel->setFilterRegExp(nameFilter);
-}
-
 void DolphinIconsView::setZoomLevel(int level)
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();

diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index 5c939242514ea3be8a12ef03ed20bc8f92047579..52bf9451974b2c2c547cb3e9297860c942524b0e 100644 (file)
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -75,7 +75,6 @@ protected:
 private slots:
     void slotShowPreviewChanged();
     void slotAdditionalInfoChanged();
-    void setNameFilter(const QString& nameFilter);
     void setZoomLevel(int level);
     void requestActivation();
     void slotGlobalSettingsChanged(int category);

diff --git a/src/viewextensionsfactory.cpp b/src/viewextensionsfactory.cpp
index 90517f61405a2ca99b04d6b6440787bc14fcaf9b..833ccda1504cfe6be3e21fc2b7cc26633d03e58b 100644 (file)
--- a/src/viewextensionsfactory.cpp
+++ b/src/viewextensionsfactory.cpp
@@ -94,6 +94,10 @@ ViewExtensionsFactory::ViewExtensionsFactory(QAbstractItemView* view,
             this, SLOT(slotSortOrderChanged(Qt::SortOrder)));
     connect(dolphinView, SIGNAL(sortFoldersFirstChanged(bool)),
             this, SLOT(slotSortFoldersFirstChanged(bool)));
+
+    connect(controller, SIGNAL(nameFilterChanged(const QString&)),
+            this, SLOT(slotNameFilterChanged(const QString&)));
+
     view->viewport()->installEventFilter(this);
 }
 
@@ -170,6 +174,11 @@ void ViewExtensionsFactory::slotSortFoldersFirstChanged(bool foldersFirst)
     proxyModel()->setSortFoldersFirst(foldersFirst);
 }
 
+void ViewExtensionsFactory::slotNameFilterChanged(const QString& nameFilter)
+{
+    proxyModel()->setFilterRegExp(nameFilter);
+}
+
 void ViewExtensionsFactory::requestActivation()
 {
     m_controller->requestActivation();

diff --git a/src/viewextensionsfactory.h b/src/viewextensionsfactory.h
index 4659b1714eaae368fed2d2056dece55b11d1ebce..65549a55a1ffeaa33bebbad5f801ae4778f694d6 100644 (file)
--- a/src/viewextensionsfactory.h
+++ b/src/viewextensionsfactory.h
@@ -72,6 +72,7 @@ private slots:
     void slotSortingChanged(DolphinView::Sorting sorting);
     void slotSortOrderChanged(Qt::SortOrder order);
     void slotSortFoldersFirstChanged(bool foldersFirst);
+    void slotNameFilterChanged(const QString& nameFilter);
     void requestActivation();
 
 private: