From 01761798a93bc93f3e16f8fb68fe5739ab66d98b Mon Sep 17 00:00:00 2001 From: Dawit Alemayehu Date: Sat, 9 Feb 2013 15:56:51 -0500 Subject: - Factored out the Delete/Move To Trash action into own class. - Updated both the Dolphin KPart and context menu to use the new DolphinRemoveAction class to manage "Delete/Move to Trash" actions. See also https://git.reviewboard.kde.org/r/107509/. REVIEW: 108802 --- src/dolphincontextmenu.h | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'src/dolphincontextmenu.h') diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h index 1c65fab13..160f08804 100644 --- a/src/dolphincontextmenu.h +++ b/src/dolphincontextmenu.h @@ -36,6 +36,7 @@ class QAction; class DolphinMainWindow; class KFileItemActions; class KFileItemListProperties; +class DolphinRemoveAction; /** * @brief Represents the context menu which appears when doing a right @@ -94,13 +95,6 @@ protected: virtual void keyPressEvent(QKeyEvent *ev); virtual void keyReleaseEvent(QKeyEvent *ev); -private slots: - /** - * Triggers the 'Delete'-action if the shift-key has been pressed, otherwise - * the 'Move to Trash'-action gets triggered. - */ - void slotRemoveActionTriggered(); - private: void openTrashContextMenu(); void openTrashItemContextMenu(); @@ -148,20 +142,6 @@ private: */ void addCustomActions(); - /** - * Updates m_removeAction to represent the 'Delete'-action if the shift-key - * has been pressed or the selection is not local. Otherwise it represents - * the 'Move to Trash'-action. - */ - void updateRemoveAction(); - - /** - * @return True if a moving to the trash should be done instead of - * deleting the selected items. - * @see updateRemoveAction(), slotRemoveActionTriggered() - */ - bool moveToTrash() const; - private: struct Entry { @@ -197,8 +177,7 @@ private: Command m_command; - bool m_shiftPressed; - QAction* m_removeAction; // Action that represents either 'Move To Trash' or 'Delete' + DolphinRemoveAction* m_removeAction; // Action that represents either 'Move To Trash' or 'Delete' }; #endif -- cgit v1.3