From a4311711eb89e3f9833a05edf3debdf7563a104f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 10 Sep 2021 11:29:19 +0200 Subject: Define SbkObjectType to be a PyTypeObject SbkObjectType was a struct embedding a PyTypeObject after fec1611e9f42c1f0a13eb33474df2ed8ee480842. Remove that and make the types equvivalent, which allows for removing many reinterpret_casts. SbkObjectType is left as a typedef for client code snippets. [ChangeLog][shiboken6] SbkObjectType is now a typedef for PyTypeObject. Task-number: PYSIDE-535 Change-Id: I44812311ccbbe0988c38e34c47d16f6874f8d1cf Reviewed-by: Christian Tismer --- sources/pyside6/libpyside/pyside.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'sources/pyside6/libpyside/pyside.cpp') diff --git a/sources/pyside6/libpyside/pyside.cpp b/sources/pyside6/libpyside/pyside.cpp index 990b45694..59b7f54e9 100644 --- a/sources/pyside6/libpyside/pyside.cpp +++ b/sources/pyside6/libpyside/pyside.cpp @@ -240,14 +240,9 @@ void initDynamicMetaObject(SbkObjectType *type, const QMetaObject *base, std::si PySide::PyName::qtStaticMetaObject(), pyMetaObject); } -TypeUserData *retrieveTypeUserData(SbkObjectType *sbkTypeObj) -{ - return reinterpret_cast(Shiboken::ObjectType::getTypeUserData(sbkTypeObj)); -} - TypeUserData *retrieveTypeUserData(PyTypeObject *pyTypeObj) { - return retrieveTypeUserData(reinterpret_cast(pyTypeObj)); + return reinterpret_cast(Shiboken::ObjectType::getTypeUserData(pyTypeObj)); } TypeUserData *retrieveTypeUserData(PyObject *pyObj) -- cgit v1.2.3