Shiboken: Change type(SbkType_FromSpec) to PyType_Object

This step prepares the transition of type generation
to PyPy compatibility.

[ChangeLog][shiboken6] SbkType_FromSpec() has been changed to
return a PyType_Object *.

Task-number: PYSIDE-535
Change-Id: I74e2e527e66a41f1a9f3f911f44d641139371889
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

1 files changed, 3 insertions, 9 deletions

diff --git a/sources/pyside6/libpyside/pysidesignal.cpp b/sources/pyside6/libpyside/pysidesignal.cpp
index c565ca99a..2ecae7287 100644
--- a/sources/pyside6/libpyside/pysidesignal.cpp
+++ b/sources/pyside6/libpyside/pysidesignal.cpp
@@ -129,7 +129,7 @@ static PyType_Slot PySideMetaSignalType_slots[] = {
 static PyType_Spec PySideMetaSignalType_spec = {
     "2:PySide6.QtCore.MetaSignal",
     0,
-    // sizeof(PyHeapTypeObject) is filled in by SbkType_FromSpecWithBases
+    // sizeof(PyHeapTypeObject) is filled in by SbkType_FromSpec
     // which calls PyType_Ready which calls inherit_special.
     0,
     Py_TPFLAGS_DEFAULT,
@@ -139,12 +139,7 @@ static PyType_Spec PySideMetaSignalType_spec = {
 
 static PyTypeObject *PySideMetaSignalTypeF(void)
 {
-    static PyTypeObject *type = nullptr;
-    if (!type) {
-        PyObject *bases = Py_BuildValue("(O)", &PyType_Type);
-        type = (PyTypeObject *)SbkType_FromSpecWithBases(&PySideMetaSignalType_spec, bases);
-        Py_XDECREF(bases);
-    }
+    static auto *type = SbkType_FromSpec(&PySideMetaSignalType_spec);
     return type;
 }
 
@@ -209,8 +204,7 @@ static PyType_Spec PySideSignalInstanceType_spec = {
 
 PyTypeObject *PySideSignalInstanceTypeF(void)
 {
-    static PyTypeObject *type =
-        reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&PySideSignalInstanceType_spec));
+    static auto *type = SbkType_FromSpec(&PySideSignalInstanceType_spec);
     return type;
 }