X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.cpp;h=89280532aa3ccc9aab80587d8eed39373d748b1a;hb=4e43a17088e8ff76c220bd8b4ebf37d9dbb4863a;hp=3d5fcf8e74ef7129c831e09496a0af230b674b5d;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf;p=quassel.git diff --git a/src/uisupport/actioncollection.cpp b/src/uisupport/actioncollection.cpp index 3d5fcf8e..89280532 100644 --- a/src/uisupport/actioncollection.cpp +++ b/src/uisupport/actioncollection.cpp @@ -203,31 +203,19 @@ void ActionCollection::actionDestroyed(QObject *obj) unlistAction(action); } -#if QT_VERSION >= 0x050000 void ActionCollection::connectNotify(const QMetaMethod &signal) -#else -void ActionCollection::connectNotify(const char *signal) -#endif { if (_connectHovered && _connectTriggered) return; -#if QT_VERSION >= 0x050000 if (QMetaMethod::fromSignal(&ActionCollection::actionHovered) == signal) { -#else - if (QMetaObject::normalizedSignature(SIGNAL(actionHovered(QAction *))) == signal) { -#endif if (!_connectHovered) { _connectHovered = true; foreach(QAction* action, actions()) connect(action, SIGNAL(hovered()), SLOT(slotActionHovered())); } } -#if QT_VERSION >= 0x050000 else if (QMetaMethod::fromSignal(&ActionCollection::actionTriggered) == signal) { -#else - else if (QMetaObject::normalizedSignature(SIGNAL(actionTriggered(QAction *))) == signal) { -#endif if (!_connectTriggered) { _connectTriggered = true; foreach(QAction* action, actions())