SVN_SILENT: minor coding style fix (Sebastian likes spaces :-))

[dolphin.git] / src / dolphincolumnview.cpp

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 6f1b5dc77fbfca780e22a1145ad5ac115272dfde..b58fd8e1b86c3849f2a03015dd0b7272f41ad70b 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -31,7 +31,6 @@
 #include "draganddrophelper.h"
 #include "folderexpander.h"
 #include "tooltips/tooltipmanager.h"
-#include "versioncontrolobserver.h"
 #include "viewextensionsfactory.h"
 #include "zoomlevelinfo.h"
 
@@ -126,13 +125,6 @@ DolphinColumnView::DolphinColumnView(QWidget* parent,
     connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
             this, SLOT(updateFont()));
 
-    /*FolderExpander* folderExpander = new FolderExpander(this, m_proxyModel);
-    folderExpander->setEnabled(DolphinSettings::instance().generalSettings()->autoExpandFolders());
-    connect (folderExpander, SIGNAL(enterDir(const QModelIndex&)),
-             m_container->m_controller, SLOT(triggerItem(const QModelIndex&)));
-
-    new VersionControlObserver(this);*/
-
     DolphinController* controller = m_container->m_controller;
     connect(controller, SIGNAL(zoomLevelChanged(int)),
             this, SLOT(setZoomLevel(int)));
@@ -141,11 +133,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,25 +327,11 @@ 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)
 {
-    // let Ctrl+wheel events propagate to the DolphinView for icon zooming
-    if (event->modifiers() & Qt::ControlModifier) {
-        event->ignore();
-        return;
-    }
-
     const int height = m_decorationSize.height();
     const int step = (height >= KIconLoader::SizeHuge) ? height / 10 : (KIconLoader::SizeHuge - height) / 2;
     verticalScrollBar()->setSingleStep(step);
@@ -387,11 +363,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);