diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-05-30 08:53:44 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-05-30 09:28:02 +0200 |
| commit | 0a1104b34e9050f8e6c974b0dfe4077a33355309 (patch) | |
| tree | 0c5fe5d75141d2eefd1323c06a0a2785a2386c36 | |
| parent | adad8744d65c11bc78d1976e344aac1d4abb47aa (diff) | |
shiboken6: Fix formatting of sequence/mapping methods
- Remove duplicated self check (writeCppSelfDefinition()
also generates it)
- Fix indentation of mapping method
Pick-to: 6.2 6.3
Change-Id: Ic1a9876da4efd593ab9de2adbe5879ed531d408c
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/shiboken6/generator/shiboken/cppgenerator.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp index a5f325777..9c36fe2e4 100644 --- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp +++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp @@ -4611,8 +4611,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); @@ -4620,7 +4619,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"; } } @@ -4639,7 +4638,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); |