1 files changed, 44 insertions, 31 deletions

diff --git a/sources/pyside6/libpyside/pysideclassinfo.cpp b/sources/pyside6/libpyside/pysideclassinfo.cpp
index 60413be20..698cb1c76 100644
--- a/sources/pyside6/libpyside/pysideclassinfo.cpp
+++ b/sources/pyside6/libpyside/pysideclassinfo.cpp
@@ -14,7 +14,7 @@
 extern "C"
 {
 
-static PyTypeObject *createClassInfoType(void)
+static PyTypeObject *createClassInfoType()
 {
     auto typeSlots =
         PySide::ClassDecorator::Methods<PySide::ClassInfo::ClassInfoPrivate>::typeSlots();
@@ -36,7 +36,7 @@ PyTypeObject *PySideClassInfo_TypeF(void)
 
 }  // extern "C"
 
-namespace PySide { namespace ClassInfo {
+namespace PySide::ClassInfo {
 
 const char *ClassInfoPrivate::name() const
 {
@@ -51,25 +51,14 @@ PyObject *ClassInfoPrivate::tp_call(PyObject *self, PyObject *args, PyObject * /
 
     auto *pData = DecoratorPrivate::get<ClassInfoPrivate>(self);
 
-    if (pData->m_alreadyWrapped) {
-        PyErr_SetString(PyExc_TypeError, "This instance of ClassInfo() was already used to wrap an object");
-        return nullptr;
-    }
-
-    bool validClass = false;
+    if (pData->m_alreadyWrapped)
+        return PyErr_Format(PyExc_TypeError, "This instance of ClassInfo() was already used to wrap an object");
 
     PyTypeObject *klassType = reinterpret_cast<PyTypeObject *>(klass);
-    if (auto userData = PySide::retrieveTypeUserData(klassType)) {
-        PySide::MetaObjectBuilder &mo = userData->mo;
-        mo.addInfo(pData->m_data);
-        pData->m_alreadyWrapped = true;
-        validClass = true;
-    }
+    if (!PySide::ClassInfo::setClassInfo(klassType, pData->m_data))
+        return PyErr_Format(PyExc_TypeError, "This decorator can only be used on classes that are subclasses of QObject");
 
-    if (!validClass) {
-        PyErr_SetString(PyExc_TypeError, "This decorator can only be used on classes that are subclasses of QObject");
-        return nullptr;
-    }
+    pData->m_alreadyWrapped = true;
 
     Py_INCREF(klass);
     return klass;
@@ -79,7 +68,7 @@ int ClassInfoPrivate::tp_init(PyObject *self, PyObject *args, PyObject *kwds)
 {
     PyObject *infoDict = nullptr;
     auto size = PyTuple_Size(args);
-    if (size == 1 && !kwds) {
+    if (size == 1 && kwds == nullptr) {
         PyObject *tmp = PyTuple_GET_ITEM(args, 0);
         if (PyDict_Check(tmp))
             infoDict = tmp;
@@ -87,7 +76,7 @@ int ClassInfoPrivate::tp_init(PyObject *self, PyObject *args, PyObject *kwds)
         infoDict = kwds;
     }
 
-    if (!infoDict) {
+    if (infoDict == nullptr) {
         PyErr_Format(PyExc_TypeError, "ClassInfo() takes either keyword argument(s) or "
                                       "a single dictionary argument");
         return -1;
@@ -95,15 +84,17 @@ int ClassInfoPrivate::tp_init(PyObject *self, PyObject *args, PyObject *kwds)
 
     auto *pData = DecoratorPrivate::get<ClassInfoPrivate>(self);
 
-    PyObject *key;
-    PyObject *value;
+    PyObject *key{};
+    PyObject *value{};
     Py_ssize_t pos = 0;
 
     // PyDict_Next causes a segfault if kwds is empty
     if (PyDict_Size(infoDict) > 0) {
         while (PyDict_Next(infoDict, &pos, &key, &value)) {
             if (Shiboken::String::check(key) && Shiboken::String::check(value)) {
-                pData->m_data[Shiboken::String::toCString(key)] = Shiboken::String::toCString(value);
+                ClassInfo info{Shiboken::String::toCString(key),
+                               Shiboken::String::toCString(value)};
+                pData->m_data.append(info);
             } else {
                 PyErr_SetString(PyExc_TypeError, "All keys and values provided to ClassInfo() "
                                                  "must be strings");
@@ -112,7 +103,7 @@ int ClassInfoPrivate::tp_init(PyObject *self, PyObject *args, PyObject *kwds)
         }
     }
 
-    return PyErr_Occurred() ? -1 : 0;
+    return PyErr_Occurred() != nullptr ? -1 : 0;
 }
 
 static const char *ClassInfo_SignatureStrings[] = {
@@ -130,16 +121,38 @@ void init(PyObject *module)
 
 bool checkType(PyObject *pyObj)
 {
-    if (pyObj)
-        return PyType_IsSubtype(Py_TYPE(pyObj), PySideClassInfo_TypeF());
-    return false;
+    return pyObj != nullptr
+        && PyType_IsSubtype(Py_TYPE(pyObj), PySideClassInfo_TypeF()) != 0;
 }
 
-QMap<QByteArray, QByteArray> getMap(PyObject *obj)
+ClassInfoList getClassInfoList(PyObject *decorator)
 {
-    auto *pData = PySide::ClassDecorator::DecoratorPrivate::get<ClassInfoPrivate>(obj);
+    auto *pData = PySide::ClassDecorator::DecoratorPrivate::get<ClassInfoPrivate>(decorator);
     return pData->m_data;
 }
 
-} //namespace Property
-} //namespace PySide
+bool setClassInfo(PyTypeObject *type, const QByteArray &key,
+                  const QByteArray &value)
+{
+    auto *userData = PySide::retrieveTypeUserData(type);
+    const bool result = userData != nullptr;
+    if (result) {
+        PySide::MetaObjectBuilder &mo = userData->mo;
+        mo.addInfo(key, value);
+    }
+    return result;
+}
+
+bool setClassInfo(PyTypeObject *type, const ClassInfoList &list)
+{
+    auto *userData = PySide::retrieveTypeUserData(type);
+    const bool result = userData != nullptr;
+    if (result) {
+        PySide::MetaObjectBuilder &mo = userData->mo;
+        for (const auto &info : list)
+            mo.addInfo(info.key.constData(), info.value.constData());
+    }
+    return result;
+}
+
+} //namespace PySide::ClassInfo