From 609ce0929289f3e26eb1898b184c7dafbf7bcac2 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Fri, 14 Dec 2007 15:53:40 +0000
Subject: Moving code around in dolphin fixes DnD support in konqueror :)

svn path=/trunk/KDE/kdebase/apps/; revision=748476
---
 src/dolphinview.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/dolphinview.cpp')

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index dcabe8329..4db66cd4b 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -29,7 +29,6 @@
 #include <QBoxLayout>
 #include <QTimer>
 #include <QScrollBar>
-#include <QClipboard>
 
 #include <kcolorscheme.h>
 #include <kdirlister.h>
@@ -40,11 +39,13 @@
 #include <kio/netaccess.h>
 #include <kio/previewjob.h>
 #include <kjob.h>
+#include <kmenu.h>
 #include <kmimetyperesolver.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
 #include <kurl.h>
 
+#include "dolphindropcontroller.h"
 #include "dolphinmodel.h"
 #include "dolphincolumnview.h"
 #include "dolphincontroller.h"
@@ -751,6 +752,7 @@ void DolphinView::dropUrls(const KUrl::List& urls,
                            const KUrl& destPath,
                            const KFileItem& destItem)
 {
+    Q_ASSERT(!urls.isEmpty());
     const KUrl& destination = !destItem.isNull() && destItem.isDir() ?
                               destItem.url() : destPath;
     const KUrl sourceDir = KUrl(urls.first().directory());
@@ -762,7 +764,11 @@ void DolphinView::dropUrls(const KUrl::List& urls,
 void DolphinView::dropUrls(const KUrl::List& urls,
                            const KUrl& destination)
 {
-    emit urlsDropped(urls, destination);
+    DolphinDropController dropController(this);
+    // forward doingOperation signal up to the mainwindow
+    connect(&dropController, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)),
+            this, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)));
+    dropController.dropUrls(urls, destination);
 }
 
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
-- 
cgit v1.3