diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-06-17 14:19:34 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-06-20 08:02:03 +0000 |
| commit | b9645cc5774a2497b2927b5fdad14c8c09a91fe2 (patch) | |
| tree | 3daad0525e9e22a573c3b05f5990de52802aeea4 /src/qml/qml | |
| parent | 7c8441feced8ed41621cd2aad09c1f6d1da7e2ff (diff) | |
Minor cleanup for implicit import handling
We don't need the m_implicitImport member in the QQmlTypeData when it is
used in only one function and generally a pointer into the memory pool.
Change-Id: Ib3de07631a6626ba1ebdf9e6fef379af1231fd24
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 15 | ||||
| -rw-r--r-- | src/qml/qml/qqmltypeloader_p.h | 1 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 2efc1ba139..56dc4694e0 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -1978,7 +1978,7 @@ QQmlTypeData::TypeDataCallback::~TypeDataCallback() QQmlTypeData::QQmlTypeData(const QUrl &url, QQmlTypeLoader *manager) : QQmlTypeLoader::Blob(url, QmlFile, manager), - m_typesResolved(false), m_implicitImport(0), m_implicitImportLoaded(false) + m_typesResolved(false), m_implicitImportLoaded(false) { } @@ -2108,7 +2108,6 @@ void QQmlTypeData::done() m_document.reset(); m_typeReferences.clear(); - m_implicitImport = 0; } void QQmlTypeData::completed() @@ -2193,14 +2192,14 @@ void QQmlTypeData::continueLoadFromIR() return; // This qmldir is for the implicit import QQmlJS::MemoryPool *pool = m_document->jsParserEngine.pool(); - m_implicitImport = pool->New<QV4::CompiledData::Import>(); - m_implicitImport->uriIndex = m_document->registerString(QLatin1String(".")); - m_implicitImport->qualifierIndex = 0; // empty string - m_implicitImport->majorVersion = -1; - m_implicitImport->minorVersion = -1; + auto implicitImport = pool->New<QV4::CompiledData::Import>(); + implicitImport->uriIndex = m_document->registerString(QLatin1String(".")); + implicitImport->qualifierIndex = 0; // empty string + implicitImport->majorVersion = -1; + implicitImport->minorVersion = -1; QList<QQmlError> errors; - if (!fetchQmldir(qmldirUrl, m_implicitImport, 1, &errors)) { + if (!fetchQmldir(qmldirUrl, implicitImport, 1, &errors)) { setError(errors); return; } diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index fa9389e9ca..9fd7fb9f51 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -464,7 +464,6 @@ private: QList<TypeDataCallback *> m_callbacks; - QV4::CompiledData::Import *m_implicitImport; bool m_implicitImportLoaded; bool loadImplicitImport(); }; |