When listing already visited dir, completed() would be emitted from within setUrl...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index ddabf21a4ff7d37a3b90fbeb64ba3e9ad45fdf36..63feb996ec3c07cd704eb802a1c2b2627c54fdcc 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -210,15 +210,18 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
 
     switch (action) {
     case Qt::MoveAction:
-        moveUrls(urls, destination);
+        KonqOperations::copy(this, KonqOperations::MOVE, urls, destination);
+        m_undoCommandTypes.append(KonqFileUndoManager::MOVE);
         break;
 
     case Qt::CopyAction:
-        copyUrls(urls, destination);
+        KonqOperations::copy(this, KonqOperations::COPY, urls, destination);
+        m_undoCommandTypes.append(KonqFileUndoManager::COPY);
         break;
 
     case Qt::LinkAction:
-        linkUrls(urls, destination);
+        KonqOperations::copy(this, KonqOperations::LINK, urls, destination);
+        m_undoCommandTypes.append(KonqFileUndoManager::LINK);
         break;
 
     default:
@@ -1437,24 +1440,6 @@ void DolphinMainWindow::updateGoActions()
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
 
-void DolphinMainWindow::copyUrls(const KUrl::List& source, const KUrl& dest)
-{
-    KonqOperations::copy(this, KonqOperations::COPY, source, dest);
-    m_undoCommandTypes.append(KonqFileUndoManager::COPY);
-}
-
-void DolphinMainWindow::moveUrls(const KUrl::List& source, const KUrl& dest)
-{
-    KonqOperations::copy(this, KonqOperations::MOVE, source, dest);
-    m_undoCommandTypes.append(KonqFileUndoManager::MOVE);
-}
-
-void DolphinMainWindow::linkUrls(const KUrl::List& source, const KUrl& dest)
-{
-    KonqOperations::copy(this, KonqOperations::LINK, source, dest);
-    m_undoCommandTypes.append(KonqFileUndoManager::LINK);
-}
-
 void DolphinMainWindow::clearStatusBar()
 {
     m_activeViewContainer->statusBar()->clear();