From bae6620f22d29f8e42e38f4dff3df3e44b3f639a Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Thu, 2 Jan 2020 11:17:18 -0700 Subject: Use newly-upstreamed rename dialog from KIO Summary: With the rename dialog upstreamed in D17595, we can use it from there. This will require the KF5 dep to be bumped to 5.67, which should be feasible given that we're at the very beginning of a new Applications cycle. Depends on D17595 Test Plan: 1. Dolphin Settings > uncheck "rename inline" 2. Rename one or more files. Observe that it still works Tests still pass. Reviewers: #dolphin, elvisangelaccio, meven Reviewed By: elvisangelaccio, meven Subscribers: meven, broulik, kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D17597 --- src/views/dolphinview.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/views/dolphinview.cpp') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 3437db7a7..cfece0fe6 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -31,7 +31,6 @@ #include "kitemviews/kitemlistcontroller.h" #include "kitemviews/kitemlistheader.h" #include "kitemviews/kitemlistselectionmanager.h" -#include "renamedialog.h" #include "versioncontrol/versioncontrolobserver.h" #include "viewproperties.h" #include "views/tooltips/tooltipmanager.h" @@ -52,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -637,8 +637,9 @@ void DolphinView::renameSelectedItems() connect(m_view, &DolphinItemListView::roleEditingFinished, this, &DolphinView::slotRoleEditingFinished); } else { - RenameDialog* dialog = new RenameDialog(this, items); - connect(dialog, &RenameDialog::renamingFinished, this, &DolphinView::slotRenameDialogRenamingFinished); + KIO::RenameFileDialog* dialog = new KIO::RenameFileDialog(items, this); + connect(dialog, &KIO::RenameFileDialog::renamingFinished, + this, &DolphinView::slotRenameDialogRenamingFinished); dialog->open(); } -- cgit v1.3