X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.h;h=5de038ff2da4478caaf63345c8f6b7e016c27d42;hb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a;hp=f7f5ff81ce9fcfc601ec122a0c6dfc5ae84aea1d;hpb=c55df5f2d765b100b7a1ead5a72202f969aa9581;p=quassel.git diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h index f7f5ff81..5de038ff 100644 --- a/src/uisupport/actioncollection.h +++ b/src/uisupport/actioncollection.h @@ -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 {