diff options
| author | Lukáš Tinkl <[email protected]> | 2014-10-21 21:18:43 +0200 |
|---|---|---|
| committer | Lukáš Tinkl <[email protected]> | 2014-10-21 21:19:14 +0200 |
| commit | 1b4572dac9fb529d31b786f93e4f02c6f8aeeb21 (patch) | |
| tree | cf88750183dbc93db5357be4a359c421c29d049c /src/views/draganddrophelper.cpp | |
| parent | 3653c8ad6bfb21a4b098f4e89d5ff34ed6df2901 (diff) | |
port Dolphin from KUrl to QUrl
REVIEW: 120688
Diffstat (limited to 'src/views/draganddrophelper.cpp')
| -rw-r--r-- | src/views/draganddrophelper.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp index 0dada5e55..1f3f4ba82 100644 --- a/src/views/draganddrophelper.cpp +++ b/src/views/draganddrophelper.cpp @@ -23,17 +23,19 @@ #include <KFileItem> #include <KLocalizedString> #include <konq_operations.h> -#include <KUrl> +#include <QUrl> #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 = 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; } @@ -45,12 +47,12 @@ KonqOperations* DragAndDropHelper::dropUrls(const KFileItem& destItem, const KUr QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, remoteDBusPath, "org.kde.ark.DndExtract", "extractSelectedFilesTo"); - message.setArguments(QVariantList() << destUrl.pathOrUrl()); + message.setArguments(QVariantList() << destUrl.toDisplayString(QUrl::PreferLocalFile)); 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; |
