diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-09-03 10:16:00 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-09-03 13:15:00 +0200 |
| commit | d303a44d55d9e6bb626185a81c4483a4567657f5 (patch) | |
| tree | 733a88bfb78b11f119959ae118471f33e90cfe22 | |
| parent | 0db13266547c4bc8e3c1eeab4dccc7cb727d6ef9 (diff) | |
shiboken6: Shorten long names of enum converter functions
Use "Enum" for the Python type instead of the qualified C++ type
which was confusing.
Task-number: PYSIDE-1735
Pick-to: 6.7
Change-Id: I5241c46f9d62aaa19a887d3ef2524efba80b4eba
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/shiboken6/generator/shiboken/cppgenerator.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp index c8aa8b734..aa00faeb0 100644 --- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp +++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp @@ -63,6 +63,7 @@ static constexpr auto virtualMethodStaticReturnVar = "result"_L1; static constexpr auto initFuncPrefix = "init_"_L1; static constexpr auto sbkObjectTypeF = "SbkObject_TypeF()"_L1; +static constexpr auto enumConverterPythonType = "Enum"_L1; static const char initInheritanceFunction[] = "initInheritance"; static QString mangleName(QString name) @@ -1653,17 +1654,17 @@ void CppGenerator::writeEnumConverterFunctions(TextStream &s, const AbstractMeta c << "*reinterpret_cast<" << cppTypeName << " *>(cppOut) = value;\n"; ConfigurableScope configScope(s, enumType); - writePythonToCppFunction(s, c.toString(), typeName, typeName); + writePythonToCppFunction(s, c.toString(), enumConverterPythonType, typeName); QString pyTypeCheck = u"PyObject_TypeCheck(pyIn, "_s + enumPythonType + u')'; - writeIsPythonConvertibleToCppFunction(s, typeName, typeName, pyTypeCheck); + writeIsPythonConvertibleToCppFunction(s, enumConverterPythonType, typeName, pyTypeCheck); c.clear(); c << "const int castCppIn = int(*reinterpret_cast<const " << cppTypeName << " *>(cppIn));\n" << "return " << "Shiboken::Enum::newItem(" << enumPythonType << ", castCppIn);\n"; - writeCppToPythonFunction(s, c.toString(), typeName, typeName); + writeCppToPythonFunction(s, c.toString(), typeName, enumConverterPythonType); s << '\n'; } @@ -4270,10 +4271,10 @@ void CppGenerator::writeEnumConverterInitialization(TextStream &s, const Abstrac const QString typeName = fixedCppTypeName(enumType); s << "SbkConverter *converter = Shiboken::Conversions::createConverter(" << enumPythonVar << ',' << '\n' << indent - << cppToPythonFunctionName(typeName, typeName) << ");\n" << outdent; + << cppToPythonFunctionName(typeName, enumConverterPythonType) << ");\n" << outdent; - const QString toCpp = pythonToCppFunctionName(typeName, typeName); - const QString isConv = convertibleToCppFunctionName(typeName, typeName); + QString toCpp = pythonToCppFunctionName(enumConverterPythonType, typeName); + const QString isConv = convertibleToCppFunctionName(enumConverterPythonType, typeName); writeAddPythonToCppConversion(s, u"converter"_s, toCpp, isConv); s << "Shiboken::Enum::setTypeConverter(" << enumPythonVar << ", converter);\n" |