Merge branch 'master' of git.kde.org:dolphin

[dolphin.git] / src / dolphinremoveaction.cpp

diff --git a/src/dolphinremoveaction.cpp b/src/dolphinremoveaction.cpp
index 7d7c2f0439416f1e156ff1eabccc6de89b15dd80..10ab25112a7ecd2587de1bf89fcfa05c0722a625 100644 (file)
--- a/src/dolphinremoveaction.cpp
+++ b/src/dolphinremoveaction.cpp
@@ -29,7 +29,7 @@ DolphinRemoveAction::DolphinRemoveAction(QObject* parent, KActionCollection* col
     m_collection(collection)
 {
     update();
     m_collection(collection)
 {
     update();

-    connect(this, SIGNAL(triggered()), this, SLOT(slotRemoveActionTriggered()));
+    connect(this, &DolphinRemoveAction::triggered, this, &DolphinRemoveAction::slotRemoveActionTriggered);

 }
 
 void DolphinRemoveAction::slotRemoveActionTriggered()
 }
 
 void DolphinRemoveAction::slotRemoveActionTriggered()


@@ -45,17 +45,17 @@ void DolphinRemoveAction::update()
     // Using setText(action->text()) does not apply the &-shortcut.
     // This is only done until the original action has been shown at least once. To
     // bypass this issue, the text and &-shortcut is applied manually.
     // Using setText(action->text()) does not apply the &-shortcut.
     // This is only done until the original action has been shown at least once. To
     // bypass this issue, the text and &-shortcut is applied manually.

-    if (qApp->keyboardModifiers() & Qt::ShiftModifier) {
-        m_action = m_collection ? m_collection->action("delete") : 0;
+    if (qApp->queryKeyboardModifiers() & Qt::ShiftModifier) {
+        m_action = m_collection ? m_collection->action(QStringLiteral("delete")) : 0;

         setText(i18nc("@action:inmenu", "&Delete"));
     } else {
         setText(i18nc("@action:inmenu", "&Delete"));
     } else {

-        m_action = m_collection ? m_collection->action("move_to_trash") : 0;
+        m_action = m_collection ? m_collection->action(QStringLiteral("move_to_trash")) : 0;

         setText(i18nc("@action:inmenu", "&Move to Trash"));
     }
 
     if (m_action) {
         setIcon(m_action->icon());
         setText(i18nc("@action:inmenu", "&Move to Trash"));
     }
 
     if (m_action) {
         setIcon(m_action->icon());

-        setShortcuts(m_action->shortcuts());
+        m_collection->setDefaultShortcuts(this, m_action->shortcuts());

         setEnabled(m_action->isEnabled());
     }
 }
         setEnabled(m_action->isEnabled());
     }
 }