diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-18 23:06:41 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-19 08:33:02 +0100 |
commit | c9456432dc8f06da94c51fde8a834ce563d8843a (patch) | |
tree | 4320dc57433215a7d08b7e93b197b92cd2ab07e2 /src/qml/qml/qqmltypeloader.cpp | |
parent | cf5fd11c8a2f1e859c72df75ea13c5c6e6295b6f (diff) |
Cleanup: Get rid of QQmlScript::TypeReference
Change-Id: I5f8b203ac71f0667947087bd2b1e7ce6d91d843d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
-rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
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); |