shiboken: Move detection of template arguments to ClangBuilder

Obtain the template arguments from Clang and fall back to parsing
the type name where this is not possible (which may be the case
inside a template declaration).

The string-based formatting and re-parsing of the type in
AbstractMetaBuilder::translateType() can then be removed, opening
the way to passing up more complex types from Clang into the
MetaBuilder.

Task-number: PYSIDE-672
Change-Id: I43ff285c5f3720319bf40c65b1c27302ef1b934e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>

1 files changed, 5 insertions, 16 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 9ada2993a..20f201ec6 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -2281,15 +2281,13 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateTypeStatic(const TypeInfo
 {
     // 1. Test the type info without resolving typedefs in case this is present in the
     //    type system
-    TypeInfo typei;
     if (resolveType) {
         if (AbstractMetaType *resolved = translateTypeStatic(_typei, currentClass, d, false, errorMessageIn))
             return resolved;
     }
 
-    if (!resolveType) {
-        typei = _typei;
-    } else {
+    TypeInfo typeInfo = _typei;
+    if (resolveType) {
         // Go through all parts of the current scope (including global namespace)
         // to resolve typedefs. The parser does not properly resolve typedefs in
         // the global scope when they are referenced from inside a namespace.
@@ -2297,29 +2295,20 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateTypeStatic(const TypeInfo
         // seemed non-trivial
         int i = d ? d->m_scopes.size() - 1 : -1;
         while (i >= 0) {
-            typei = TypeInfo::resolveType(_typei, d->m_scopes.at(i--));
-            if (typei.qualifiedName().join(colonColon()) != _typei.qualifiedName().join(colonColon()))
+            typeInfo = TypeInfo::resolveType(_typei, d->m_scopes.at(i--));
+            if (typeInfo.qualifiedName().join(colonColon()) != _typei.qualifiedName().join(colonColon()))
                 break;
         }
 
     }
 
-    if (typei.isFunctionPointer()) {
+    if (typeInfo.isFunctionPointer()) {
         if (errorMessageIn)
             *errorMessageIn = msgUnableToTranslateType(_typei, QLatin1String("Unsupported function pointer."));
         return nullptr;
     }
 
     QString errorMessage;
-    TypeInfo typeInfo = TypeParser::parse(typei.toString(), &errorMessage);
-    if (typeInfo.qualifiedName().isEmpty()) {
-        errorMessage = msgUnableToTranslateType(_typei, errorMessage);
-        if (errorMessageIn)
-            *errorMessageIn = errorMessage;
-        else
-            qCWarning(lcShiboken,"%s", qPrintable(errorMessage));
-        return 0;
-    }
 
     // 2. Handle arrays.
     // 2.1 Handle char arrays with unspecified size (aka "const char[]") as "const char*" with