diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-08-06 14:59:34 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-08-15 08:28:43 +0200 |
commit | 82fc19625263b26343ef6c1de5c5c13ae1c9ab25 (patch) | |
tree | d560318566581469dec5c117cac9d8dd77816b53 /src/qml/qml/qqmlcompiler_p.h | |
parent | ddb134af9903512408b7e52455f1787e4b6b62ea (diff) |
Cleanup
Merge QV4::CompiledData::QmlUnit into QV4::CompiledData::Unit. For pure JS
units it means a slight increase of memory usage by a few bytes, but overall it
makes the code a lot simpler.
Change-Id: Ib48927749720b056f004aac0fe22cb8ec729e3f6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcompiler_p.h')
-rw-r--r-- | src/qml/qml/qqmlcompiler_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlcompiler_p.h b/src/qml/qml/qqmlcompiler_p.h index 129d312ad1..aa423ea786 100644 --- a/src/qml/qml/qqmlcompiler_p.h +++ b/src/qml/qml/qqmlcompiler_p.h @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE namespace QV4 { namespace CompiledData { struct CompilationUnit; -struct QmlUnit; +struct Unit; } } @@ -132,7 +132,6 @@ public: QList<QQmlScriptData *> scripts; QV4::CompiledData::CompilationUnit *compilationUnit; - QV4::CompiledData::QmlUnit *qmlUnit; // index in first hash is component index, hash inside maps from object index in that scope to integer id QHash<int, QHash<int, int> > objectIndexToIdPerComponent; QHash<int, int> objectIndexToIdForRoot; @@ -144,7 +143,7 @@ public: int totalObjectCount; // Number of objects explicitly instantiated bool isComponent(int objectIndex) const { return objectIndexToIdPerComponent.contains(objectIndex); } - bool isCompositeType() const { return !metaObjects.at(qmlUnit->indexOfRootObject).isEmpty(); } + bool isCompositeType() const { return !metaObjects.at(compilationUnit->data->indexOfRootObject).isEmpty(); } bool isInitialized() const { return hasEngine(); } void initialize(QQmlEngine *); |