X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.h;h=a76fc04a0329dda815dbcf26ac121da3ce855ce3;hb=bd2fb9596ddd44d486a3ff4914bcac045210c498;hp=5774eb35be40f4251be0e1a333d73b738c95156a;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e;p=quassel.git diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h index 5774eb35..a76fc04a 100644 --- a/src/uisupport/actioncollection.h +++ b/src/uisupport/actioncollection.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2015 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -23,7 +23,7 @@ #ifndef ACTIONCOLLECTION_H_ #define ACTIONCOLLECTION_H_ -#ifndef HAVE_KDE +#ifndef HAVE_KDE4 #include #include @@ -96,7 +96,11 @@ 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: @@ -119,7 +123,7 @@ private: int ActionCollection::count() const { return actions().count(); } bool ActionCollection::isEmpty() const { return actions().count(); } -#else /* HAVE_KDE */ +#else /* HAVE_KDE4 */ #include