X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.h;h=10f7d933378d81f5e70755dcd99b4fe228af66a7;hp=c920adc5c9adf6245c569f49be1fa374528c5e57;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=eaa1bd30bc088e5cae6d8a742d7aedb3d8ff1897

diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h
index c920adc5..10f7d933 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  *
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include "uisupport-export.h"
+
 #ifndef HAVE_KDE
 
 #include <QDebug>
@@ -35,13 +37,13 @@ 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();
+    ~ActionCollection() override;
 
     /// Clears the entire action collection, deleting all actions.
     void clear();
@@ -73,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<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);
         if (receiver && member)
@@ -95,11 +97,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:
@@ -123,11 +121,7 @@ int ActionCollection::count() const { return actions().count(); }
 bool ActionCollection::isEmpty() const { return actions().count(); }
 
 #else /* HAVE_KDE */
-#  ifdef HAVE_KDE4
-#    include <KActionCollection>
-#  else
-#    include <KXmlGui/KActionCollection>
-#  endif
+#  include <KXmlGui/KActionCollection>
 
 class ActionCollection : public KActionCollection
 {