[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [gwenview] app: Ported to KIO::paste  (requires recent KIO)
From:       David Faure <faure () kde ! org>
Date:       2014-10-31 21:54:41
Message-ID: E1XkK9Z-0002Ix-7B () scm ! kde ! org
[Download RAW message or body]

Git commit 156d8cfd4690b193f75ea28bb7812afa71e8d1f2 by David Faure.
Committed on 31/10/2014 at 16:10.
Pushed by dfaure into branch 'master'.

Ported to KIO::paste  (requires recent KIO)

M  +3    -2    app/fileopscontextmanageritem.cpp

http://commits.kde.org/gwenview/156d8cfd4690b193f75ea28bb7812afa71e8d1f2

diff --git a/app/fileopscontextmanageritem.cpp b/app/fileopscontextmanageritem.cpp
index f20d798..a98964c 100644
--- a/app/fileopscontextmanageritem.cpp
+++ b/app/fileopscontextmanageritem.cpp
@@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include <KFileItem>
 #include <KFileItemActions>
 #include <KIO/Paste>
+#include <KIO/PasteJob>
 #include <KIO/RestoreJob>
 #include <KIO/JobUiDelegate>
 #include <KIOCore/KFileItemListProperties>
@@ -345,8 +346,8 @@ void FileOpsContextManagerItem::copy()
 
 void FileOpsContextManagerItem::paste()
 {
-    const bool move = KIO::isClipboardDataCut(QApplication::clipboard()->mimeData());
-    KIO::pasteClipboard(d->pasteTargetUrl(), d->mGroup, move);
+    KIO::Job *job = KIO::paste(QApplication::clipboard()->mimeData(), d->pasteTargetUrl());
+    KJobWidgets::setWindow(job, d->mGroup);
 }
 
 void FileOpsContextManagerItem::trash()
[prev in list] [next in list] [prev in thread] [next in thread]