Port from KonqMimeData to KIO::isClipboardDataCut/setClipboardDataCut

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

View file

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

View file

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

View file

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

View file

@ -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()

View file

@ -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);
}