From d1aa7b3d199ec8243522acecc31e992e439a55ea Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 12 Mar 2024 14:45:57 +0100 Subject: [PATCH] Remove QObjectPrivate::isSender/senderList, no longer used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only QAccessibleWidget was using them, and this was changed some time ago. No point in keeping dead code. Change-Id: I14bc40e6d87df234987e82385ce13433c2b82744 Reviewed-by: Thiago Macieira Reviewed-by: Mårten Nordheim --- src/corelib/kernel/qobject.cpp | 34 ---------------------------------- src/corelib/kernel/qobject_p.h | 2 -- 2 files changed, 36 deletions(-) diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index dba3529b947..56e1d3d7f19 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -226,27 +226,6 @@ static void computeOffsets(const QMetaObject *metaobject, int *signalOffset, int } } -// Used by QAccessibleWidget -bool QObjectPrivate::isSender(const QObject *receiver, const char *signal) const -{ - Q_Q(const QObject); - int signal_index = signalIndex(signal); - ConnectionData *cd = connections.loadRelaxed(); - if (signal_index < 0 || !cd) - return false; - QMutexLocker locker(signalSlotLock(q)); - if (signal_index < cd->signalVectorCount()) { - const QObjectPrivate::Connection *c = cd->signalVector.loadRelaxed()->at(signal_index).first.loadRelaxed(); - - while (c) { - if (c->receiver.loadRelaxed() == receiver) - return true; - c = c->nextConnectionList.loadRelaxed(); - } - } - return false; -} - // Used by QAccessibleWidget QObjectList QObjectPrivate::receiverList(const char *signal) const { @@ -268,19 +247,6 @@ QObjectList QObjectPrivate::receiverList(const char *signal) const return returnValue; } -// Used by QAccessibleWidget -QObjectList QObjectPrivate::senderList() const -{ - QObjectList returnValue; - ConnectionData *cd = connections.loadRelaxed(); - if (cd) { - QMutexLocker locker(signalSlotLock(q_func())); - for (Connection *c = cd->senders; c; c = c->next) - returnValue << c->sender; - } - return returnValue; -} - inline void QObjectPrivate::ensureConnectionData() { if (connections.loadRelaxed()) diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 54647313853..0ab9bf02edf 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -141,9 +141,7 @@ public: void moveToThread_helper(); void setThreadData_helper(QThreadData *currentData, QThreadData *targetData, QBindingStatus *status); - bool isSender(const QObject *receiver, const char *signal) const; QObjectList receiverList(const char *signal) const; - QObjectList senderList() const; inline void ensureConnectionData(); inline void addConnection(int signal, Connection *c);