From 4b5ea05b6760e9020ab87f1d90071e1a2a8f9e99 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Wed, 19 Jul 2017 00:00:37 +0200 Subject: Port to KStandardAction::MoveToTrash It was introduced in kconfig(widgets) 5.25. Using the standard action results in less code and no need to hardcode the Del shortcut. Test Plan: - Change shortcut in System Settings -> Shortcuts -> Standard Shortcuts - Make sure the new shortcut is used by dolphin. Differential Revision: https://phabricator.kde.org/D6778 --- src/dolphinpart.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/dolphinpart.cpp') diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index ef9b300ca..0e771accb 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -254,7 +254,7 @@ void DolphinPart::slotSelectionChanged(const KFileItemList& selection) const bool hasSelection = !selection.isEmpty(); QAction* renameAction = actionCollection()->action(QStringLiteral("rename")); - QAction* moveToTrashAction = actionCollection()->action(QStringLiteral("move_to_trash")); + QAction* moveToTrashAction = actionCollection()->action(KStandardAction::name(KStandardAction::MoveToTrash)); QAction* deleteAction = actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile)); QAction* editMimeTypeAction = actionCollection()->action(QStringLiteral("editMimeType")); QAction* propertiesAction = actionCollection()->action(QStringLiteral("properties")); @@ -432,7 +432,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos, if (showDeleteAction && showMoveToTrashAction) { delete m_removeAction; m_removeAction = 0; - editActions.append(actionCollection()->action(QStringLiteral("move_to_trash"))); + editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::MoveToTrash))); editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile))); } else if (showDeleteAction && !showMoveToTrashAction) { editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile))); -- cgit v1.3