X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.h;h=5de038ff2da4478caaf63345c8f6b7e016c27d42;hb=4ce53949ab7d52a49ae79b8817bd3aa50fada0d1;hp=c920adc5c9adf6245c569f49be1fa374528c5e57;hpb=4988547cbb3c35016872a4ed8dbcc1376473ad80;p=quassel.git diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h index c920adc5..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 * @@ -95,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: @@ -123,11 +119,7 @@ int ActionCollection::count() const { return actions().count(); } bool ActionCollection::isEmpty() const { return actions().count(); } #else /* HAVE_KDE */ -# ifdef HAVE_KDE4 -# include -# else -# include -# endif +# include class ActionCollection : public KActionCollection {