X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.h;h=a675fddd306edc487fc10770df1ab994e8a25549;hb=d4b81a6d777de45611034b26bd89973d19e60c96;hp=22b074856abbc2c43981e13455fcae8f0554db1b;hpb=f13ee12590d103b3512ba74c0bef3b0817c4c947;p=quassel.git diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h index 22b07485..a675fddd 100644 --- a/src/uisupport/actioncollection.h +++ b/src/uisupport/actioncollection.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 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,7 +37,7 @@ class QWidget; class Action; class QAction; -class ActionCollection : public QObject +class UISUPPORT_EXPORT ActionCollection : public QObject { Q_OBJECT @@ -96,11 +97,7 @@ signals: void actionTriggered(QAction *action); protected slots: -#if QT_VERSION >= 0x050000 - virtual void connectNotify(const QMetaMethod &method); -#else - virtual void connectNotify(const char *signal); -#endif + virtual void connectNotify(const QMetaMethod &signal); virtual void slotActionTriggered(); private slots: @@ -124,8 +121,7 @@ int ActionCollection::count() const { return actions().count(); } bool ActionCollection::isEmpty() const { return actions().count(); } #else /* HAVE_KDE */ - -#include +# include class ActionCollection : public KActionCollection { @@ -135,7 +131,4 @@ public: explicit ActionCollection(QObject *parent) : KActionCollection(parent) {}; }; - -#endif - -#endif +#endif /* HAVE_KDE */