diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-03-25 11:15:10 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-25 12:33:08 +0000 |
commit | 1d429a7b5d9b38efb8dbedefd71fc532b445adf8 (patch) | |
tree | e63f10fc7796c44aa98ede8d75f8a90f59415d42 | |
parent | c4741fea2aaf17885ff90e2036463f0a28467db3 (diff) |
libpyside: Fix spelling error in function name
Amends 1270a9e82e5bc3bd53a1131698ece60403da1192.
Task-number: PYSIDE-2646
Task-number: PYSIDE-2141
Pick-to: 6.6 6.5
Change-Id: Ib8a5146766166ec4fa7ae7b42ce6d52ccae0b3c6
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 9529690b4ee7619f06226f445f839cac8e6bfde1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | sources/pyside6/libpyside/globalreceiverv2.cpp | 2 | ||||
-rw-r--r-- | sources/pyside6/libpyside/signalmanager.cpp | 16 | ||||
-rw-r--r-- | sources/pyside6/libpyside/signalmanager.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sources/pyside6/libpyside/globalreceiverv2.cpp b/sources/pyside6/libpyside/globalreceiverv2.cpp index 5fcf224ea..51070b4ad 100644 --- a/sources/pyside6/libpyside/globalreceiverv2.cpp +++ b/sources/pyside6/libpyside/globalreceiverv2.cpp @@ -162,7 +162,7 @@ void DynamicSlotDataV2::onCallbackDestroyed(void *data) auto self = reinterpret_cast<DynamicSlotDataV2 *>(data); self->m_weakRef = nullptr; Py_BEGIN_ALLOW_THREADS - SignalManager::instance().deleteGobalReceiver(self->m_parent); + SignalManager::instance().deleteGlobalReceiver(self->m_parent); Py_END_ALLOW_THREADS } diff --git a/sources/pyside6/libpyside/signalmanager.cpp b/sources/pyside6/libpyside/signalmanager.cpp index c38fc2764..47ee5f618 100644 --- a/sources/pyside6/libpyside/signalmanager.cpp +++ b/sources/pyside6/libpyside/signalmanager.cpp @@ -231,9 +231,9 @@ struct SignalManager::SignalManagerPrivate SignalManagerPrivate() noexcept = default; ~SignalManagerPrivate() { clear(); } - void deleteGobalReceiver(const QObject *gr); + void deleteGlobalReceiver(const QObject *gr); void clear(); - void purgeEmptyGobalReceivers(); + void purgeEmptyGlobalReceivers(); GlobalReceiverV2Map m_globalReceivers; static SignalManager::QmlMetaCallErrorHandler m_qmlMetaCallErrorHandler; @@ -331,7 +331,7 @@ QObject *SignalManager::globalReceiver(QObject *sender, PyObject *callback, QObj void SignalManager::notifyGlobalReceiver(QObject *receiver) { reinterpret_cast<GlobalReceiverV2 *>(receiver)->notify(); - m_d->purgeEmptyGobalReceivers(); + m_d->purgeEmptyGlobalReceivers(); } void SignalManager::releaseGlobalReceiver(const QObject *source, QObject *receiver) @@ -339,15 +339,15 @@ void SignalManager::releaseGlobalReceiver(const QObject *source, QObject *receiv auto gr = static_cast<GlobalReceiverV2 *>(receiver); gr->decRef(source); if (gr->isEmpty()) - m_d->deleteGobalReceiver(gr); + m_d->deleteGlobalReceiver(gr); } -void SignalManager::deleteGobalReceiver(const QObject *gr) +void SignalManager::deleteGlobalReceiver(const QObject *gr) { - SignalManager::instance().m_d->deleteGobalReceiver(gr); + SignalManager::instance().m_d->deleteGlobalReceiver(gr); } -void SignalManager::SignalManagerPrivate::deleteGobalReceiver(const QObject *gr) +void SignalManager::SignalManagerPrivate::deleteGlobalReceiver(const QObject *gr) { for (auto it = m_globalReceivers.begin(), end = m_globalReceivers.end(); it != end; ++it) { if (it.value().get() == gr) { @@ -372,7 +372,7 @@ static bool isEmptyGlobalReceiver(const GlobalReceiverV2Ptr &g) return g->isEmpty(); } -void SignalManager::SignalManagerPrivate::purgeEmptyGobalReceivers() +void SignalManager::SignalManagerPrivate::purgeEmptyGlobalReceivers() { // Delete repetitively (see comment in clear()). while (true) { diff --git a/sources/pyside6/libpyside/signalmanager.h b/sources/pyside6/libpyside/signalmanager.h index df47c33b6..684a4e5e7 100644 --- a/sources/pyside6/libpyside/signalmanager.h +++ b/sources/pyside6/libpyside/signalmanager.h @@ -82,7 +82,7 @@ public: // Utility function to call a python method usign args received in qt_metacall static int callPythonMetaMethod(const QMetaMethod& method, void** args, PyObject* obj, bool isShortCuit); - static void deleteGobalReceiver(const QObject *globalReceiver); + static void deleteGlobalReceiver(const QObject *globalReceiver); private: struct SignalManagerPrivate; |