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 /tests/auto/qml/qqmllanguage/testtypes.cpp | |
| 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 'tests/auto/qml/qqmllanguage/testtypes.cpp')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/testtypes.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qml/qqmllanguage/testtypes.cpp b/tests/auto/qml/qqmllanguage/testtypes.cpp index b37c6836eb..ff1acc222b 100644 --- a/tests/auto/qml/qqmllanguage/testtypes.cpp +++ b/tests/auto/qml/qqmllanguage/testtypes.cpp @@ -138,7 +138,7 @@ void CustomBinding::componentComplete() } } -void EnumSupportingCustomParser::verifyBindings(const QV4::CompiledData::QmlUnit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &bindings) +void EnumSupportingCustomParser::verifyBindings(const QV4::CompiledData::Unit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &bindings) { if (bindings.count() != 1) { error(bindings.first(), QStringLiteral("Custom parser invoked incorrectly for unit test")); @@ -146,7 +146,7 @@ void EnumSupportingCustomParser::verifyBindings(const QV4::CompiledData::QmlUnit } const QV4::CompiledData::Binding *binding = bindings.first(); - if (qmlUnit->header.stringAt(binding->propertyNameIndex) != QStringLiteral("foo")) { + if (qmlUnit->stringAt(binding->propertyNameIndex) != QStringLiteral("foo")) { error(binding, QStringLiteral("Custom parser invoked with the wrong property name")); return; } @@ -155,7 +155,7 @@ void EnumSupportingCustomParser::verifyBindings(const QV4::CompiledData::QmlUnit error(binding, QStringLiteral("Custom parser invoked with the wrong property value. Expected script that evaluates to enum")); return; } - QByteArray script = qmlUnit->header.stringAt(binding->stringIndex).toUtf8(); + QByteArray script = qmlUnit->stringAt(binding->stringIndex).toUtf8(); bool ok; int v = evaluateEnum(script, &ok); if (!ok) { |