diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-21 08:54:33 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-21 09:23:47 +0100 |
| commit | af70c8d44b010dc4018d32f7affb9164fbf10c0d (patch) | |
| tree | 2ee91dad8d8ebab7c65a192149b59c3c0e2b5c24 /sources/shiboken6/generator/shiboken/cppgenerator.cpp | |
| parent | 05958ae2ab03533c847f0ff17839286c562e3d5c (diff) | |
shiboken6: Reuse variable with function name for error messages in overrides
shiboken6 actually generated a variable containing the name;
reuse that for error messages.
Pick-to: 6.4
Change-Id: I210018e5df66034862a9626f8735f8e923c7c337
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken6/generator/shiboken/cppgenerator.cpp')
| -rw-r--r-- | sources/shiboken6/generator/shiboken/cppgenerator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp index b69f270df..327842613 100644 --- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp +++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp @@ -1558,7 +1558,7 @@ void CppGenerator::writeVirtualMethodNative(TextStream &s, << PYTHON_RETURN_VAR << ");\n" << outdent << "if (!" << PYTHON_TO_CPP_VAR << ") {\n" << indent << "Shiboken::Warnings::warnInvalidReturnValue(\"" - << func->ownerClass()->name() << "\", \"" << funcName << "\", " + << func->ownerClass()->name() << "\", funcName, " << getVirtualFunctionReturnTypeName(func) << ", " << "Py_TYPE(" << PYTHON_RETURN_VAR << ")->tp_name);\n" << returnStatement << '\n' << outdent @@ -1580,7 +1580,7 @@ void CppGenerator::writeVirtualMethodNative(TextStream &s, s << " && " << PYTHON_RETURN_VAR << " != Py_None"; s << ") {\n" << indent << "Shiboken::Warnings::warnInvalidReturnValue(\"" - << func->ownerClass()->name() << "\", \"" << funcName << "\", " + << func->ownerClass()->name() << "\", funcName, " << getVirtualFunctionReturnTypeName(func) << ", " << "Py_TYPE(" << PYTHON_RETURN_VAR << ")->tp_name);\n" << returnStatement << '\n' << outdent |