From fa5cb840699b435a4e5a97fc714471b8339dbedd Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 21 Mar 2024 17:37:04 +0100 Subject: [PATCH] QSignalSpy: inline init() into its only caller Following the verify() Extract Method refactorings, this function has only one caller left, so it doesn't pull its weight anymore, esp. considering that it'll be exported soon. Task-number: QTBUG-123544 Change-Id: I1690b4b6e5a0e0c56fcc9c34544fca3b34e2f9a6 Reviewed-by: Edward Welbourne --- src/testlib/qsignalspy.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h index ad152b162ec..d47b148d092 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -136,16 +136,11 @@ private: { if (!os.obj) return; - init(os.obj, os.sig); - } - - void init(const QObject *obj, QMetaMethod signal) - { - initArgs(signal, obj); - if (!connectToSignal(obj, signal.methodIndex())) + initArgs(os.sig, os.obj); + if (!connectToSignal(os.obj, os.sig.methodIndex())) return; - sig = signal.methodSignature(); + sig = os.sig.methodSignature(); } bool connectToSignal(const QObject *sender, int sigIndex)