From eaff347f5a0ea6eedc3e098a478c03916bc45ed9 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 25 Mar 2024 11:15:10 +0100 Subject: libpyside: Fix spelling error in function name Amends 1270a9e82e5bc3bd53a1131698ece60403da1192. Task-number: PYSIDE-2646 Task-number: PYSIDE-2141 Pick-to: 6.5 Change-Id: Ib8a5146766166ec4fa7ae7b42ce6d52ccae0b3c6 Reviewed-by: Christian Tismer (cherry picked from commit 9529690b4ee7619f06226f445f839cac8e6bfde1) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 1d429a7b5d9b38efb8dbedefd71fc532b445adf8) --- sources/pyside6/libpyside/globalreceiverv2.cpp | 2 +- sources/pyside6/libpyside/signalmanager.cpp | 16 ++++++++-------- 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 09385645d..64d1e32b6 100644 --- a/sources/pyside6/libpyside/globalreceiverv2.cpp +++ b/sources/pyside6/libpyside/globalreceiverv2.cpp @@ -161,7 +161,7 @@ void DynamicSlotDataV2::onCallbackDestroyed(void *data) auto self = reinterpret_cast(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 2fb93fb3d..b46761284 100644 --- a/sources/pyside6/libpyside/signalmanager.cpp +++ b/sources/pyside6/libpyside/signalmanager.cpp @@ -229,9 +229,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; @@ -329,7 +329,7 @@ QObject *SignalManager::globalReceiver(QObject *sender, PyObject *callback, QObj void SignalManager::notifyGlobalReceiver(QObject *receiver) { reinterpret_cast(receiver)->notify(); - m_d->purgeEmptyGobalReceivers(); + m_d->purgeEmptyGlobalReceivers(); } void SignalManager::releaseGlobalReceiver(const QObject *source, QObject *receiver) @@ -337,15 +337,15 @@ void SignalManager::releaseGlobalReceiver(const QObject *source, QObject *receiv auto gr = static_cast(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) { @@ -370,7 +370,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; -- cgit v1.2.3