X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.h;h=fa1ef24cef0f22528df70883dc7a5f167dc46157;hp=feb36e84f19d494cfbf5fd53b6ce975c67e929bc;hb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e;hpb=921e54680da16fcf2adb7a90506875aceb6633a4

diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h
index feb36e84..fa1ef24c 100644
--- a/src/uisupport/actioncollection.h
+++ b/src/uisupport/actioncollection.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,8 +20,9 @@
  * This is a subset of the API of KDE's KActionCollection.                 *
  ***************************************************************************/
 
-#ifndef ACTIONCOLLECTION_H_
-#define ACTIONCOLLECTION_H_
+#pragma once
+
+#include "uisupport-export.h"
 
 #ifndef HAVE_KDE
 
@@ -36,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();
@@ -74,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);
@@ -96,11 +96,7 @@ signals:
     void actionTriggered(QAction *action);
 
 protected slots:
-#if QT_VERSION >= 0x050000
-    virtual void connectNotify(const QMetaMethod &signal);
-#else
-    virtual void connectNotify(const char *signal);
-#endif
+    void connectNotify(const QMetaMethod &signal) override;
     virtual void slotActionTriggered();
 
 private slots:
@@ -124,8 +120,7 @@ int ActionCollection::count() const { return actions().count(); }
 bool ActionCollection::isEmpty() const { return actions().count(); }
 
 #else /* HAVE_KDE */
-
-#include <KActionCollection>
+#  include <KXmlGui/KActionCollection>
 
 class ActionCollection : public KActionCollection
 {
@@ -135,7 +130,4 @@ public:
     explicit ActionCollection(QObject *parent) : KActionCollection(parent) {};
 };
 
-
-#endif
-
-#endif
+#endif /* HAVE_KDE */