1 files changed, 3 insertions, 28 deletions

diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index 412199bee..b86a5eb46 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -4562,23 +4562,6 @@ void CppGenerator::writeMethodDefinition(QTextStream &s, const AbstractMetaFunct
     s << ',' << endl;
 }
 
-static QString resolveRetOrArgType(const AbstractMetaType *someType)
-{
-    QString strRetArg;
-    if (CppGenerator::isCString(someType)) {
-        strRetArg = QLatin1String("str");
-    } else if (someType->isPrimitive()) {
-        auto ptp = static_cast<const PrimitiveTypeEntry *>(someType->typeEntry());
-        while (ptp->referencedTypeEntry())
-            ptp = ptp->referencedTypeEntry();
-        strRetArg = ptp->name();
-    } else {
-        strRetArg = someType->fullName();
-    }
-    strRetArg.replace(QLatin1String("::"), QLatin1String("."));
-    return strRetArg;
-}
-
 void CppGenerator::writeSignatureInfo(QTextStream &s, const AbstractMetaFunctionList &overloads)
 {
     OverloadData overloadData(overloads, this);
@@ -4592,11 +4575,7 @@ void CppGenerator::writeSignatureInfo(QTextStream &s, const AbstractMetaFunction
         QStringList args;
         const AbstractMetaArgumentList &arguments = f->arguments();
         for (const AbstractMetaArgument *arg : arguments)  {
-            AbstractMetaType *argType = getTypeWithoutContainer(arg->type());
-            QString strArg = resolveRetOrArgType(arg->type());
-            // PYSIDE-921: Handle container returntypes correctly.
-            if (argType != arg->type())
-                strArg += QLatin1Char('[') + resolveRetOrArgType(argType) + QLatin1Char(']');
+            QString strArg = arg->type()->pythonSignature();
             if (!arg->defaultValueExpression().isEmpty()) {
                 strArg += QLatin1Char('=');
                 QString e = arg->defaultValueExpression();
@@ -4611,12 +4590,8 @@ void CppGenerator::writeSignatureInfo(QTextStream &s, const AbstractMetaFunction
         if (multiple)
             s << idx-- << ':';
         s << funcName << '(' << args.join(QLatin1Char(',')) << ')';
-        AbstractMetaType *returnType = getTypeWithoutContainer(f->type());
-        // PYSIDE-921: Handle container returntypes correctly.
-        if (returnType != f->type())
-            s << "->" << resolveRetOrArgType(f->type()) << '[' << resolveRetOrArgType(returnType) << ']';
-        else if (returnType)
-            s << "->" << resolveRetOrArgType(returnType);
+        if (f->type())
+            s << "->" << f->type()->pythonSignature();
         s << endl;
     }
 }