[CLAZY] Fixed all level 1 and level 2 warnings with small exceptions

[dolphin.git] / src / dolphinremoveaction.cpp

diff --git a/src/dolphinremoveaction.cpp b/src/dolphinremoveaction.cpp
index 200fc407db299bb13a02645ce44803b4e3a87f62..c91d74579d76a30c69a1654146ea676bc7eb8e01 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()


@@ -46,15 +46,16 @@ void DolphinRemoveAction::update()
     // 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) {
     // 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;
+        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"));
     }
 
         setText(i18nc("@action:inmenu", "&Move to Trash"));
     }
 

-   if (m_action) {
+    if (m_action) {

         setIcon(m_action->icon());
         setIcon(m_action->icon());

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

     }
 }
     }
 }