From 2eb682802fc5f48cd0d6fd03c44c0822160dfa51 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 21 Jul 2022 13:25:04 +0200 Subject: [PATCH] ActionContainer: Avoid usind sender() Change-Id: Ic83179de74943a20de6abf516aa43a5cf034de65 Reviewed-by: Eike Ziller Reviewed-by: --- src/plugins/coreplugin/actionmanager/actioncontainer.cpp | 5 ++--- src/plugins/coreplugin/actionmanager/actioncontainer_p.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp index 078fea7c056..0272d8d3104 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp @@ -369,11 +369,10 @@ void ActionContainerPrivate::clear() scheduleUpdate(); } -void ActionContainerPrivate::itemDestroyed() +void ActionContainerPrivate::itemDestroyed(QObject *sender) { - QObject *obj = sender(); for (Group &group : m_groups) { - if (group.items.removeAll(obj) > 0) + if (group.items.removeAll(sender) > 0) break; } } diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h index 8d5e55c3247..bfc6af3cb44 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h +++ b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h @@ -90,7 +90,7 @@ protected: private: void scheduleUpdate(); void update(); - void itemDestroyed(); + void itemDestroyed(QObject *sender); QList::const_iterator findGroup(Utils::Id groupId) const; QAction *insertLocation(QList::const_iterator group) const;