diff options
Diffstat (limited to 'sources/pyside2/libpyside/pysideclassinfo.cpp')
-rw-r--r-- | sources/pyside2/libpyside/pysideclassinfo.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/sources/pyside2/libpyside/pysideclassinfo.cpp b/sources/pyside2/libpyside/pysideclassinfo.cpp index 4edf0fa91..bf2a1307f 100644 --- a/sources/pyside2/libpyside/pysideclassinfo.cpp +++ b/sources/pyside2/libpyside/pysideclassinfo.cpp @@ -51,10 +51,10 @@ extern "C" { -static PyObject* classInfoTpNew(PyTypeObject* subtype, PyObject* args, PyObject* kwds); -static int classInfoTpInit(PyObject*, PyObject*, PyObject*); -static void classInfoFree(void*); -static PyObject* classCall(PyObject*, PyObject*, PyObject*); +static PyObject *classInfoTpNew(PyTypeObject *subtype, PyObject *args, PyObject *kwds); +static int classInfoTpInit(PyObject *, PyObject *, PyObject *); +static void classInfoFree(void *); +static PyObject *classCall(PyObject *, PyObject *, PyObject *); static PyType_Slot PySideClassInfoType_slots[] = { {Py_tp_call, (void *)classCall}, @@ -89,8 +89,8 @@ PyObject *classCall(PyObject *self, PyObject *args, PyObject * /* kw */) return 0; } - PySideClassInfo* data = reinterpret_cast<PySideClassInfo*>(self); - PySideClassInfoPrivate* pData = data->d; + PySideClassInfo *data = reinterpret_cast<PySideClassInfo *>(self); + PySideClassInfoPrivate *pData = data->d; if (pData->m_alreadyWrapped) { PyErr_SetString(PyExc_TypeError, "This instance of ClassInfo() was already used to wrap an object"); @@ -106,7 +106,7 @@ PyObject *classCall(PyObject *self, PyObject *args, PyObject * /* kw */) return 0; } - PyTypeObject *klassType = reinterpret_cast<PyTypeObject*>(klass); + PyTypeObject *klassType = reinterpret_cast<PyTypeObject *>(klass); if (Shiboken::ObjectType::checkType(klassType)) { if (auto userData = PySide::retrieveTypeUserData(klassType)) { PySide::MetaObjectBuilder &mo = userData->mo; @@ -127,7 +127,7 @@ PyObject *classCall(PyObject *self, PyObject *args, PyObject * /* kw */) static PyObject *classInfoTpNew(PyTypeObject *subtype, PyObject * /* args */, PyObject * /* kwds */) { - PySideClassInfo* me = reinterpret_cast<PySideClassInfo*>(subtype->tp_alloc(subtype, 0)); + PySideClassInfo *me = reinterpret_cast<PySideClassInfo *>(subtype->tp_alloc(subtype, 0)); me->d = new PySideClassInfoPrivate; me->d->m_alreadyWrapped = false; @@ -135,18 +135,18 @@ static PyObject *classInfoTpNew(PyTypeObject *subtype, PyObject * /* args */, Py return reinterpret_cast<PyObject *>(me); } -int classInfoTpInit(PyObject* self, PyObject* args, PyObject* kwds) +int classInfoTpInit(PyObject *self, PyObject *args, PyObject *kwds) { if (PyTuple_Check(args) && PyTuple_Size(args) > 0) { PyErr_Format(PyExc_TypeError, "ClassInfo() takes exactly 0 positional arguments (%zd given)", PyTuple_Size(args)); return -1; } - PySideClassInfo* data = reinterpret_cast<PySideClassInfo*>(self); - PySideClassInfoPrivate* pData = data->d; + PySideClassInfo *data = reinterpret_cast<PySideClassInfo *>(self); + PySideClassInfoPrivate *pData = data->d; - PyObject* key; - PyObject* value; + PyObject *key; + PyObject *value; Py_ssize_t pos = 0; // PyDict_Next causes a segfault if kwds is empty @@ -166,8 +166,8 @@ int classInfoTpInit(PyObject* self, PyObject* args, PyObject* kwds) void classInfoFree(void *self) { - PyObject* pySelf = reinterpret_cast<PyObject*>(self); - PySideClassInfo* data = reinterpret_cast<PySideClassInfo*>(self); + auto pySelf = reinterpret_cast<PyObject *>(self); + auto data = reinterpret_cast<PySideClassInfo *>(self); delete data->d; Py_TYPE(pySelf)->tp_base->tp_free(self); @@ -179,7 +179,7 @@ void classInfoFree(void *self) namespace PySide { namespace ClassInfo { -void init(PyObject* module) +void init(PyObject *module) { if (PyType_Ready(PySideClassInfoTypeF()) < 0) return; @@ -188,14 +188,14 @@ void init(PyObject* module) PyModule_AddObject(module, CLASSINFO_CLASS_NAME, reinterpret_cast<PyObject *>(PySideClassInfoTypeF())); } -bool checkType(PyObject* pyObj) +bool checkType(PyObject *pyObj) { if (pyObj) return PyType_IsSubtype(Py_TYPE(pyObj), PySideClassInfoTypeF()); return false; } -QMap<QByteArray, QByteArray> getMap(PySideClassInfo* obj) +QMap<QByteArray, QByteArray> getMap(PySideClassInfo *obj) { return obj->d->m_data; } |