kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Port from KonqMimeData to KIO::isClipboardDataCut/setClipboardDataCut

Browse source
This commit is contained in:
David Faure 2014-08-13 18:27:09 +02:00
parent 316539b9f3
commit 3e5ff13f92
5 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dolphincontextmenu.cpp
View file

@ -41,7 +41,6 @@
#include <KMimeTypeTrader> #include <KMimeTypeTrader>
#include <KMimeType> #include <KMimeType>
#include <KNewFileMenu> #include <KNewFileMenu>
#include <konqmimedata.h>
#include <konq_operations.h> #include <konq_operations.h>
#include <KService> #include <KService>
#include <KLocale> #include <KLocale>

1
src/dolphinmainwindow.cpp
View file

@ -69,7 +69,6 @@
#include <KMenuBar> #include <KMenuBar>
#include <KMessageBox> #include <KMessageBox>
#include <KFileItemListProperties> #include <KFileItemListProperties>
#include <konqmimedata.h>
#include <KProtocolInfo> #include <KProtocolInfo>
#include <KRun> #include <KRun>
#include <KShell> #include <KShell>

1
src/dolphinviewcontainer.cpp
View file

@ -38,7 +38,6 @@
#include <KIO/PreviewJob> #include <KIO/PreviewJob>
#include <KMessageWidget> #include <KMessageWidget>
#include <KNewFileMenu> #include <KNewFileMenu>
#include <konqmimedata.h>
#include <konq_operations.h> #include <konq_operations.h>
#include <KShell> #include <KShell>
#include <KUrl> #include <KUrl>

6
src/panels/folders/treeviewcontextmenu.cpp
View file

@ -27,10 +27,11 @@
#include <KIcon> #include <KIcon>
#include <KSharedConfig> #include <KSharedConfig>
#include <KConfigGroup> #include <KConfigGroup>
#include <konqmimedata.h> #include <kurlmimedata.h>
#include <KFileItemListProperties> #include <KFileItemListProperties>
#include <konq_operations.h> #include <konq_operations.h>
#include <KLocale> #include <KLocale>
#include <KIO/Paste>
#include <KPropertiesDialog> #include <KPropertiesDialog>
#include "folderspanel.h" #include "folderspanel.h"
@ -156,7 +157,8 @@ void TreeViewContextMenu::populateMimeData(QMimeData* mimeData, bool cut)
KUrl::List mostLocalUrls; KUrl::List mostLocalUrls;
bool dummy; bool dummy;
mostLocalUrls.append(m_fileItem.mostLocalUrl(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() void TreeViewContextMenu::cut()

4
src/views/dolphinview.cpp
View file

@ -55,13 +55,13 @@
#include <KIO/JobUiDelegate> #include <KIO/JobUiDelegate>
#include <KIO/NetAccess> #include <KIO/NetAccess>
#include <KIO/PreviewJob> #include <KIO/PreviewJob>
#include <KIO/Paste>
#include <KJob> #include <KJob>
#include <KMenu> #include <KMenu>
#include <KGlobal> #include <KGlobal>
#include <KMessageBox> #include <KMessageBox>
#include <KJobWidgets> #include <KJobWidgets>
#include <konq_operations.h> #include <konq_operations.h>
#include <konqmimedata.h>
#include <KToggleAction> #include <KToggleAction>
#include <KUrl> #include <KUrl>
@ -697,7 +697,7 @@ void DolphinView::deleteSelectedItems()
void DolphinView::cutSelectedItems() void DolphinView::cutSelectedItems()
{ {
QMimeData* mimeData = selectionMimeData(); QMimeData* mimeData = selectionMimeData();
KonqMimeData::addIsCutSelection(mimeData, true); KIO::setClipboardDataCut(mimeData, true);
QApplication::clipboard()->setMimeData(mimeData); QApplication::clipboard()->setMimeData(mimeData);
} }