diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-26 20:50:44 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-05-30 07:16:25 +0000 |
commit | d146b955f5be556e155441637c4dbf0920ef892b (patch) | |
tree | 1b25637512e87e783041394f061d9eece1822927 /src/qml/compiler/qqmltypecompiler_p.h | |
parent | f27d058c11b54b3c5f72d41c25cb00657b49a37b (diff) |
Remove the custom parser binding bits hash table from QQmlCompiledData
Similary to the other hash tables we can store the actual information about
whether a binding is covered by a custom parser or not straight in the
CompiledData::Binding.
Change-Id: Iab9044af57338cec935d3ef38764d7dc1aa507e8
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/qml/compiler/qqmltypecompiler_p.h')
-rw-r--r-- | src/qml/compiler/qqmltypecompiler_p.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/qml/compiler/qqmltypecompiler_p.h b/src/qml/compiler/qqmltypecompiler_p.h index 9cdac03896..64d2e6c925 100644 --- a/src/qml/compiler/qqmltypecompiler_p.h +++ b/src/qml/compiler/qqmltypecompiler_p.h @@ -103,7 +103,6 @@ public: const QQmlPropertyCacheVector &propertyCaches() const; void setComponentRoots(const QVector<quint32> &roots) { m_componentRoots = roots; } const QVector<quint32> &componentRoots() const { return m_componentRoots; } - QHash<int, QBitArray> *customParserBindings(); QQmlJS::MemoryPool *memoryPool(); QStringRef newStringRef(const QString &string); const QV4::Compiler::StringTableGenerator *stringPool() const; @@ -280,10 +279,10 @@ protected: QQmlPropertyCacheVector propertyCaches; }; -class QQmlDeferredBindingScanner : public QQmlCompilePass +class QQmlDeferredAndCustomParserBindingScanner : public QQmlCompilePass { public: - QQmlDeferredBindingScanner(QQmlTypeCompiler *typeCompiler); + QQmlDeferredAndCustomParserBindingScanner(QQmlTypeCompiler *typeCompiler); bool scanObject(); @@ -292,6 +291,7 @@ private: QList<QmlIR::Object*> *qmlObjects; QQmlPropertyCacheVector propertyCaches; + const QHash<int, QQmlCustomParser*> &customParsers; bool _seenObjectWithId; }; @@ -319,7 +319,6 @@ private: const QHash<int, QQmlCompiledData::TypeReference*> &resolvedTypes; const QHash<int, QQmlCustomParser*> &customParsers; const QQmlPropertyCacheVector &propertyCaches; - QHash<int, QBitArray> *customParserBindingsPerObject; // collected state variables, essentially write-only mutable QVector<QV4::CompiledData::BindingPropertyData> _bindingPropertyDataPerObject; |