From f22bfcef9b14997f742f5e7f6afce88a3532b2f8 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Thu, 22 Feb 2024 08:34:39 +0100
Subject: [PATCH] =?UTF-8?q?Gui:=20fixes=20#12540:=20=E2=80=98ModuleShiboke?=
 =?UTF-8?q?n=E2=80=99=20was=20not=20declared=20in=20this=20scope?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Gui/PythonWrapper.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Gui/PythonWrapper.cpp b/src/Gui/PythonWrapper.cpp
index 2c78794a55..59dbe332da 100644
--- a/src/Gui/PythonWrapper.cpp
+++ b/src/Gui/PythonWrapper.cpp
@@ -145,8 +145,8 @@
 #include "UiLoader.h"
 #include "MetaTypes.h"
 
-#ifdef HAVE_SHIBOKEN
-#ifdef HAVE_SHIBOKEN2
+// NOLINTBEGIN
+#if defined(HAVE_SHIBOKEN2)
 PyTypeObject** SbkPySide2_QtCoreTypes           = nullptr;
 PyTypeObject** SbkPySide2_QtGuiTypes            = nullptr;
 PyTypeObject** SbkPySide2_QtWidgetsTypes        = nullptr;
@@ -157,8 +157,11 @@ constexpr auto &SbkPySide_QtGuiTypes            = SbkPySide2_QtGuiTypes;
 constexpr auto &SbkPySide_QtWidgetsTypes        = SbkPySide2_QtWidgetsTypes;
 constexpr auto &SbkPySide_QtPrintSupportTypes   = SbkPySide2_QtPrintSupportTypes;
 constexpr auto &SbkPySide_QtUiToolsTypes        = SbkPySide2_QtUiToolsTypes;
+#if !defined(HAVE_PYSIDE2)
+constexpr const char* ModuleShiboken            = "shiboken2";
+#endif
 constexpr const char* ModulePySide              = "PySide2";
-#else
+#elif defined(HAVE_SHIBOKEN6)
 PyTypeObject** SbkPySide6_QtCoreTypes           = nullptr;
 PyTypeObject** SbkPySide6_QtGuiTypes            = nullptr;
 PyTypeObject** SbkPySide6_QtWidgetsTypes        = nullptr;
@@ -169,8 +172,10 @@ constexpr auto &SbkPySide_QtGuiTypes            = SbkPySide6_QtGuiTypes;
 constexpr auto &SbkPySide_QtWidgetsTypes        = SbkPySide6_QtWidgetsTypes;
 constexpr auto &SbkPySide_QtPrintSupportTypes   = SbkPySide6_QtPrintSupportTypes;
 constexpr auto &SbkPySide_QtUiToolsTypes        = SbkPySide6_QtUiToolsTypes;
-constexpr const char* ModulePySide              = "PySide6";
+#if !defined(HAVE_PYSIDE6)
+constexpr const char* ModuleShiboken            = "shiboken6";
 #endif
+constexpr const char* ModulePySide              = "PySide6";
 #else
 static PyTypeObject** SbkPySide_DummyTypes;
 constexpr auto &SbkPySide_QtCoreTypes           = SbkPySide_DummyTypes;
@@ -186,6 +191,7 @@ constexpr const char* ModuleShiboken            = "shiboken6";
 constexpr const char* ModulePySide              = "PySide6";
 # endif
 #endif
+// NOLINTEND
 
 using namespace Gui;