1 files changed, 30 insertions, 23 deletions
diff --git a/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.cpp b/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.cpp
index d498f5bb0..ca3dfebed 100644
--- a/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.cpp
+++ b/sources/pyside6/PySide6/QtQml/pysideqmlvolatilebool.cpp
@@ -3,6 +3,7 @@
 
 #include "pysideqmlvolatilebool.h"
 
+#include <pep384ext.h>
 #include <signature.h>
 
 #include <QtCore/QDebug>
@@ -30,8 +31,7 @@ QtQml_VolatileBoolObject_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     if (ok < 0)
         return nullptr;
 
-    QtQml_VolatileBoolObject *self
-            = reinterpret_cast<QtQml_VolatileBoolObject *>(type->tp_alloc(type, 0));
+    auto *self = PepExt_TypeCallAlloc<QtQml_VolatileBoolObject>(type, 0);
 
     if (self != nullptr)
         self->flag = new AtomicBool(ok);
@@ -49,7 +49,10 @@ static void QtQml_VolatileBoolObject_dealloc(PyObject *self)
 static PyObject *
 QtQml_VolatileBoolObject_get(QtQml_VolatileBoolObject *self)
 {
-    return *self->flag ? Py_True : Py_False;
+    if (*self->flag) {
+        Py_RETURN_TRUE;
+    }
+    Py_RETURN_FALSE;
 }
 
 static PyObject *
@@ -63,10 +66,8 @@ QtQml_VolatileBoolObject_set(QtQml_VolatileBoolObject *self, PyObject *args)
     }
 
     ok = PyObject_IsTrue(value);
-    if (ok < 0) {
-        PyErr_SetString(PyExc_TypeError, "Not a boolean value.");
-        return nullptr;
-    }
+    if (ok < 0)
+        return PyErr_Format(PyExc_TypeError, "Not a boolean value.");
 
     *self->flag = ok > 0;
 
@@ -113,25 +114,31 @@ QtQml_VolatileBoolObject_str(QtQml_VolatileBoolObject *self)
     return s;
 }
 
-static PyType_Slot QtQml_VolatileBoolType_slots[] = {
-    {Py_tp_repr, reinterpret_cast<void *>(QtQml_VolatileBoolObject_repr)},
-    {Py_tp_str, reinterpret_cast<void *>(QtQml_VolatileBoolObject_str)},
-    {Py_tp_methods, reinterpret_cast<void *>(QtQml_VolatileBoolObject_methods)},
-    {Py_tp_new, reinterpret_cast<void *>(QtQml_VolatileBoolObject_new)},
-    {Py_tp_dealloc, reinterpret_cast<void *>(QtQml_VolatileBoolObject_dealloc)},
-    {0, 0}
-};
-static PyType_Spec QtQml_VolatileBoolType_spec = {
-    "2:PySide6.QtQml.VolatileBool",
-    sizeof(QtQml_VolatileBoolObject),
-    0,
-    Py_TPFLAGS_DEFAULT,
-    QtQml_VolatileBoolType_slots,
-};
+static PyTypeObject *createVolatileBoolType()
+{
+    PyType_Slot QtQml_VolatileBoolType_slots[] = {
+        {Py_tp_repr, reinterpret_cast<void *>(QtQml_VolatileBoolObject_repr)},
+        {Py_tp_str, reinterpret_cast<void *>(QtQml_VolatileBoolObject_str)},
+        {Py_tp_methods, reinterpret_cast<void *>(QtQml_VolatileBoolObject_methods)},
+        {Py_tp_new, reinterpret_cast<void *>(QtQml_VolatileBoolObject_new)},
+        {Py_tp_dealloc, reinterpret_cast<void *>(QtQml_VolatileBoolObject_dealloc)},
+        {0, 0}
+    };
+
+    PyType_Spec QtQml_VolatileBoolType_spec = {
+        "2:PySide6.QtQml.VolatileBool",
+        sizeof(QtQml_VolatileBoolObject),
+        0,
+        Py_TPFLAGS_DEFAULT,
+        QtQml_VolatileBoolType_slots,
+    };
+
+    return SbkType_FromSpec(&QtQml_VolatileBoolType_spec);
+}
 
 PyTypeObject *QtQml_VolatileBool_TypeF(void)
 {
-    static auto *type = SbkType_FromSpec(&QtQml_VolatileBoolType_spec);
+    static auto *type = createVolatileBoolType();
     return type;
 }