shiboken: Streamline the type parsing code

Replace struct TypeParser::Info by TypeInfo and remove
TypeParser::Info. Move method
TypeParser::Info::instantiationName() to TypeInfo
for this purpose.

Change TypeParser::parse() to return TypeInfo.

Task-number: QTBUG-672
Change-Id: I123d5bf378ad146867b571e47e31ae08a92b2504
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 2 insertions, 3 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
index 959734462..1f4e209db 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
@@ -122,18 +122,17 @@ public:
     AbstractMetaType *translateType(const AddedFunction::TypeInfo &typeInfo);
     AbstractMetaType *translateType(const TypeInfo &type,
                                     bool resolveType = true);
-
     qint64 findOutValueFromString(const QString &stringValue, bool &ok);
 
     AbstractMetaClass *findTemplateClass(const QString& name, const AbstractMetaClass *context,
-                                         TypeParser::Info *info = Q_NULLPTR,
+                                         TypeInfo *info = Q_NULLPTR,
                                          ComplexTypeEntry **baseContainerType = Q_NULLPTR) const;
     AbstractMetaClassList getBaseClasses(const AbstractMetaClass *metaClass) const;
     bool ancestorHasPrivateCopyConstructor(const AbstractMetaClass *metaClass) const;
 
     bool inheritTemplate(AbstractMetaClass *subclass,
                          const AbstractMetaClass *templateClass,
-                         const TypeParser::Info &info);
+                         const TypeInfo &info);
     AbstractMetaType *inheritTemplateType(const QVector<AbstractMetaType *> &templateTypes,
                                           const AbstractMetaType *metaType,
                                           bool *ok = Q_NULLPTR);