X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.cpp;h=50001262c67665cd75a98faa21e29fc908db3588;hp=89280532aa3ccc9aab80587d8eed39373d748b1a;hb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e;hpb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a

diff --git a/src/uisupport/actioncollection.cpp b/src/uisupport/actioncollection.cpp
index 89280532..50001262 100644
--- a/src/uisupport/actioncollection.cpp
+++ b/src/uisupport/actioncollection.cpp
@@ -37,11 +37,6 @@ ActionCollection::ActionCollection(QObject *parent) : QObject(parent)
 }
 
 
-ActionCollection::~ActionCollection()
-{
-}
-
-
 void ActionCollection::clear()
 {
     _actionByName.clear();
@@ -73,7 +68,7 @@ Action *ActionCollection::addAction(const QString &name, Action *action)
 
 Action *ActionCollection::addAction(const QString &name, const QObject *receiver, const char *member)
 {
-    Action *a = new Action(this);
+    auto *a = new Action(this);
     if (receiver && member)
         connect(a, SIGNAL(triggered(bool)), receiver, member);
     return addAction(name, a);
@@ -137,7 +132,7 @@ void ActionCollection::removeAction(QAction *action)
 QAction *ActionCollection::takeAction(QAction *action)
 {
     if (!unlistAction(action))
-        return 0;
+        return nullptr;
 
     foreach(QWidget *widget, _associatedWidgets) {
         widget->removeAction(action);
@@ -156,7 +151,7 @@ void ActionCollection::readSettings()
     foreach(const QString &name, _actionByName.keys()) {
         if (!savedShortcuts.contains(name))
             continue;
-        Action *action = qobject_cast<Action *>(_actionByName.value(name));
+        auto *action = qobject_cast<Action *>(_actionByName.value(name));
         if (action)
             action->setShortcut(s.loadShortcut(name), Action::ActiveShortcut);
     }
@@ -167,7 +162,7 @@ void ActionCollection::writeSettings() const
 {
     ShortcutSettings s;
     foreach(const QString &name, _actionByName.keys()) {
-        Action *action = qobject_cast<Action *>(_actionByName.value(name));
+        auto *action = qobject_cast<Action *>(_actionByName.value(name));
         if (!action)
             continue;
         if (!action->isShortcutConfigurable())
@@ -181,7 +176,7 @@ void ActionCollection::writeSettings() const
 
 void ActionCollection::slotActionTriggered()
 {
-    QAction *action = qobject_cast<QAction *>(sender());
+    auto *action = qobject_cast<QAction *>(sender());
     if (action)
         emit actionTriggered(action);
 }
@@ -189,7 +184,7 @@ void ActionCollection::slotActionTriggered()
 
 void ActionCollection::slotActionHovered()
 {
-    QAction *action = qobject_cast<QAction *>(sender());
+    auto *action = qobject_cast<QAction *>(sender());
     if (action)
         emit actionHovered(action);
 }
@@ -198,7 +193,7 @@ void ActionCollection::slotActionHovered()
 void ActionCollection::actionDestroyed(QObject *obj)
 {
     // remember that this is not an QAction anymore at this point
-    QAction *action = static_cast<QAction *>(obj);
+    auto *action = static_cast<QAction *>(obj);
 
     unlistAction(action);
 }