X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuisupport%2Factioncollection.h;h=fa1ef24cef0f22528df70883dc7a5f167dc46157;hb=f9cd845a9119e0abf450a91d8802f5c1822dd638;hp=a675fddd306edc487fc10770df1ab994e8a25549;hpb=92fc8c5b119111a35ab8423c3cbde5b2a022badf;p=quassel.git

diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h
index a675fddd..fa1ef24c 100644
--- a/src/uisupport/actioncollection.h
+++ b/src/uisupport/actioncollection.h
@@ -43,7 +43,6 @@ class UISUPPORT_EXPORT ActionCollection : public QObject
 
 public:
     explicit ActionCollection(QObject *parent);
-    virtual ~ActionCollection();
 
     /// Clears the entire action collection, deleting all actions.
     void clear();
@@ -75,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);
@@ -97,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: