shiboken6: Fix generated code indentation in writePythonToCppTypeConversion()

Add indentation in case the conversion function needs to
be checked and explanatory comment.

Task-number: PYSIDE-1605
Change-Id: If992d2a06590d434e3dbec8326e4231da302b335
Reviewed-by: Christian Tismer <tismer@stackless.com>

1 files changed, 17 insertions, 17 deletions

diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
index 806a1e895..d2237b973 100644
--- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
@@ -2651,34 +2651,34 @@ void CppGenerator::writePythonToCppTypeConversion(TextStream &s,
 
     QString pythonToCppFunc = pythonToCppConverterForArgumentName(pyIn);
 
-    if (!defaultValue.isEmpty())
-        s << "if (" << pythonToCppFunc << ") ";
-
     QString pythonToCppCall = pythonToCppFunc + u'(' + pyIn + u", &"_qs
                               + cppOut + u')';
     if (!mayHaveImplicitConversion) {
+        // pythonToCppFunc may be 0 when less parameters are passed and
+        // the defaultValue takes effect.
+        if (!defaultValue.isEmpty())
+            s << "if (" << pythonToCppFunc << ")\n" << indent;
         s << pythonToCppCall << ";\n";
+        if (!defaultValue.isEmpty())
+            s << outdent;
         return;
     }
 
+    // pythonToCppFunc may be 0 when less parameters are passed and
+    // the defaultValue takes effect.
     if (!defaultValue.isEmpty())
-        s << "{\n";
+        s << "if (" << pythonToCppFunc << ") {\n" << indent;
 
     s << "if (Shiboken::Conversions::isImplicitConversion(reinterpret_cast<SbkObjectType *>("
-        << cpythonTypeNameExt(type) << "), " << pythonToCppFunc << "))\n";
-    {
-        Indentation indent(s);
-        s << pythonToCppFunc << '(' << pyIn << ", &" << cppOutAux << ");\n";
-    }
-    s << "else\n";
-    {
-        Indentation indent(s);
-        s << pythonToCppCall << ";\n";
-    }
+        << cpythonTypeNameExt(type) << "), " << pythonToCppFunc << "))\n"
+        << indent << pythonToCppFunc << '(' << pyIn << ", &" << cppOutAux << ");\n"
+        << outdent << "else\n" << indent
+        << pythonToCppCall << ";\n" << outdent;
 
-    if (!defaultValue.isEmpty())
-        s << '}';
-    s << '\n';
+    if (defaultValue.isEmpty())
+        s << '\n';
+    else
+        s << "}\n" << outdent;
 }
 
 static void addConversionRuleCodeSnippet(CodeSnipList &snippetList, QString &rule,