From fbddb1a61600a1a33a1d3088ec47743164038e85 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 24 Aug 2018 13:54:16 +0200 Subject: libpyside: Fix spelling of retrive->retrieve Rename method and fix comments. Change-Id: I7765826540de0bf03ac41214d357e605d8e84bcf Reviewed-by: Christian Tismer --- sources/pyside2/libpyside/globalreceiverv2.h | 4 ++-- sources/pyside2/libpyside/signalmanager.cpp.in | 2 +- sources/pyside2/libpyside/signalmanager.h | 2 +- sources/shiboken2/generator/shiboken2/cppgenerator.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sources') diff --git a/sources/pyside2/libpyside/globalreceiverv2.h b/sources/pyside2/libpyside/globalreceiverv2.h index 880719d6f..ceb325c40 100644 --- a/sources/pyside2/libpyside/globalreceiverv2.h +++ b/sources/pyside2/libpyside/globalreceiverv2.h @@ -122,14 +122,14 @@ public: int refCount(const QObject* link) const; /** - * Use to retrive the unique hash of this GlobalReceiver object + * Use to retrieve the unique hash of this GlobalReceiver object * * @return a string with a unique id based on GlobalReceiver contents **/ QByteArray hash() const; /** - * Use to retrive the unique hash of the PyObject based on GlobalReceiver rules + * Use to retrieve the unique hash of the PyObject based on GlobalReceiver rules * * @param callback The Python callable object used to calculate the id * @return a string with a unique id based on GlobalReceiver contents diff --git a/sources/pyside2/libpyside/signalmanager.cpp.in b/sources/pyside2/libpyside/signalmanager.cpp.in index c67bc6369..390f472db 100644 --- a/sources/pyside2/libpyside/signalmanager.cpp.in +++ b/sources/pyside2/libpyside/signalmanager.cpp.in @@ -617,7 +617,7 @@ bool SignalManager::hasConnectionWith(const QObject *object) return m_d->m_globalReceiver.hasConnectionWith(object); } -const QMetaObject* SignalManager::retriveMetaObject(PyObject *self) +const QMetaObject* SignalManager::retrieveMetaObject(PyObject *self) { Shiboken::GilState gil; DynamicQMetaObject *mo = 0; diff --git a/sources/pyside2/libpyside/signalmanager.h b/sources/pyside2/libpyside/signalmanager.h index 5948a7df1..22aea37c3 100644 --- a/sources/pyside2/libpyside/signalmanager.h +++ b/sources/pyside2/libpyside/signalmanager.h @@ -84,7 +84,7 @@ public: static int registerMetaMethodGetIndex(QObject* source, const char* signature, QMetaMethod::MethodType type); // used to discovery metaobject - static const QMetaObject* retriveMetaObject(PyObject* self); + static const QMetaObject* retrieveMetaObject(PyObject* self); // Used to discovery if SignalManager was connected with object "destroyed()" signal. int countConnectionsWith(const QObject *object); diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp index 582af0483..f868c281d 100644 --- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp @@ -1000,7 +1000,7 @@ void CppGenerator::writeMetaObjectMethod(QTextStream& s, const AbstractMetaClass s << INDENT << "SbkObject* pySelf = Shiboken::BindingManager::instance().retrieveWrapper(this);" << endl; s << INDENT << "if (pySelf == NULL)" << endl; s << INDENT << INDENT << "return " << metaClass->qualifiedCppName() << "::metaObject();" << endl; - s << INDENT << "return PySide::SignalManager::retriveMetaObject(reinterpret_cast(pySelf));" << endl; + s << INDENT << "return PySide::SignalManager::retrieveMetaObject(reinterpret_cast(pySelf));" << endl; s << '}' << endl << endl; // qt_metacall function -- cgit v1.2.3