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 5bae50ef7c0d22ab3b74c045d486f57227d16372..a09faa345179fbb016b67289c550650a56639614 100644 (file)
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@@ -21,19 +21,21 @@
 #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>

 
 

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

 {
     error.clear();
 
     if (!destItem.isNull() && !destItem.isWritable()) {
 {
     error.clear();
 
     if (!destItem.isNull() && !destItem.isWritable()) {

-        error = xi18nc("@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;
     }
 
         return 0;
     }
 


@@ -45,12 +47,12 @@ KonqOperations* DragAndDropHelper::dropUrls(const KFileItem& destItem, const KUr
 
         QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, remoteDBusPath,
                                                               "org.kde.ark.DndExtract", "extractSelectedFilesTo");
 
         QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, remoteDBusPath,
                                                               "org.kde.ark.DndExtract", "extractSelectedFilesTo");

-        message.setArguments(QVariantList() << destUrl.pathOrUrl());
+        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) {
                 error = i18nc("@info:status", "A folder cannot be dropped into itself");
                 return 0;
             if (url == destUrl) {
                 error = i18nc("@info:status", "A folder cannot be dropped into itself");
                 return 0;