there's no need having 2-liners inside their own method when this method is only...

[dolphin.git] / src / dolphincolumnwidget.cpp

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index 7681b88389c583a05a6ddaef62c10cc1cb89790a..1a7f712f38e2a3681f81fd941eab1239c4409973 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -26,8 +26,8 @@
 #include "dolphinmodel.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinsettings.h"
-
 #include "dolphin_columnmodesettings.h"
+#include "draganddrophelper.h"
 
 #include <kcolorutils.h>
 #include <kcolorscheme.h>
@@ -197,6 +197,11 @@ void DolphinColumnWidget::setNameFilter(const QString& nameFilter)
     m_proxyModel->setFilterRegExp(nameFilter);
 }
 
+void DolphinColumnWidget::startDrag(Qt::DropActions supportedActions)
+{
+    DragAndDropHelper::startDrag(this, supportedActions);
+}
+
 void DolphinColumnWidget::dragEnterEvent(QDragEnterEvent* event)
 {
     if (event->mimeData()->hasUrls()) {
@@ -271,7 +276,7 @@ void DolphinColumnWidget::paintEvent(QPaintEvent* event)
     // TODO: remove this code when the issue #160611 is solved in Qt 4.4
     if (m_dragging) {
         const QBrush& brush = m_viewOptions.palette.brush(QPalette::Normal, QPalette::Highlight);
-        DolphinController::drawHoverIndication(viewport(), m_dropRect, brush);
+        DragAndDropHelper::drawHoverIndication(viewport(), m_dropRect, brush);
     }
 }
 
@@ -309,14 +314,12 @@ void DolphinColumnWidget::contextMenuEvent(QContextMenuEvent* event)
 
     QListView::contextMenuEvent(event);
 
-    if (selectionModel()->hasSelection()) {
-        const QModelIndex index = indexAt(event->pos());
-        if (index.isValid() || m_active) {
-            // Only open a context menu above an item or if the mouse is above
-            // the active column.
-            const QPoint pos = m_view->viewport()->mapFromGlobal(event->globalPos());
-            m_view->m_controller->triggerContextMenuRequest(pos);
-        }
+    const QModelIndex index = indexAt(event->pos());
+    if (index.isValid() || m_active) {
+        // Only open a context menu above an item or if the mouse is above
+        // the active column.
+        const QPoint pos = m_view->viewport()->mapFromGlobal(event->globalPos());
+        m_view->m_controller->triggerContextMenuRequest(pos);
     }
 }