From 68bb0ec22af0290d298a87a15006f888b0aaf3b9 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Fri, 10 Mar 2017 19:31:33 +0100 Subject: Port to KStandardAction::DeleteFile Summary: It was introduced in kconfig 5.25 and it properly handles the shift+del shortcut (together with kxmlgui >= 5.30). This allows us to drop the custom delete shortcut as well as the shift+del workaround in DolphinMainWindow. Test Plan: Shift+Del still deletes files, without the 'ambiguous shortcut' warning dialog. Reviewers: emmanuelp Differential Revision: https://phabricator.kde.org/D5010 --- src/dolphinremoveaction.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/dolphinremoveaction.h') diff --git a/src/dolphinremoveaction.h b/src/dolphinremoveaction.h index 85f404318..fd8fc35d6 100644 --- a/src/dolphinremoveaction.h +++ b/src/dolphinremoveaction.h @@ -31,8 +31,8 @@ * A QAction that manages the delete based on the current state of * the Shift key or the parameter passed to update. * - * This class expects the presence of both the "move_to_trash" and "delete" - * actions in @ref collection. + * This class expects the presence of both the "move_to_trash" and + * KStandardAction::DeleteFile actions in @ref collection. */ class DOLPHIN_EXPORT DolphinRemoveAction : public QAction { -- cgit v1.3