8 files changed, 12 insertions, 34 deletions
diff --git a/sources/pyside6/PySide6/QtQml/pysideqmlregistertype.cpp b/sources/pyside6/PySide6/QtQml/pysideqmlregistertype.cpp
index 82824c77a..aa89579be 100644
--- a/sources/pyside6/PySide6/QtQml/pysideqmlregistertype.cpp
+++ b/sources/pyside6/PySide6/QtQml/pysideqmlregistertype.cpp
@@ -405,12 +405,8 @@ static PyType_Spec PropertyListType_spec = {
 
 PyTypeObject *PropertyListTypeF(void)
 {
-    static PyTypeObject *type = nullptr;
-    if (!type) {
-        PyObject *bases = Py_BuildValue("(O)", PySidePropertyTypeF());
-        type = (PyTypeObject *)SbkType_FromSpecWithBases(&PropertyListType_spec, bases);
-        Py_XDECREF(bases);
-    }
+    static Shiboken::AutoDecRef bases(Py_BuildValue("(O)", PySidePropertyTypeF()));
+    static auto *type = SbkType_FromSpecWithBases(&PropertyListType_spec, bases);
     return type;
 }
 
@@ -674,8 +670,7 @@ static PyType_Spec QtQml_VolatileBoolType_spec = {
 
 PyTypeObject *QtQml_VolatileBoolTypeF(void)
 {
-    static PyTypeObject *type = reinterpret_cast<PyTypeObject *>(
-        SbkType_FromSpec(&QtQml_VolatileBoolType_spec));
+    static auto *type = SbkType_FromSpec(&QtQml_VolatileBoolType_spec);
     return type;
 }
 
diff --git a/sources/pyside6/libpyside/pysideclassinfo.cpp b/sources/pyside6/libpyside/pysideclassinfo.cpp
index 01f72968d..beb2d6150 100644
--- a/sources/pyside6/libpyside/pysideclassinfo.cpp
+++ b/sources/pyside6/libpyside/pysideclassinfo.cpp
@@ -74,8 +74,7 @@ static PyType_Spec PySideClassInfoType_spec = {
 
 PyTypeObject *PySideClassInfoTypeF(void)
 {
-    static PyTypeObject *type =
-        reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&PySideClassInfoType_spec));
+    static auto *type = SbkType_FromSpec(&PySideClassInfoType_spec);
     return type;
 }
 
diff --git a/sources/pyside6/libpyside/pysidemetafunction.cpp b/sources/pyside6/libpyside/pysidemetafunction.cpp
index e66732d78..64f50bc62 100644
--- a/sources/pyside6/libpyside/pysidemetafunction.cpp
+++ b/sources/pyside6/libpyside/pysidemetafunction.cpp
@@ -76,8 +76,7 @@ static PyType_Spec PySideMetaFunctionType_spec = {
 
 PyTypeObject *PySideMetaFunctionTypeF(void)
 {
-    static PyTypeObject *type = reinterpret_cast<PyTypeObject *>(
-        SbkType_FromSpec(&PySideMetaFunctionType_spec));
+    static auto *type = SbkType_FromSpec(&PySideMetaFunctionType_spec);
     return type;
 }
 
diff --git a/sources/pyside6/libpyside/pysideproperty.cpp b/sources/pyside6/libpyside/pysideproperty.cpp
index ea0fba7e5..70c59a89a 100644
--- a/sources/pyside6/libpyside/pysideproperty.cpp
+++ b/sources/pyside6/libpyside/pysideproperty.cpp
@@ -118,8 +118,7 @@ static PyType_Spec PySidePropertyType_spec = {
 
 PyTypeObject *PySidePropertyTypeF(void)
 {
-    static PyTypeObject *type = reinterpret_cast<PyTypeObject *>(
-        SbkType_FromSpec(&PySidePropertyType_spec));
+    static auto *type = SbkType_FromSpec(&PySidePropertyType_spec);
     return type;
 }
 
diff --git a/sources/pyside6/libpyside/pysideqflags.cpp b/sources/pyside6/libpyside/pysideqflags.cpp
index 9e1ad6142..08b7e1479 100644
--- a/sources/pyside6/libpyside/pysideqflags.cpp
+++ b/sources/pyside6/libpyside/pysideqflags.cpp
@@ -183,13 +183,7 @@ namespace QFlags
             SbkNewQFlagsType_slots[idx].pfunc = numberMethods[idx].pfunc;
         }
         newspec.slots = SbkNewQFlagsType_spec.slots;
-        PyTypeObject *type = (PyTypeObject *)SbkType_FromSpec(&newspec);
-        Py_TYPE(type) = &PyType_Type;
-
-        if (PyType_Ready(type) < 0)
-            return nullptr;
-
-        return type;
+        return SbkType_FromSpec(&newspec);
     }
 
     PySideQFlagsObject *newObject(long value, PyTypeObject *type)
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;
 }
 
diff --git a/sources/pyside6/libpyside/pysideslot.cpp b/sources/pyside6/libpyside/pysideslot.cpp
index cd81a9a39..bad94db6b 100644
--- a/sources/pyside6/libpyside/pysideslot.cpp
+++ b/sources/pyside6/libpyside/pysideslot.cpp
@@ -87,8 +87,7 @@ static PyType_Spec PySideSlotType_spec = {
 
 static PyTypeObject *PySideSlotTypeF()
 {
-    static PyTypeObject *type = reinterpret_cast<PyTypeObject *>(
-        SbkType_FromSpec(&PySideSlotType_spec));
+    static auto *type = SbkType_FromSpec(&PySideSlotType_spec);
     return type;
 }
 
diff --git a/sources/pyside6/libpyside/pysideweakref.cpp b/sources/pyside6/libpyside/pysideweakref.cpp
index bf37bbab7..ef34826f2 100644
--- a/sources/pyside6/libpyside/pysideweakref.cpp
+++ b/sources/pyside6/libpyside/pysideweakref.cpp
@@ -67,8 +67,7 @@ static PyType_Spec PySideCallableObjectType_spec = {
 
 static PyTypeObject *PySideCallableObjectTypeF()
 {
-    static PyTypeObject *type =
-        reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&PySideCallableObjectType_spec));
+    static auto *type = SbkType_FromSpec(&PySideCallableObjectType_spec);
     return type;
 }