Cleanup: Get rid of QQmlScript::TypeReference

Change-Id: I5f8b203ac71f0667947087bd2b1e7ce6d91d843d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

3 files changed, 9 insertions, 18 deletions

diff --git a/src/qml/qml/qqmlscript_p.h b/src/qml/qml/qqmlscript_p.h
index 14421b9231..a79244f2ea 100644
--- a/src/qml/qml/qqmlscript_p.h
+++ b/src/qml/qml/qqmlscript_p.h
@@ -71,14 +71,6 @@ namespace QQmlJS { class Engine; namespace AST { class Node; class StringLiteral
 
 namespace QQmlScript {
 
-class Object;
-class TypeReference : public QQmlPool::Class
-{
-public:
-    // type as it has been referenced in Qml
-    QString name;
-};
-
 class Object : public QQmlPool::Class
 {
 public:
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 5b5b926b54..a905519550 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -2276,11 +2276,10 @@ void QQmlTypeData::resolveTypes()
     // Lets handle resolved composite singleton types
     foreach (const QQmlImports::CompositeSingletonReference &csRef, m_importCache.resolvedCompositeSingletons()) {
         TypeReference ref;
-        QQmlScript::TypeReference parserRef;
-        parserRef.name = csRef.typeName;
+        QString typeName = csRef.typeName;
 
         if (!csRef.prefix.isEmpty()) {
-            parserRef.name.prepend(csRef.prefix + QLatin1Char('.'));
+            typeName.prepend(csRef.prefix + QLatin1Char('.'));
             // Add a reference to the enclosing namespace
             m_namespaces.insert(csRef.prefix);
         }
@@ -2288,7 +2287,7 @@ void QQmlTypeData::resolveTypes()
         int majorVersion = -1;
         int minorVersion = -1;
 
-        if (!resolveType(&parserRef, majorVersion, minorVersion, ref))
+        if (!resolveType(typeName, majorVersion, minorVersion, ref))
             return;
 
         if (ref.type->isCompositeSingleton()) {
@@ -2378,19 +2377,19 @@ void QQmlTypeData::resolveTypes()
     }
 }
 
-bool QQmlTypeData::resolveType(const QQmlScript::TypeReference *parserRef, int &majorVersion, int &minorVersion, TypeReference &ref)
+bool QQmlTypeData::resolveType(const QString &typeName, int &majorVersion, int &minorVersion, TypeReference &ref)
 {
     QQmlImportNamespace *typeNamespace = 0;
     QList<QQmlError> errors;
 
-    bool typeFound = m_importCache.resolveType(parserRef->name, &ref.type,
+    bool typeFound = m_importCache.resolveType(typeName, &ref.type,
                                           &majorVersion, &minorVersion, &typeNamespace, &errors);
     if (!typeNamespace && !typeFound && !m_implicitImportLoaded) {
         // Lazy loading of implicit import
         if (loadImplicitImport()) {
             // Try again to find the type
             errors.clear();
-            typeFound = m_importCache.resolveType(parserRef->name, &ref.type,
+            typeFound = m_importCache.resolveType(typeName, &ref.type,
                                               &majorVersion, &minorVersion, &typeNamespace, &errors);
         } else {
             return false; //loadImplicitImport() hit an error, and called setError already
@@ -2403,7 +2402,7 @@ bool QQmlTypeData::resolveType(const QQmlScript::TypeReference *parserRef, int &
         //  - type with unknown namespace (UnknownNamespace.SomeType {})
         QQmlError error;
         if (typeNamespace) {
-            error.setDescription(QQmlTypeLoader::tr("Namespace %1 cannot be used as a type").arg(parserRef->name));
+            error.setDescription(QQmlTypeLoader::tr("Namespace %1 cannot be used as a type").arg(typeName));
         } else {
             if (errors.size()) {
                 error = errors.takeFirst();
@@ -2413,7 +2412,7 @@ bool QQmlTypeData::resolveType(const QQmlScript::TypeReference *parserRef, int &
                 error.setDescription(QQmlTypeLoader::tr("Unreported error adding script import to import database"));
             }
             error.setUrl(m_importCache.baseUrl());
-            error.setDescription(QQmlTypeLoader::tr("%1 %2").arg(parserRef->name).arg(error.description()));
+            error.setDescription(QQmlTypeLoader::tr("%1 %2").arg(typeName).arg(error.description()));
         }
 
         errors.prepend(error);
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index 3c0cd99909..7fe805782d 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -455,7 +455,7 @@ protected:
 private:
     void resolveTypes();
     void compile();
-    bool resolveType(const QQmlScript::TypeReference *parserRef, int &majorVersion, int &minorVersion, TypeReference &ref);
+    bool resolveType(const QString &typeName, int &majorVersion, int &minorVersion, TypeReference &ref);
 
     virtual void scriptImported(QQmlScriptBlob *blob, const QV4::CompiledData::Location &location, const QString &qualifier, const QString &nameSpace);