X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/baaab6d17beb78e3209c2d6fa87c04f7b97abfe2..3ca71b3a06c623dffdf36f9ecf7343aa144b8009:/src/dolphincolumnview.cpp

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 6f1b5dc77..2d3bcb826 100644
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -141,11 +141,9 @@ 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());
+    m_extensionsFactory = new ViewExtensionsFactory(this, controller);
 }
 
 DolphinColumnView::~DolphinColumnView()
@@ -337,15 +335,7 @@ void DolphinColumnView::contextMenuEvent(QContextMenuEvent* event)
     Q_ASSERT(m_active);
 
     QListView::contextMenuEvent(event);
-
-    const QModelIndex index = indexAt(event->pos());
-    if (!index.isValid()) {
-        clearSelection();
-    }
-
-    const QPoint pos = m_container->viewport()->mapFromGlobal(event->globalPos());
-    Q_ASSERT(m_container->m_controller->itemView() == this);
-    m_container->m_controller->triggerContextMenuRequest(pos);
+    m_container->m_controller->triggerContextMenuRequest(event->pos());
 }
 
 void DolphinColumnView::wheelEvent(QWheelEvent* event)
@@ -387,11 +377,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);