X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.cpp;h=89280532aa3ccc9aab80587d8eed39373d748b1a;hb=d4b81a6d777de45611034b26bd89973d19e60c96;hp=6715388b5fab8e4efd736a206d22bd4d8e28ed2c;hpb=b06a827aea68b050bf23c37e0162189a94595ee9;p=quassel.git diff --git a/src/uisupport/actioncollection.cpp b/src/uisupport/actioncollection.cpp index 6715388b..89280532 100644 --- a/src/uisupport/actioncollection.cpp +++ b/src/uisupport/actioncollection.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 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 * @@ -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())