Port from KonqMimeData to KIO::isClipboardDataCut/setClipboardDataCut

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index cf9270fa8583a3a9d245961b324a2cf07e06dd06..16c873ef19060dbd463dbf4e96b14774358b284a 100644 (file)
--- 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 990995af59f644632207b722307ef75afc0c159f..104ade03601d04b5cdbbecb6075c7d278eb16979 100644 (file)
--- 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 87a2ceb4d21bda32f6540733a1e33b8ba5ee7f14..46225f93150d126a3fd9d90a3b79fe17d249901c 100644 (file)
--- 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 ff0801d1a9fe64a83ce904918a8f8d1c4c06e094..932d102b86a31d1edb58bbb89ba946959a69f6a4 100644 (file)
--- 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 debda07a17db9f0249ecefd19a445752cae88357..00358a268c48aa71e912d397f3d8a2fba564fb4c 100644 (file)
--- 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);
 }