diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-17 21:26:04 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-18 09:05:57 +0100 |
| commit | fa24ef3d721a7b94d0c5abbc6c9558e74bdb0f3d (patch) | |
| tree | 37bac24bafc1d2b879d76ac225272912538d072d /src/qml/qml/qqmltypeloader_p.h | |
| parent | 3f7951c04ef474f81eda2134b67c4e4020fe39d1 (diff) | |
Cleanup, part 2
* QQmlCodeGenerator -> QQmlIR::IRBuilder (it doesn't generate code, it
generates the Object/Property/Signal/etc. IR of the .qml file, that's
going to get transformed to QV4::CompiledData::*)
* ParsedQML -> QQmlIR::Document
Change-Id: I329e858487b66e1ae528d44316761f5dd34b79f4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmltypeloader_p.h')
| -rw-r--r-- | src/qml/qml/qqmltypeloader_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index adb998d1f8..6e759266ef 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -85,7 +85,7 @@ class QQmlDataLoader; class QQmlExtensionInterface; namespace QmlIR { -struct ParsedQML; +struct Document; } class Q_QML_PRIVATE_EXPORT QQmlDataBlob : public QQmlRefCount @@ -275,7 +275,7 @@ public: ~Blob(); QQmlTypeLoader *typeLoader() const { return m_typeLoader; } - const QQmlImports &imports() const { return m_imports; } + const QQmlImports &imports() const { return m_importCache; } protected: bool addImport(const QQmlScript::Import &import, QList<QQmlError> *errors); @@ -294,7 +294,7 @@ public: protected: QQmlTypeLoader *m_typeLoader; - QQmlImports m_imports; + QQmlImports m_importCache; bool m_isSingleton; QHash<const QQmlScript::Import *, int> m_unresolvedImports; QList<QQmlQmldirData *> m_qmldirs; @@ -455,9 +455,9 @@ private: virtual void scriptImported(QQmlScriptBlob *blob, const QQmlScript::Location &location, const QString &qualifier, const QString &nameSpace); - QScopedPointer<QmlIR::ParsedQML> parsedQML; - QList<QQmlScript::Import> m_newImports; - QList<QQmlScript::Pragma> m_newPragmas; + QScopedPointer<QmlIR::Document> m_document; + QList<QQmlScript::Import> m_imports; + QList<QQmlScript::Pragma> m_pragmas; QList<ScriptReference> m_scripts; |