Fix for crash which was introduced by commit

[dolphin.git] / src / views / draganddrophelper.cpp

diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
index 2cd1e86e04d409566623181075f749d97658a4cd..a09faa345179fbb016b67289c550650a56639614 100644 (file)
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@@ -21,40 +21,49 @@
 #include "draganddrophelper.h"
 
 #include <KFileItem>
 #include "draganddrophelper.h"
 
 #include <KFileItem>

-#include <KLocale>
+#include <KLocalizedString>

 #include <konq_operations.h>
 #include <konq_operations.h>

-#include <KUrl>
+#include <QUrl>

 #include <QApplication>
 #include <QtDBus>
 #include <QDropEvent>
 #include <QApplication>
 #include <QtDBus>
 #include <QDropEvent>

+#include <KUrlMimeData>

 
 

-QString DragAndDropHelper::dropUrls(const KFileItem& destItem, const KUrl& destUrl, QDropEvent* event)
+KonqOperations* DragAndDropHelper::dropUrls(const KFileItem& destItem, const QUrl& destUrl, QDropEvent* event, QString& error)

 {
 {

+    error.clear();
+

     if (!destItem.isNull() && !destItem.isWritable()) {
     if (!destItem.isNull() && !destItem.isWritable()) {

-        return i18nc("@info:status", "Access denied. Could not write to <filename>%1</filename>", destUrl.pathOrUrl());
+        error = xi18nc("@info:status", "Access denied. Could not write to <filename>%1</filename>",
+                       destUrl.toDisplayString(QUrl::PreferLocalFile));
+        return 0;

     }
 
     const QMimeData* mimeData = event->mimeData();
     }
 
     const QMimeData* mimeData = event->mimeData();

-    if (mimeData->hasFormat("application/x-kde-dndextract")) {
-        const QString remoteDBusClient = mimeData->data("application/x-kde-dndextract");
-        QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, "/DndExtract",
-                                                              "org.kde.DndExtract", "extractSelectedFilesTo");
-        message.setArguments(QVariantList() << destUrl.pathOrUrl());
+    if (mimeData->hasFormat("application/x-kde-ark-dndextract-service") &&
+        mimeData->hasFormat("application/x-kde-ark-dndextract-path")) {
+        const QString remoteDBusClient = mimeData->data("application/x-kde-ark-dndextract-service");
+        const QString remoteDBusPath = mimeData->data("application/x-kde-ark-dndextract-path");
+
+        QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, remoteDBusPath,
+                                                              "org.kde.ark.DndExtract", "extractSelectedFilesTo");
+        message.setArguments({destUrl.toDisplayString(QUrl::PreferLocalFile)});

         QDBusConnection::sessionBus().call(message);
     } else if (!destItem.isNull() && (destItem.isDir() || destItem.isDesktopFile())) {
         // Drop into a directory or a desktop-file
         QDBusConnection::sessionBus().call(message);
     } else if (!destItem.isNull() && (destItem.isDir() || destItem.isDesktopFile())) {
         // Drop into a directory or a desktop-file

-        const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
-        foreach (const KUrl& url, urls) {
+        const QList<QUrl> urls = KUrlMimeData::urlsFromMimeData(mimeData);
+        foreach (const QUrl& url, urls) {

             if (url == destUrl) {
             if (url == destUrl) {

-                return i18nc("@info:status", "A folder cannot be dropped into itself");
+                error = i18nc("@info:status", "A folder cannot be dropped into itself");
+                return 0;

             }
         }
             }
         }

-        
-        KonqOperations::doDrop(destItem, destUrl, event, QApplication::activeWindow());
+
+        return KonqOperations::doDrop(destItem, destUrl, event, QApplication::activeWindow(), QList<QAction*>());

     } else {
     } else {

-        KonqOperations::doDrop(KFileItem(), destUrl, event, QApplication::activeWindow());
+        return KonqOperations::doDrop(KFileItem(), destUrl, event, QApplication::activeWindow(), QList<QAction*>());

     }
 
     }
 

-    return QString();
+    return 0;

 }
 
 }