Merge branch 'Applications/19.08'

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

diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
index f8ae0ad03473d78d5e43febd9338e533ac855c68..d437b877ead7ec02249479affb134a83fed8d76b 100644 (file)
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@@ -20,48 +20,58 @@
 
 #include "draganddrophelper.h"
 
 
 #include "draganddrophelper.h"
 

-#include <KFileItem>
-#include <KLocale>
-#include <konq_operations.h>
-#include <KUrl>
-#include <QApplication>
-#include <QtDBus>
-#include <QDropEvent>
+#include <KIO/DropJob>
+#include <KJobWidgets>

 
 

-KonqOperations* DragAndDropHelper::dropUrls(const KFileItem& destItem, const KUrl& destUrl, QDropEvent* event, QString& error)
-{
-    error.clear();
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QMimeData>
+
+QHash<QUrl, bool> DragAndDropHelper::m_urlListMatchesUrlCache;

 
 

-    if (!destItem.isNull() && !destItem.isWritable()) {
-        error = i18nc("@info:status", "Access denied. Could not write to <filename>%1</filename>", destUrl.pathOrUrl());
-        return 0;
+bool DragAndDropHelper::urlListMatchesUrl(const QList<QUrl>& urls, const QUrl& destUrl)
+{
+    auto iteratorResult = m_urlListMatchesUrlCache.constFind(destUrl);
+    if (iteratorResult != m_urlListMatchesUrlCache.constEnd()) {
+        return *iteratorResult;

     }
 
     }
 

+    const bool destUrlMatches =
+        std::find_if(urls.constBegin(), urls.constEnd(), [destUrl](const QUrl& url) {
+            return url.matches(destUrl, QUrl::StripTrailingSlash);
+        }) != urls.constEnd();
+
+    return *m_urlListMatchesUrlCache.insert(destUrl, destUrlMatches);
+}
+
+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-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");
+    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,
 
         QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, remoteDBusPath,

-                                                              "org.kde.ark.DndExtract", "extractSelectedFilesTo");
-        message.setArguments(QVariantList() << destUrl.pathOrUrl());
+                                                              QStringLiteral("org.kde.ark.DndExtract"), QStringLiteral("extractSelectedFilesTo"));
+        message.setArguments({destUrl.toDisplayString(QUrl::PreferLocalFile)});

         QDBusConnection::sessionBus().call(message);
         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) {
-            if (url == destUrl) {
-                error = i18nc("@info:status", "A folder cannot be dropped into itself");
-                return 0;
-            }
+    } else {
+        if (urlListMatchesUrl(event->mimeData()->urls(), destUrl)) {
+            return nullptr;

         }
 
         }
 

-        return KonqOperations::doDrop(destItem, destUrl, event, QApplication::activeWindow(), QList<QAction*>());
-    } else {
-        return KonqOperations::doDrop(KFileItem(), destUrl, event, QApplication::activeWindow(), QList<QAction*>());
+        // Drop into a directory or a desktop-file
+        KIO::DropJob *job = KIO::drop(event, destUrl);
+        KJobWidgets::setWindow(job, window);
+        return job;

     }
 
     }
 

-    return 0;
+    return nullptr;
+}
+
+void DragAndDropHelper::clearUrlListMatchesUrlCache()
+{
+    DragAndDropHelper::m_urlListMatchesUrlCache.clear();

 }
 
 }