Don't try to show the terminal in dolphin when in Windows

[dolphin.git] / src / sidebartreeview.cpp

diff --git a/src/sidebartreeview.cpp b/src/sidebartreeview.cpp
index af676541a6b60a46c7cfbe7828b0dc6211a4b1f7..5ac3b0cbf166645b0f4be5df76b1842688c2768a 100644 (file)
--- a/src/sidebartreeview.cpp
+++ b/src/sidebartreeview.cpp
@@ -43,14 +43,8 @@ SidebarTreeView::SidebarTreeView(QWidget* parent) :
     setDropIndicatorShown(false);
     setAutoExpandDelay(300);
 
-// TODO: Remove this check when 4.3.2 is released and KDE requires it... this
-//       check avoids a division by zero happening on versions before 4.3.1.
-//       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
-//       ereslibre
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY))
     setVerticalScrollMode(QListView::ScrollPerPixel);
     setHorizontalScrollMode(QListView::ScrollPerPixel);
-#endif
 
     viewport()->setAttribute(Qt::WA_Hover);
 
@@ -81,16 +75,10 @@ bool SidebarTreeView::event(QEvent* event)
         header()->hide();
     }
     else if (event->type() == QEvent::UpdateRequest) {
-        // TODO: Remove this check when 4.3.2 is released and KDE requires it... this
-        //       check avoids a division by zero happening on versions before 4.3.1.
-        //       Right now KDE in theory can be shipped with Qt 4.3.0 and above.
-        //       ereslibre
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY))
         // a wheel movement will scroll 1 item
         if (model()->rowCount() > 0) {
             verticalScrollBar()->setSingleStep(sizeHintForRow(0) / 3);
         }
-#endif
     }
     else if (event->type() == QEvent::MetaCall) {
         resizeColumnToContents(DolphinModel::Name);
@@ -106,10 +94,12 @@ void SidebarTreeView::startDrag(Qt::DropActions supportedActions)
 
 void SidebarTreeView::dragEnterEvent(QDragEnterEvent* event)
 {
+    QTreeView::dragEnterEvent(event);
+
     if (event->mimeData()->hasUrls()) {
         event->acceptProposedAction();
     }
-    QTreeView::dragEnterEvent(event);
+
     m_dragging = true;
 }
 
@@ -131,6 +121,11 @@ void SidebarTreeView::dragMoveEvent(QDragMoveEvent* event)
     setDirtyRegion(m_dropRect);
     m_dropRect = visualRect(index);
     setDirtyRegion(m_dropRect);
+
+    if (event->mimeData()->hasUrls()) {
+        // accept url drops, independently from the destination item
+        event->acceptProposedAction();
+    }
 }
 
 void SidebarTreeView::dropEvent(QDropEvent* event)