X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.cpp;h=89280532aa3ccc9aab80587d8eed39373d748b1a;hp=7dc03909f3916f0ff6b1efe92fe71aeccc82c410;hb=1a45f16a9734820fba42fe1db3f38dd1eee49df6;hpb=9d54503555534a2c554f09a33df6afa33d6308ec diff --git a/src/uisupport/actioncollection.cpp b/src/uisupport/actioncollection.cpp index 7dc03909..89280532 100644 --- a/src/uisupport/actioncollection.cpp +++ b/src/uisupport/actioncollection.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 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 * @@ -24,6 +24,7 @@ #include #include +#include #include "actioncollection.h" @@ -202,20 +203,19 @@ void ActionCollection::actionDestroyed(QObject *obj) unlistAction(action); } - -void ActionCollection::connectNotify(const char *signal) +void ActionCollection::connectNotify(const QMetaMethod &signal) { if (_connectHovered && _connectTriggered) return; - if (QMetaObject::normalizedSignature(SIGNAL(actionHovered(QAction *))) == signal) { + if (QMetaMethod::fromSignal(&ActionCollection::actionHovered) == signal) { if (!_connectHovered) { _connectHovered = true; foreach(QAction* action, actions()) connect(action, SIGNAL(hovered()), SLOT(slotActionHovered())); } } - else if (QMetaObject::normalizedSignature(SIGNAL(actionTriggered(QAction *))) == signal) { + else if (QMetaMethod::fromSignal(&ActionCollection::actionTriggered) == signal) { if (!_connectTriggered) { _connectTriggered = true; foreach(QAction* action, actions())