From 76330db700a0f038a5df496fb0b9369498b51404 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Sat, 16 Jul 2022 13:37:12 +0200
Subject: [PATCH] Import: replace PyObject_IsTrue with Base::asBoolean

---
 src/Mod/Import/App/AppImportPy.cpp    | 12 ++++++------
 src/Mod/Import/Gui/AppImportGuiPy.cpp | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Mod/Import/App/AppImportPy.cpp b/src/Mod/Import/App/AppImportPy.cpp
index 0d4ef8122f..772d29ad2f 100644
--- a/src/Mod/Import/App/AppImportPy.cpp
+++ b/src/Mod/Import/App/AppImportPy.cpp
@@ -239,11 +239,11 @@ private:
 #if 1
             ImportOCAFExt ocaf(hDoc, pcDoc, file.fileNamePure());
             if (merge != Py_None)
-                ocaf.setMerge(PyObject_IsTrue(merge) ? true : false);
+                ocaf.setMerge(Base::asBoolean(merge));
             if (importHidden != Py_None)
-                ocaf.setImportHiddenObject(PyObject_IsTrue(importHidden) ? true : false);
+                ocaf.setImportHiddenObject(Base::asBoolean(importHidden));
             if (useLinkGroup != Py_None)
-                ocaf.setUseLinkGroup(PyObject_IsTrue(useLinkGroup) ? true : false);
+                ocaf.setUseLinkGroup(Base::asBoolean(useLinkGroup));
             if (mode >= 0)
                 ocaf.setMode(mode);
             ocaf.loadShapes();
@@ -320,11 +320,11 @@ private:
             }
 
             Import::ExportOCAF2 ocaf(hDoc);
-            if ((PyObject_IsTrue(legacy)? false : true) || !ocaf.canFallback(objs)) {
+            if (!Base::asBoolean(legacy) || !ocaf.canFallback(objs)) {
                 if (exportHidden != Py_None)
-                    ocaf.setExportHiddenObject(PyObject_IsTrue(exportHidden) ? true : false);
+                    ocaf.setExportHiddenObject(Base::asBoolean(exportHidden));
                 if (keepPlacement != Py_None)
-                    ocaf.setKeepPlacement(PyObject_IsTrue(keepPlacement) ? true : false);
+                    ocaf.setKeepPlacement(Base::asBoolean(keepPlacement));
                 ocaf.exportObjects(objs);
             }
             else {
diff --git a/src/Mod/Import/Gui/AppImportGuiPy.cpp b/src/Mod/Import/Gui/AppImportGuiPy.cpp
index 8d6bc08038..eb5cddc018 100644
--- a/src/Mod/Import/Gui/AppImportGuiPy.cpp
+++ b/src/Mod/Import/Gui/AppImportGuiPy.cpp
@@ -515,11 +515,11 @@ private:
 
             FC_DURATION_PLUS(d1,t);
             if (merge != Py_None)
-                ocaf.setMerge(PyObject_IsTrue(merge) ? true : false);
+                ocaf.setMerge(Base::asBoolean(merge));
             if (importHidden != Py_None)
-                ocaf.setImportHiddenObject(PyObject_IsTrue(importHidden) ? true : false);
+                ocaf.setImportHiddenObject(Base::asBoolean(importHidden));
             if (useLinkGroup != Py_None)
-                ocaf.setUseLinkGroup(PyObject_IsTrue(useLinkGroup) ? true : false);
+                ocaf.setUseLinkGroup(Base::asBoolean(useLinkGroup));
             ocaf.setMode(mode);
             auto ret = ocaf.loadShapes();
             hApp->Close(hDoc);
@@ -592,11 +592,11 @@ private:
             }
 
             Import::ExportOCAF2 ocaf(hDoc, &getShapeColors);
-            if ((PyObject_IsTrue(legacy) ? false : true) || !ocaf.canFallback(objs)) {
+            if (!Base::asBoolean(legacy) || !ocaf.canFallback(objs)) {
                 if (exportHidden != Py_None)
-                    ocaf.setExportHiddenObject(PyObject_IsTrue(exportHidden) ? true : false);
+                    ocaf.setExportHiddenObject(Base::asBoolean(exportHidden));
                 if (keepPlacement != Py_None)
-                    ocaf.setKeepPlacement(PyObject_IsTrue(keepPlacement) ? true : false);
+                    ocaf.setKeepPlacement(Base::asBoolean(keepPlacement));
                 ocaf.exportObjects(objs);
             }
             else {