From: David Faure <faure@kde.org>
Date: Wed, 13 Aug 2014 16:27:09 +0000 (+0200)
Subject: Port from KonqMimeData to KIO::isClipboardDataCut/setClipboardDataCut
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/3e5ff13f929165f180111485fc00cb2276bca3bf

Port from KonqMimeData to KIO::isClipboardDataCut/setClipboardDataCut
---

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index cf9270fa8..16c873ef1 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -41,7 +41,6 @@
 #include <KMimeTypeTrader>
 #include <KMimeType>
 #include <KNewFileMenu>
-#include <konqmimedata.h>
 #include <konq_operations.h>
 #include <KService>
 #include <KLocale>
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 990995af5..104ade036 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -69,7 +69,6 @@
 #include <KMenuBar>
 #include <KMessageBox>
 #include <KFileItemListProperties>
-#include <konqmimedata.h>
 #include <KProtocolInfo>
 #include <KRun>
 #include <KShell>
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 87a2ceb4d..46225f931 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -38,7 +38,6 @@
 #include <KIO/PreviewJob>
 #include <KMessageWidget>
 #include <KNewFileMenu>
-#include <konqmimedata.h>
 #include <konq_operations.h>
 #include <KShell>
 #include <KUrl>
diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index ff0801d1a..932d102b8 100644
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -27,10 +27,11 @@
 #include <KIcon>
 #include <KSharedConfig>
 #include <KConfigGroup>
-#include <konqmimedata.h>
+#include <kurlmimedata.h>
 #include <KFileItemListProperties>
 #include <konq_operations.h>
 #include <KLocale>
+#include <KIO/Paste>
 #include <KPropertiesDialog>
 
 #include "folderspanel.h"
@@ -156,7 +157,8 @@ void TreeViewContextMenu::populateMimeData(QMimeData* mimeData, bool cut)
     KUrl::List mostLocalUrls;
     bool dummy;
     mostLocalUrls.append(m_fileItem.mostLocalUrl(dummy));
-    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, cut);
+    KIO::setClipboardDataCut(mimeData, cut);
+    KUrlMimeData::setUrls(kdeUrls, mostLocalUrls, mimeData);
 }
 
 void TreeViewContextMenu::cut()
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index debda07a1..00358a268 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -55,13 +55,13 @@
 #include <KIO/JobUiDelegate>
 #include <KIO/NetAccess>
 #include <KIO/PreviewJob>
+#include <KIO/Paste>
 #include <KJob>
 #include <KMenu>
 #include <KGlobal>
 #include <KMessageBox>
 #include <KJobWidgets>
 #include <konq_operations.h>
-#include <konqmimedata.h>
 #include <KToggleAction>
 #include <KUrl>
 
@@ -697,7 +697,7 @@ void DolphinView::deleteSelectedItems()
 void DolphinView::cutSelectedItems()
 {
     QMimeData* mimeData = selectionMimeData();
-    KonqMimeData::addIsCutSelection(mimeData, true);
+    KIO::setClipboardDataCut(mimeData, true);
     QApplication::clipboard()->setMimeData(mimeData);
 }