Move the pasteIntoFolder() method from the contextmenu into DolphinView. This allows...

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index e17987fdd0c399d9d4774bb8cb0dca2976fe6583..dd88fb74bcabf1d290bd271a4db800f61787cee1 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -95,25 +95,6 @@ void DolphinContextMenu::open()
     }
 }
 
-void DolphinContextMenu::pasteIntoFolder()
-{
-    // TODO: this method should go into DolphinView (see DolphinContextMenu::createPasteAction())
-    Q_ASSERT(m_selectedItems.count() == 1);
-    Q_ASSERT(m_fileInfo.isDir());
-
-    QClipboard* clipboard = QApplication::clipboard();
-    const QMimeData* mimeData = clipboard->mimeData();
-
-    const KUrl::List source = KUrl::List::fromMimeData(mimeData);
-    const KUrl& dest = m_fileInfo.url();
-    if (KonqMimeData::decodeIsCutSelection(mimeData)) {
-        KonqOperations::copy(m_mainWindow, KonqOperations::MOVE, source, dest);
-        clipboard->clear();
-    } else {
-        KonqOperations::copy(m_mainWindow, KonqOperations::COPY, source, dest);
-    }
-}
-
 void DolphinContextMenu::openTrashContextMenu()
 {
     Q_ASSERT(m_context & TrashContext);
@@ -435,14 +416,13 @@ QString DolphinContextMenu::placesName(const KUrl& url) const
 
 QAction* DolphinContextMenu::createPasteAction()
 {
-    // TODO: move this method as QAction* action pasteAction() into DolphinMainWindow
     QAction* action = 0;
     if ((m_selectedItems.count() == 1) && m_fileInfo.isDir()) {
         action = new QAction(KIcon("edit-paste"), i18nc("@action:inmenu", "Paste Into Folder"), this);
         const QMimeData* mimeData = QApplication::clipboard()->mimeData();
         const KUrl::List pasteData = KUrl::List::fromMimeData(mimeData);
         action->setEnabled(!pasteData.isEmpty());
-        connect(action, SIGNAL(triggered()), this, SLOT(pasteIntoFolder()));
+        connect(action, SIGNAL(triggered()), m_mainWindow, SLOT(pasteIntoFolder()));
     } else {
         action = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
     }