X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.h;h=5de038ff2da4478caaf63345c8f6b7e016c27d42;hp=feb36e84f19d494cfbf5fd53b6ce975c67e929bc;hb=00e1a9c29e792ba4d65dba21b7ba04131bcb13bc;hpb=921e54680da16fcf2adb7a90506875aceb6633a4 diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h index feb36e84..5de038ff 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,7 @@ * This is a subset of the API of KDE's KActionCollection. * ***************************************************************************/ -#ifndef ACTIONCOLLECTION_H_ -#define ACTIONCOLLECTION_H_ +#pragma once #ifndef HAVE_KDE @@ -96,11 +95,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 virtual void slotActionTriggered(); private slots: @@ -124,8 +119,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 +129,4 @@ public: explicit ActionCollection(QObject *parent) : KActionCollection(parent) {}; }; - -#endif - -#endif +#endif /* HAVE_KDE */