diff options
Diffstat (limited to 'sources/pyside2/libpyside/signalmanager.cpp')
-rw-r--r-- | sources/pyside2/libpyside/signalmanager.cpp | 132 |
1 files changed, 66 insertions, 66 deletions
diff --git a/sources/pyside2/libpyside/signalmanager.cpp b/sources/pyside2/libpyside/signalmanager.cpp index 8925ffd35..0895cc682 100644 --- a/sources/pyside2/libpyside/signalmanager.cpp +++ b/sources/pyside2/libpyside/signalmanager.cpp @@ -82,26 +82,26 @@ namespace { static PyObject *metaObjectAttr = 0; - static int callMethod(QObject* object, int id, void** args); - static PyObject* parseArguments(const QList< QByteArray >& paramTypes, void** args); - static bool emitShortCircuitSignal(QObject* source, int signalIndex, PyObject* args); + static int callMethod(QObject *object, int id, void **args); + static PyObject *parseArguments(const QList< QByteArray >& paramTypes, void **args); + static bool emitShortCircuitSignal(QObject *source, int signalIndex, PyObject *args); #ifdef IS_PY3K - static void destroyMetaObject(PyObject* obj) + static void destroyMetaObject(PyObject *obj) { - void* ptr = PyCapsule_GetPointer(obj, 0); - auto meta = reinterpret_cast<PySide::MetaObjectBuilder*>(ptr); - SbkObject* wrapper = Shiboken::BindingManager::instance().retrieveWrapper(meta); + void *ptr = PyCapsule_GetPointer(obj, 0); + auto meta = reinterpret_cast<PySide::MetaObjectBuilder *>(ptr); + SbkObject *wrapper = Shiboken::BindingManager::instance().retrieveWrapper(meta); if (wrapper) Shiboken::BindingManager::instance().releaseWrapper(wrapper); delete meta; } #else - static void destroyMetaObject(void* obj) + static void destroyMetaObject(void *obj) { - auto meta = reinterpret_cast<PySide::MetaObjectBuilder*>(obj); - SbkObject* wrapper = Shiboken::BindingManager::instance().retrieveWrapper(meta); + auto meta = reinterpret_cast<PySide::MetaObjectBuilder *>(obj); + SbkObject *wrapper = Shiboken::BindingManager::instance().retrieveWrapper(meta); if (wrapper) Shiboken::BindingManager::instance().releaseWrapper(wrapper); delete meta; @@ -118,7 +118,7 @@ PyObjectWrapper::PyObjectWrapper() Py_XINCREF(m_me); } -PyObjectWrapper::PyObjectWrapper(PyObject* me) +PyObjectWrapper::PyObjectWrapper(PyObject *me) : m_me(me) { Py_XINCREF(m_me); @@ -148,18 +148,18 @@ void PyObjectWrapper::reset(PyObject *o) m_me = o; } -PyObjectWrapper& PyObjectWrapper::operator=(const PySide::PyObjectWrapper& other) +PyObjectWrapper &PyObjectWrapper::operator=(const PySide::PyObjectWrapper &other) { reset(other.m_me); return *this; } -PyObjectWrapper::operator PyObject*() const +PyObjectWrapper::operator PyObject *() const { return m_me; } -QDataStream &operator<<(QDataStream& out, const PyObjectWrapper& myObj) +QDataStream &operator<<(QDataStream &out, const PyObjectWrapper &myObj) { if (Py_IsInitialized() == 0) { qWarning() << "Stream operator for PyObject called without python interpreter."; @@ -173,9 +173,9 @@ QDataStream &operator<<(QDataStream& out, const PyObjectWrapper& myObj) Shiboken::AutoDecRef pickleModule(PyImport_ImportModule("pickle")); reduce_func = PyObject_GetAttrString(pickleModule, "dumps"); } - Shiboken::AutoDecRef repr(PyObject_CallFunctionObjArgs(reduce_func, (PyObject*)myObj, NULL)); + Shiboken::AutoDecRef repr(PyObject_CallFunctionObjArgs(reduce_func, (PyObject *)myObj, NULL)); if (repr.object()) { - const char* buff = 0; + const char *buff = nullptr; Py_ssize_t size = 0; if (PyBytes_Check(repr.object())) { buff = PyBytes_AS_STRING(repr.object()); @@ -190,7 +190,7 @@ QDataStream &operator<<(QDataStream& out, const PyObjectWrapper& myObj) return out; } -QDataStream &operator>>(QDataStream& in, PyObjectWrapper& myObj) +QDataStream &operator>>(QDataStream &in, PyObjectWrapper &myObj) { if (Py_IsInitialized() == 0) { qWarning() << "Stream operator for PyObject called without python interpreter."; @@ -225,7 +225,7 @@ struct SignalManager::SignalManagerPrivate SignalManagerPrivate() { - m_globalReceivers = SharedMap( new QMap<QByteArray, GlobalReceiverV2*>() ); + m_globalReceivers = SharedMap( new QMap<QByteArray, GlobalReceiverV2 *>() ); } ~SignalManagerPrivate() @@ -246,17 +246,17 @@ static void clearSignalManager() PySide::SignalManager::instance().clear(); } -static void PyObject_PythonToCpp_PyObject_PTR(PyObject* pyIn, void* cppOut) +static void PyObject_PythonToCpp_PyObject_PTR(PyObject *pyIn, void *cppOut) { - *((PyObject**)cppOut) = pyIn; + *reinterpret_cast<PyObject **>(cppOut) = pyIn; } -static PythonToCppFunc is_PyObject_PythonToCpp_PyObject_PTR_Convertible(PyObject* pyIn) +static PythonToCppFunc is_PyObject_PythonToCpp_PyObject_PTR_Convertible(PyObject *pyIn) { return PyObject_PythonToCpp_PyObject_PTR; } -static PyObject* PyObject_PTR_CppToPython_PyObject(const void* cppIn) +static PyObject *PyObject_PTR_CppToPython_PyObject(const void *cppIn) { - PyObject* pyOut = (PyObject*)cppIn; + auto pyOut = reinterpret_cast<PyObject *>(const_cast<void *>(cppIn)); if (pyOut) Py_INCREF(pyOut); return pyOut; @@ -273,7 +273,7 @@ SignalManager::SignalManager() : m_d(new SignalManagerPrivate) qRegisterMetaTypeStreamOperators<PyObjectWrapper>("PyObjectWrapper"); qRegisterMetaTypeStreamOperators<PyObjectWrapper>("PySide::PyObjectWrapper"); - SbkConverter* converter = Shiboken::Conversions::createConverter(&PyBaseObject_Type, 0); + SbkConverter *converter = Shiboken::Conversions::createConverter(&PyBaseObject_Type, nullptr); Shiboken::Conversions::setCppPointerToPythonFunction(converter, PyObject_PTR_CppToPython_PyObject); Shiboken::Conversions::setPythonToCppPointerFunctions(converter, PyObject_PythonToCpp_PyObject_PTR, is_PyObject_PythonToCpp_PyObject_PTR_Convertible); Shiboken::Conversions::registerConverterName(converter, PYTHON_TYPE); @@ -298,17 +298,17 @@ SignalManager::~SignalManager() delete m_d; } -SignalManager& SignalManager::instance() +SignalManager &SignalManager::instance() { static SignalManager me; return me; } -QObject* SignalManager::globalReceiver(QObject *sender, PyObject *callback) +QObject *SignalManager::globalReceiver(QObject *sender, PyObject *callback) { SharedMap globalReceivers = m_d->m_globalReceivers; QByteArray hash = GlobalReceiverV2::hash(callback); - GlobalReceiverV2* gr = 0; + GlobalReceiverV2 *gr = nullptr; auto it = globalReceivers->find(hash); if (it == globalReceivers->end()) { gr = new GlobalReceiverV2(callback, globalReceivers); @@ -323,7 +323,7 @@ QObject* SignalManager::globalReceiver(QObject *sender, PyObject *callback) gr->incRef(sender); } - return reinterpret_cast<QObject*>(gr); + return reinterpret_cast<QObject *>(gr); } int SignalManager::countConnectionsWith(const QObject *object) @@ -336,23 +336,23 @@ int SignalManager::countConnectionsWith(const QObject *object) return count; } -void SignalManager::notifyGlobalReceiver(QObject* receiver) +void SignalManager::notifyGlobalReceiver(QObject *receiver) { - reinterpret_cast<GlobalReceiverV2*>(receiver)->notify(); + reinterpret_cast<GlobalReceiverV2 *>(receiver)->notify(); } -void SignalManager::releaseGlobalReceiver(const QObject* source, QObject* receiver) +void SignalManager::releaseGlobalReceiver(const QObject *source, QObject *receiver) { - GlobalReceiverV2* gr = reinterpret_cast<GlobalReceiverV2*>(receiver); + auto gr = reinterpret_cast<GlobalReceiverV2 *>(receiver); gr->decRef(source); } -int SignalManager::globalReceiverSlotIndex(QObject* receiver, const char* signature) const +int SignalManager::globalReceiverSlotIndex(QObject *receiver, const char *signature) const { - return reinterpret_cast<GlobalReceiverV2*>(receiver)->addSlot(signature); + return reinterpret_cast<GlobalReceiverV2 *>(receiver)->addSlot(signature); } -bool SignalManager::emitSignal(QObject* source, const char* signal, PyObject* args) +bool SignalManager::emitSignal(QObject *source, const char *signal, PyObject *args) { if (!Signal::checkQtSignal(signal)) return false; @@ -372,13 +372,13 @@ bool SignalManager::emitSignal(QObject* source, const char* signal, PyObject* ar return false; } -int SignalManager::qt_metacall(QObject* object, QMetaObject::Call call, int id, void** args) +int SignalManager::qt_metacall(QObject *object, QMetaObject::Call call, int id, void **args) { - const QMetaObject* metaObject = object->metaObject(); - PySideProperty* pp = 0; - PyObject* pp_name = 0; + const QMetaObject *metaObject = object->metaObject(); + PySideProperty *pp = nullptr; + PyObject *pp_name = nullptr; QMetaProperty mp; - PyObject* pySelf = 0; + PyObject *pySelf = nullptr; int methodCount = metaObject->methodCount(); int propertyCount = metaObject->propertyCount(); @@ -389,7 +389,7 @@ int SignalManager::qt_metacall(QObject* object, QMetaObject::Call call, int id, } Shiboken::GilState gil; - pySelf = (PyObject*)Shiboken::BindingManager::instance().retrieveWrapper(object); + pySelf = reinterpret_cast<PyObject *>(Shiboken::BindingManager::instance().retrieveWrapper(object)); Q_ASSERT(pySelf); pp_name = Shiboken::String::fromCString(mp.name()); pp = Property::getObject(pySelf, pp_name); @@ -504,22 +504,22 @@ int SignalManager::qt_metacall(QObject* object, QMetaObject::Call call, int id, return id; } -int SignalManager::callPythonMetaMethod(const QMetaMethod& method, void** args, PyObject* pyMethod, bool isShortCuit) +int SignalManager::callPythonMetaMethod(const QMetaMethod &method, void **args, PyObject *pyMethod, bool isShortCuit) { Q_ASSERT(pyMethod); Shiboken::GilState gil; - PyObject* pyArguments = 0; + PyObject *pyArguments = nullptr; if (isShortCuit){ - pyArguments = reinterpret_cast<PyObject*>(args[1]); + pyArguments = reinterpret_cast<PyObject *>(args[1]); } else { pyArguments = parseArguments(method.parameterTypes(), args); } if (pyArguments) { - Shiboken::Conversions::SpecificConverter* retConverter = NULL; - const char* returnType = method.typeName(); + Shiboken::Conversions::SpecificConverter *retConverter = nullptr; + const char *returnType = method.typeName(); if (returnType && std::strcmp("", returnType) && std::strcmp("void", returnType)) { retConverter = new Shiboken::Conversions::SpecificConverter(returnType); if (!retConverter || !*retConverter) { @@ -543,13 +543,13 @@ int SignalManager::callPythonMetaMethod(const QMetaMethod& method, void** args, return -1; } -bool SignalManager::registerMetaMethod(QObject* source, const char* signature, QMetaMethod::MethodType type) +bool SignalManager::registerMetaMethod(QObject *source, const char *signature, QMetaMethod::MethodType type) { int ret = registerMetaMethodGetIndex(source, signature, type); return (ret != -1); } -static MetaObjectBuilder *metaBuilderFromDict(PyObject* dict) +static MetaObjectBuilder *metaBuilderFromDict(PyObject *dict) { if (!dict || !PyDict_Contains(dict, metaObjectAttr)) return nullptr; @@ -562,33 +562,33 @@ static MetaObjectBuilder *metaBuilderFromDict(PyObject* dict) #endif } -int SignalManager::registerMetaMethodGetIndex(QObject* source, const char* signature, QMetaMethod::MethodType type) +int SignalManager::registerMetaMethodGetIndex(QObject *source, const char *signature, QMetaMethod::MethodType type) { if (!source) { qWarning("SignalManager::registerMetaMethodGetIndex(\"%s\") called with source=nullptr.", signature); return -1; } - const QMetaObject* metaObject = source->metaObject(); + const QMetaObject *metaObject = source->metaObject(); int methodIndex = metaObject->indexOfMethod(signature); // Create the dynamic signal is needed if (methodIndex == -1) { - SbkObject* self = Shiboken::BindingManager::instance().retrieveWrapper(source); + SbkObject *self = Shiboken::BindingManager::instance().retrieveWrapper(source); if (!Shiboken::Object::hasCppWrapper(self)) { qWarning() << "Invalid Signal signature:" << signature; return -1; } else { - PyObject *pySelf = reinterpret_cast<PyObject*>(self); - PyObject* dict = self->ob_dict; + auto pySelf = reinterpret_cast<PyObject *>(self); + PyObject *dict = self->ob_dict; MetaObjectBuilder *dmo = metaBuilderFromDict(dict); // Create a instance meta object if (!dmo) { dmo = new MetaObjectBuilder(Py_TYPE(pySelf), metaObject); #ifdef IS_PY3K - PyObject* pyDmo = PyCapsule_New(dmo, 0, destroyMetaObject); + PyObject *pyDmo = PyCapsule_New(dmo, 0, destroyMetaObject); #else - PyObject* pyDmo = PyCObject_FromVoidPtr(dmo, destroyMetaObject); + PyObject *pyDmo = PyCObject_FromVoidPtr(dmo, destroyMetaObject); #endif PyObject_SetAttr(pySelf, metaObjectAttr, pyDmo); @@ -604,12 +604,12 @@ int SignalManager::registerMetaMethodGetIndex(QObject* source, const char* signa return methodIndex; } -const QMetaObject* SignalManager::retrieveMetaObject(PyObject *self) +const QMetaObject *SignalManager::retrieveMetaObject(PyObject *self) { Shiboken::GilState gil; Q_ASSERT(self); - MetaObjectBuilder *builder = metaBuilderFromDict(reinterpret_cast<SbkObject*>(self)->ob_dict); + MetaObjectBuilder *builder = metaBuilderFromDict(reinterpret_cast<SbkObject *>(self)->ob_dict); if (!builder) builder = &(retrieveTypeUserData(self)->mo); @@ -618,9 +618,9 @@ const QMetaObject* SignalManager::retrieveMetaObject(PyObject *self) namespace { -static int callMethod(QObject* object, int id, void** args) +static int callMethod(QObject *object, int id, void **args) { - const QMetaObject* metaObject = object->metaObject(); + const QMetaObject *metaObject = object->metaObject(); QMetaMethod method = metaObject->method(id); if (method.methodType() == QMetaMethod::Signal) { @@ -628,7 +628,7 @@ static int callMethod(QObject* object, int id, void** args) QMetaObject::activate(object, id, args); } else { Shiboken::GilState gil; - PyObject* self = (PyObject*)Shiboken::BindingManager::instance().retrieveWrapper(object); + auto self = reinterpret_cast<PyObject *>(Shiboken::BindingManager::instance().retrieveWrapper(object)); QByteArray methodName = method.methodSignature(); methodName.truncate(methodName.indexOf('(')); Shiboken::AutoDecRef pyMethod(PyObject_GetAttrString(self, methodName)); @@ -638,14 +638,14 @@ static int callMethod(QObject* object, int id, void** args) } -static PyObject* parseArguments(const QList<QByteArray>& paramTypes, void** args) +static PyObject *parseArguments(const QList<QByteArray>& paramTypes, void **args) { int argsSize = paramTypes.count(); - PyObject* preparedArgs = PyTuple_New(argsSize); + PyObject *preparedArgs = PyTuple_New(argsSize); for (int i = 0, max = argsSize; i < max; ++i) { - void* data = args[i+1]; - const char* dataType = paramTypes[i].constData(); + void *data = args[i+1]; + const char *dataType = paramTypes[i].constData(); Shiboken::Conversions::SpecificConverter converter(dataType); if (converter) { PyTuple_SET_ITEM(preparedArgs, i, converter.toPython(data)); @@ -658,9 +658,9 @@ static PyObject* parseArguments(const QList<QByteArray>& paramTypes, void** args return preparedArgs; } -static bool emitShortCircuitSignal(QObject* source, int signalIndex, PyObject* args) +static bool emitShortCircuitSignal(QObject *source, int signalIndex, PyObject *args) { - void* signalArgs[2] = {0, args}; + void *signalArgs[2] = {nullptr, args}; source->qt_metacall(QMetaObject::InvokeMetaMethod, signalIndex, signalArgs); return true; } |