From: David Faure <faure@kde.org>
Date: Sun, 2 Nov 2014 16:17:24 +0000 (+0100)
Subject: KonqOperations: KIO::pasteMimeData -> KIO::paste, update signal and simplify dolphin... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/30175dcbde3b1c2131e05a1aaff6b80a4e4a4d29

KonqOperations: KIO::pasteMimeData -> KIO::paste, update signal and simplify dolphin accordingly.
---

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 7228b1131..782cc19f2 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -1050,9 +1050,7 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
         // Mark the dropped urls as selected.
         m_clearSelectionBeforeSelectingNewItems = true;
         m_markFirstNewlySelectedItemAsCurrent = true;
-        connect(job, static_cast<void(KonqOperations::*)(const QList<QUrl>&)>(&KonqOperations::aboutToCreate), this, &DolphinView::slotAboutToCreate);
-        // TODO
-        //connect(job, &KIO::InteractiveDropJob::itemCreated, this, &DolphinView::slotItemCreated);
+        connect(job, &KonqOperations::itemCreated, this, &DolphinView::slotItemCreated);
         //connect(job, &KIO::InteractiveDropJob::result, this, &DolphinView::slotPasteJobResult);
     }
 
@@ -1089,17 +1087,6 @@ void DolphinView::slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons
     }
 }
 
-void DolphinView::slotAboutToCreate(const QList<QUrl>& urls)
-{
-    if (!urls.isEmpty()) {
-        if (m_markFirstNewlySelectedItemAsCurrent) {
-            markUrlAsCurrent(urls.first());
-            m_markFirstNewlySelectedItemAsCurrent = false;
-        }
-        m_selectedUrls << KDirModel::simplifiedUrlList(urls);
-    }
-}
-
 void DolphinView::slotItemCreated(const QUrl& url)
 {
     if (m_markFirstNewlySelectedItemAsCurrent) {
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 2f7b63dd5..7e5eca3a1 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -577,7 +577,6 @@ private slots:
      * Is called after all pasted or dropped items have been copied to destination.
      */
     void slotPasteJobResult(KJob *job);
-    void slotAboutToCreate(const QList<QUrl> &urls);
 
     /**
      * Emits the signal \a selectionChanged() with a small delay. This is