Port to new KStandardAction slot syntax

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

diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
index 6cd17b6ba4fc99249129ed85b349b4fde60deadb..01b41f8b21c23b861a39f0e7b4a3cd1e9f5e04ff 100644 (file)
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@@ -20,41 +20,34 @@
 
 #include "draganddrophelper.h"
 
 
 #include "draganddrophelper.h"
 

-#include <KFileItem>
-#include <KLocale>
-#include <konq_operations.h>
-#include <KUrl>
-#include <QtDBus>
+#include <QUrl>
+#include <QDBusMessage>
+#include <QDBusConnection>

 #include <QDropEvent>
 #include <QDropEvent>

-#include <QWidget>
+#include <QMimeData>

 
 

-QString DragAndDropHelper::dropUrls(const KFileItem& destItem,
-                                    const KUrl& destPath,
-                                    QDropEvent* event,
-                                    QWidget* widget)
-{
-    const bool dropToItem = !destItem.isNull() && (destItem.isDir() || destItem.isDesktopFile());
-    const KUrl destination = dropToItem ? destItem.url() : destPath;
+#include <KIO/DropJob>
+#include <KJobWidgets>

 
 

+KIO::DropJob* DragAndDropHelper::dropUrls(const QUrl& destUrl, QDropEvent* event, QWidget* window)
+{

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

         QDBusConnection::sessionBus().call(message);
     } else {
         QDBusConnection::sessionBus().call(message);
     } else {

-        const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
-        const int urlsCount = urls.count();
-        if (urlsCount == 1 && urls.first() == destination) {
-            return i18nc("@info:status", "A folder cannot be dropped into itself");
-        } else if (dropToItem) {
-            KonqOperations::doDrop(destItem, destination, event, widget);
-        } else {
-            KonqOperations::doDrop(KFileItem(), destination, event, widget);
-        }
+        // Drop into a directory or a desktop-file
+        KIO::DropJob *job = KIO::drop(event, destUrl);
+        KJobWidgets::setWindow(job, window);
+        return job;

     }
 
     }
 

-    return QString();
+    return 0;

 }
 
 }