1 files changed, 23 insertions, 22 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
index 59e3cfc94..ec55d1b47 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
@@ -60,11 +60,12 @@ public:
 
     ScopeModelItem currentScope() const { return m_scopes.constLast(); }
 
-    AbstractMetaClass *argumentToClass(ArgumentModelItem);
+    AbstractMetaClass *argumentToClass(const ArgumentModelItem &);
 
     void addAbstractMetaClass(AbstractMetaClass *cls);
     AbstractMetaClass *traverseTypeDef(const FileModelItem &dom,
                                        const TypeDefModelItem &typeDef);
+    void traverseTypesystemTypedefs();
     AbstractMetaClass *traverseClass(const FileModelItem &dom,
                                      const ClassModelItem &item);
     AbstractMetaClass *currentTraversedClass(ScopeModelItem item);
@@ -74,9 +75,9 @@ public:
     bool setupInheritance(AbstractMetaClass *metaClass);
     AbstractMetaClass *traverseNamespace(const FileModelItem &dom,
                                          const NamespaceModelItem &item);
-    AbstractMetaEnum *traverseEnum(EnumModelItem item, AbstractMetaClass *enclosing,
+    AbstractMetaEnum *traverseEnum(const EnumModelItem &item, AbstractMetaClass *enclosing,
                                    const QSet<QString> &enumsDeclarations);
-    void traverseEnums(ScopeModelItem item, AbstractMetaClass *parent,
+    void traverseEnums(const ScopeModelItem &item, AbstractMetaClass *parent,
                        const QStringList &enumsDeclarations);
     AbstractMetaFunctionList classFunctionList(const ScopeModelItem &scopeItem,
                                                bool *constructorRejected);
@@ -85,18 +86,18 @@ public:
                                                        bool *constructorRejected);
     void traverseFunctions(ScopeModelItem item, AbstractMetaClass *parent);
     void applyFunctionModifications(AbstractMetaFunction* func);
-    void traverseFields(ScopeModelItem item, AbstractMetaClass *parent);
-    void traverseStreamOperator(FunctionModelItem functionItem);
-    void traverseOperatorFunction(FunctionModelItem item);
+    void traverseFields(const ScopeModelItem &item, AbstractMetaClass *parent);
+    void traverseStreamOperator(const FunctionModelItem &functionItem);
+    void traverseOperatorFunction(const FunctionModelItem &item);
     AbstractMetaFunction* traverseFunction(const AddedFunction &addedFunc);
     AbstractMetaFunction* traverseFunction(const AddedFunction &addedFunc,
                                            AbstractMetaClass *metaClass);
-    AbstractMetaFunction *traverseFunction(FunctionModelItem function);
-    AbstractMetaField *traverseField(VariableModelItem field,
+    AbstractMetaFunction *traverseFunction(const FunctionModelItem &function);
+    AbstractMetaField *traverseField(const VariableModelItem &field,
                                      const AbstractMetaClass *cls);
     void checkFunctionModifications();
-    void registerHashFunction(FunctionModelItem functionItem);
-    void registerToStringCapability(FunctionModelItem functionItem);
+    void registerHashFunction(const FunctionModelItem &functionItem);
+    void registerToStringCapability(const FunctionModelItem &functionItem);
 
     /**
      *   A conversion operator function should not have its owner class as
@@ -118,12 +119,19 @@ public:
     void setupFunctionDefaults(AbstractMetaFunction *metaFunction,
                                AbstractMetaClass *metaClass);
 
-    QString fixDefaultValue(ArgumentModelItem item, AbstractMetaType *type,
+    QString fixDefaultValue(const ArgumentModelItem &item, AbstractMetaType *type,
                             AbstractMetaFunction *fnc, AbstractMetaClass *,
                             int argumentIndex);
     AbstractMetaType *translateType(const AddedFunction::TypeInfo &typeInfo);
     AbstractMetaType *translateType(const TypeInfo &type,
-                                    bool resolveType = true);
+                                    bool resolveType = true,
+                                    QString *errorMessage = nullptr);
+    static AbstractMetaType *translateTypeStatic(const TypeInfo &type,
+                                                 AbstractMetaClass *current,
+                                                 AbstractMetaBuilderPrivate *d = nullptr,
+                                                 bool resolveType = true,
+                                                 QString *errorMessageIn = nullptr);
+
     qint64 findOutValueFromString(const QString &stringValue, bool &ok);
 
     AbstractMetaClass *findTemplateClass(const QString& name, const AbstractMetaClass *context,
@@ -135,9 +143,8 @@ public:
     bool inheritTemplate(AbstractMetaClass *subclass,
                          const AbstractMetaClass *templateClass,
                          const TypeInfo &info);
-    AbstractMetaType *inheritTemplateType(const QVector<AbstractMetaType *> &templateTypes,
-                                          const AbstractMetaType *metaType,
-                                          bool *ok = Q_NULLPTR);
+    AbstractMetaType *inheritTemplateType(const AbstractMetaTypeList &templateTypes,
+                                          const AbstractMetaType *metaType);
 
     bool isQObject(const FileModelItem &dom, const QString &qualifiedName);
     bool isEnum(const FileModelItem &dom, const QStringList &qualifiedName);
@@ -161,8 +168,6 @@ public:
     AbstractMetaFunctionList m_globalFunctions;
     AbstractMetaEnumList m_globalEnums;
 
-    QSet<const TypeEntry *> m_usedTypes;
-
     typedef QMap<QString, AbstractMetaBuilder::RejectReason> RejectMap;
 
     RejectMap m_rejectedClasses;
@@ -170,11 +175,7 @@ public:
     RejectMap m_rejectedFunctions;
     RejectMap m_rejectedFields;
 
-    QList<AbstractMetaEnum *> m_enums;
-
-    QList<QPair<AbstractMetaArgument *, AbstractMetaFunction *> > m_enumDefaultArguments;
-
-    QHash<QString, AbstractMetaEnumValue *> m_enumValues;
+    QHash<const TypeEntry *, AbstractMetaEnum *> m_enums;
 
     AbstractMetaClass *m_currentClass;
     QList<ScopeModelItem> m_scopes;