shiboken6: Fix formatting of sequence/mapping methods

- Remove duplicated self check (writeCppSelfDefinition()
  also generates it)
- Fix indentation of mapping method

Change-Id: Ic1a9876da4efd593ab9de2adbe5879ed531d408c
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 0a1104b34e9050f8e6c974b0dfe4077a33355309)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 2 insertions, 4 deletions

diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
index a998aa7a0..5c3f2f024 100644
--- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
@@ -4600,8 +4600,7 @@ void CppGenerator::writeMappingMethods(TextStream &s,
             continue;
         QString funcName = cpythonFunctionName(func);
         CodeSnipList snips = func->injectedCodeSnips(TypeSystem::CodeSnipPositionAny, TypeSystem::TargetLangCode);
-        s << m.returnType << ' ' << funcName << '(' << m.arguments << ")\n{\n";
-        writeInvalidPyObjectCheck(s, u"self"_s, ErrorReturn::Default);
+        s << m.returnType << ' ' << funcName << '(' << m.arguments << ")\n{\n" << indent;
 
         writeCppSelfDefinition(s, func, context, ErrorReturn::Default);
 
@@ -4609,7 +4608,7 @@ void CppGenerator::writeMappingMethods(TextStream &s,
             ? nullptr : &func->arguments().constLast();
         writeCodeSnips(s, snips, TypeSystem::CodeSnipPositionAny,
                        TypeSystem::TargetLangCode, func, false, lastArg);
-        s<< "}\n\n";
+        s << outdent << "}\n\n";
     }
 }
 
@@ -4628,7 +4627,6 @@ void CppGenerator::writeSequenceMethods(TextStream &s,
 
         CodeSnipList snips = func->injectedCodeSnips(TypeSystem::CodeSnipPositionAny, TypeSystem::TargetLangCode);
         s << seq.returnType << ' ' << funcName << '(' << seq.arguments << ")\n{\n" << indent;
-        writeInvalidPyObjectCheck(s, u"self"_s, ErrorReturn::Default);
 
         writeCppSelfDefinition(s, func, context, ErrorReturn::Default);