From e061491209f7eba3bfaa79ae48b0a84d2c7cea2d Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 21 Mar 2024 17:37:04 +0100 Subject: [PATCH] QSignalSpy: inline connectToSignal() into its only caller MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Following the verify() Extract Method refactorings, this function has only one caller left, so it doesn't pull its weight anymore. Task-number: QTBUG-123544 Change-Id: I93a296a9be81ef9c3b702065e76ecc4b822a0a43 Reviewed-by: Ahmad Samir Reviewed-by: Mårten Nordheim --- src/testlib/qsignalspy.cpp | 19 ++++++------------- src/testlib/qsignalspy.h | 2 -- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/testlib/qsignalspy.cpp b/src/testlib/qsignalspy.cpp index 3f06a09deb..c56f992ad0 100644 --- a/src/testlib/qsignalspy.cpp +++ b/src/testlib/qsignalspy.cpp @@ -249,24 +249,17 @@ void QSignalSpy::init(ObjectSignal os) if (!os.obj) return; - if (!connectToSignal(os.obj, os.sig.methodIndex())) + const auto signalIndex = os.sig.methodIndex(); + const auto slotIndex = QObject::staticMetaObject.methodCount(); + if (!QMetaObject::connect(os.obj, signalIndex, + this, slotIndex, Qt::DirectConnection)) { + qWarning("QSignalSpy: QMetaObject::connect returned false. Unable to connect."); return; + } sig = os.sig.methodSignature(); } -bool QSignalSpy::connectToSignal(const QObject *sender, int sigIndex) -{ - static const int memberOffset = QObject::staticMetaObject.methodCount(); - const bool connected = QMetaObject::connect( - sender, sigIndex, this, memberOffset, Qt::DirectConnection, nullptr); - - if (!connected) - qWarning("QSignalSpy: QMetaObject::connect returned false. Unable to connect."); - - return connected; -} - void QSignalSpy::appendArgs(void **a) { QList list; diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h index 3fc6d9483a..f4c322ae71 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -72,8 +72,6 @@ private: Q_TESTLIB_EXPORT static ObjectSignal verify(const QObject *obj, QMetaMethod signal); Q_TESTLIB_EXPORT static ObjectSignal verify(const QObject *obj, const char *aSignal); - bool connectToSignal(const QObject *sender, int sigIndex); - Q_TESTLIB_EXPORT static QList makeArgs(const QMetaMethod &member, const QObject *obj); Q_TESTLIB_EXPORT void appendArgs(void **a);