Fixed some drag & drop issues:

- allow drag & drop inside the view
- prevent a dragging from a directory into itself
- use QModelIndex instead of the position

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

1 files changed, 6 insertions, 5 deletions

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index c2ba82d0d..1871bb6d9 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -29,6 +29,7 @@
 #include <kfileitemdelegate.h>
 
 #include <QAbstractProxyModel>
+#include <QPoint>
 
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
     QListView(parent),
@@ -107,13 +108,13 @@ void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event)
 void DolphinIconsView::dropEvent(QDropEvent* event)
 {
     const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
-    if (urls.isEmpty() || (event->source() == this)) {
-        QListView::dropEvent(event);
-    }
-    else {
+    if (!urls.isEmpty()) {
+        m_controller->indicateDroppedUrls(urls,
+                                          indexAt(event->pos()),
+                                          event->source());
         event->acceptProposedAction();
-        m_controller->indicateDroppedUrls(urls, event->pos());
     }
+    QListView::dropEvent(event);
 }
 
 void DolphinIconsView::updateGridSize(bool showPreview)