diff options
| -rw-r--r-- | src/dolphintabwidget.cpp | 8 | ||||
| -rw-r--r-- | src/views/dolphinview.cpp | 4 | ||||
| -rw-r--r-- | src/views/dolphinview.h | 10 |
3 files changed, 10 insertions, 12 deletions
diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp index 9fd600567..7a431152e 100644 --- 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 aef0e85d6..02210baf4 100644 --- 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 0b2c0bce4..4306b3eb7 100644 --- 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(); |