modernize: Use auto where the type is clear from context

[quassel.git] / src / uisupport / actioncollection.h

diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h
index 5de038f..fa1ef24 100644 (file)
--- a/src/uisupport/actioncollection.h
+++ b/src/uisupport/actioncollection.h
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include "uisupport-export.h"
+
 #ifndef HAVE_KDE
 
 #include <QDebug>
@@ -35,13 +37,12 @@ class QWidget;
 class Action;
 class QAction;
 
-class ActionCollection : public QObject
+class UISUPPORT_EXPORT ActionCollection : public QObject
 {
     Q_OBJECT
 
 public:
     explicit ActionCollection(QObject *parent);
-    virtual ~ActionCollection();
 
     /// Clears the entire action collection, deleting all actions.
     void clear();
@@ -73,15 +74,15 @@ public:
 
     QAction *addAction(const QString &name, QAction *action);
     Action *addAction(const QString &name, Action *action);
-    Action *addAction(const QString &name, const QObject *receiver = 0, const char *member = 0);
+    Action *addAction(const QString &name, const QObject *receiver = nullptr, const char *member = nullptr);
     void removeAction(QAction *action);
     QAction *takeAction(QAction *action);
 
     /// Create new action under the given name, add it to the collection and connect its triggered(bool) signal to the specified receiver.
     template<class ActionType>
-    ActionType *add(const QString &name, const QObject *receiver = 0, const char *member = 0)
+    ActionType *add(const QString &name, const QObject *receiver = nullptr, const char *member = nullptr)
     {
-        ActionType *a = new ActionType(this);
+        auto *a = new ActionType(this);
         if (receiver && member)
             connect(a, SIGNAL(triggered(bool)), receiver, member);
         addAction(name, a);
@@ -95,7 +96,7 @@ signals:
     void actionTriggered(QAction *action);
 
 protected slots:
-    virtual void connectNotify(const QMetaMethod &signal);
+    void connectNotify(const QMetaMethod &signal) override;
     virtual void slotActionTriggered();
 
 private slots: