From cbff393dc1c60916d6bfe00ea28769a271160118 Mon Sep 17 00:00:00 2001
From: Ladislav Michl <ladis@linux-mips.org>
Date: Sun, 25 Feb 2024 18:24:27 +0100
Subject: [PATCH] Gui: PythonWrapper: Use getPyTypeObjectForTypeName
 consistently

---
 src/Gui/PythonWrapper.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Gui/PythonWrapper.cpp b/src/Gui/PythonWrapper.cpp
index a77115e2f6..56f18d2b87 100644
--- a/src/Gui/PythonWrapper.cpp
+++ b/src/Gui/PythonWrapper.cpp
@@ -576,9 +576,9 @@ QGraphicsObject* PythonWrapper::toQGraphicsObject(const Py::Object& pyobject)
 Py::Object PythonWrapper::fromQImage(const QImage& img)
 {
 #if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
-    PyObject* pyobj = Shiboken::Conversions::copyToPython(getPyTypeObjectForTypeName<QImage>(),
-                              const_cast<QImage*>(&img));
-    if (pyobj) {
+    auto type = getPyTypeObjectForTypeName<QImage>();
+    if (type) {
+        PyObject* pyobj = Shiboken::Conversions::copyToPython(type, const_cast<QImage*>(&img));
         return Py::asObject(pyobj);
     }
 #else
@@ -600,9 +600,9 @@ Py::Object PythonWrapper::fromQIcon(const QIcon* icon)
 {
 #if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
     const char* typeName = typeid(*const_cast<QIcon*>(icon)).name();
-    PyObject* pyobj = Shiboken::Object::newObject(getPyTypeObjectForTypeName<QIcon>(),
-                              const_cast<QIcon*>(icon), true, false, typeName);
-    if (pyobj) {
+    auto type = getPyTypeObjectForTypeName<QIcon>();
+    if (type) {
+        PyObject* pyobj = Shiboken::Object::newObject(type, const_cast<QIcon*>(icon), true, false, typeName);
         return Py::asObject(pyobj);
     }
 #else
@@ -624,9 +624,9 @@ Py::Object PythonWrapper::fromQDir(const QDir& dir)
 {
 #if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
     const char* typeName = typeid(dir).name();
-    PyObject* pyobj = Shiboken::Object::newObject(getPyTypeObjectForTypeName<QDir>(),
-        const_cast<QDir*>(&dir), false, false, typeName);
-    if (pyobj) {
+    auto type = getPyTypeObjectForTypeName<QDir>();
+    if (type) {
+        PyObject* pyobj = Shiboken::Object::newObject(type, const_cast<QDir*>(&dir), false, false, typeName);
         return Py::asObject(pyobj);
     }
 #else