DolphinView: rename new methods to copy/move urls

DolphinView doesn't know anything about split views and it shouldn't.
Rename these new methods to what they actually do (just copy or move to a
given QUrl).

diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
index 9fd6005673f405d3f743004f711543c61df2c83b..7a431152ed61a5f46ca4a99caef6359bd3978993 100644 (file)
--- a/src/dolphintabwidget.cpp
+++ b/src/dolphintabwidget.cpp
@@ -330,10 +330,10 @@ void DolphinTabWidget::copyToInactiveSplitView()
 
     if (tabPage->primaryViewActive()) {
         // copy from left panel to right
-        activeViewContainer->view()->copySelectedItemsToInactiveSplitView(activeViewContainer->view()->selectedItems(), tabPage->secondaryViewContainer()->url());
+        activeViewContainer->view()->copySelectedItems(activeViewContainer->view()->selectedItems(), tabPage->secondaryViewContainer()->url());
     } else {
         // copy from right panel to left
-        activeViewContainer->view()->copySelectedItemsToInactiveSplitView(activeViewContainer->view()->selectedItems(), tabPage->primaryViewContainer()->url());
+        activeViewContainer->view()->copySelectedItems(activeViewContainer->view()->selectedItems(), tabPage->primaryViewContainer()->url());
     }
 }
 
@@ -347,10 +347,10 @@ void DolphinTabWidget::moveToInactiveSplitView()
 
     if (tabPage->primaryViewActive()) {
         // move from left panel to right
-        activeViewContainer->view()->moveSelectedItemsToInactiveSplitView(activeViewContainer->view()->selectedItems(), tabPage->secondaryViewContainer()->url());
+        activeViewContainer->view()->moveSelectedItems(activeViewContainer->view()->selectedItems(), tabPage->secondaryViewContainer()->url());
     } else {
         // move from right panel to left
-        activeViewContainer->view()->moveSelectedItemsToInactiveSplitView(activeViewContainer->view()->selectedItems(), tabPage->primaryViewContainer()->url());
+        activeViewContainer->view()->moveSelectedItems(activeViewContainer->view()->selectedItems(), tabPage->primaryViewContainer()->url());
     }
 }
 

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index aef0e85d603149198720e584543b11ec5068e671..02210baf4714f0490719ac17bb7d2a41bca828e3 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -692,7 +692,7 @@ void DolphinView::copySelectedItemsToClipboard()
     QApplication::clipboard()->setMimeData(mimeData);
 }
 
-void DolphinView::copySelectedItemsToInactiveSplitView(const KFileItemList &selection, const QUrl &destinationUrl)
+void DolphinView::copySelectedItems(const KFileItemList &selection, const QUrl &destinationUrl)
 {
     KIO::CopyJob* job = KIO::copy(selection.urlList(), destinationUrl, KIO::DefaultFlags);
     KJobWidgets::setWindow(job, this);
@@ -702,7 +702,7 @@ void DolphinView::copySelectedItemsToInactiveSplitView(const KFileItemList &sele
     KIO::FileUndoManager::self()->recordCopyJob(job);
 }
 
-void DolphinView::moveSelectedItemsToInactiveSplitView(const KFileItemList &selection, const QUrl &destinationUrl)
+void DolphinView::moveSelectedItems(const KFileItemList &selection, const QUrl &destinationUrl)
 {
     KIO::CopyJob* job = KIO::move(selection.urlList(), destinationUrl, KIO::DefaultFlags);
     KJobWidgets::setWindow(job, this);

diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 0b2c0bce48a6c3f688370e2004f946a93680def0..4306b3eb73aa44ee43736bc58284bd0c726118c9 100644 (file)
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -371,16 +371,14 @@ public slots:
     void copySelectedItemsToClipboard();
 
     /**
-     * Copies all selected items to the inactive split view.
-     * Only used in Split View.
+     * Copies all selected items to @p destinationUrl.
      */
-    void copySelectedItemsToInactiveSplitView(const KFileItemList &selection, const QUrl &destinationUrl);
+    void copySelectedItems(const KFileItemList &selection, const QUrl &destinationUrl);
 
     /**
-     * Moves all selected items to the inactive split view.
-     * Only used in Split View.
+     * Moves all selected items to @p destinationUrl.
      */
-    void moveSelectedItemsToInactiveSplitView(const KFileItemList &selection, const QUrl &destinationUrl);
+    void moveSelectedItems(const KFileItemList &selection, const QUrl &destinationUrl);
 
     /** Pastes the clipboard data to this view. */
     void paste();