X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.h;h=10f7d933378d81f5e70755dcd99b4fe228af66a7;hp=a675fddd306edc487fc10770df1ab994e8a25549;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=92fc8c5b119111a35ab8423c3cbde5b2a022badf diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h index a675fddd..10f7d933 100644 --- a/src/uisupport/actioncollection.h +++ b/src/uisupport/actioncollection.h @@ -43,7 +43,7 @@ class UISUPPORT_EXPORT ActionCollection : public QObject public: explicit ActionCollection(QObject *parent); - virtual ~ActionCollection(); + ~ActionCollection() override; /// Clears the entire action collection, deleting all actions. void clear(); @@ -75,13 +75,13 @@ 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 - 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); if (receiver && member) @@ -97,7 +97,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: