From 82fc19625263b26343ef6c1de5c5c13ae1c9ab25 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 6 Aug 2014 14:59:34 +0200 Subject: 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 --- tests/auto/qml/qqmllanguage/testtypes.cpp | 6 +++--- tests/auto/qml/qqmllanguage/testtypes.h | 8 ++++---- tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 10 +++++----- tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'tests') 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 &bindings) +void EnumSupportingCustomParser::verifyBindings(const QV4::CompiledData::Unit *qmlUnit, const QList &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) { diff --git a/tests/auto/qml/qqmllanguage/testtypes.h b/tests/auto/qml/qqmllanguage/testtypes.h index bb1e9c158d..c36f6b7624 100644 --- a/tests/auto/qml/qqmllanguage/testtypes.h +++ b/tests/auto/qml/qqmllanguage/testtypes.h @@ -739,14 +739,14 @@ class MyCustomParserType : public QObject class MyCustomParserTypeParser : public QQmlCustomParser { public: - virtual void verifyBindings(const QV4::CompiledData::QmlUnit *, const QList &) {} + virtual void verifyBindings(const QV4::CompiledData::Unit *, const QList &) {} virtual void applyBindings(QObject *, QQmlCompiledData *, const QList &) {} }; class EnumSupportingCustomParser : public QQmlCustomParser { public: - virtual void verifyBindings(const QV4::CompiledData::QmlUnit *, const QList &); + virtual void verifyBindings(const QV4::CompiledData::Unit *, const QList &); virtual void applyBindings(QObject *, QQmlCompiledData *, const QList &) {} }; @@ -1119,7 +1119,7 @@ public: class CustomBindingParser : public QQmlCustomParser { - virtual void verifyBindings(const QV4::CompiledData::QmlUnit *, const QList &) {} + virtual void verifyBindings(const QV4::CompiledData::Unit *, const QList &) {} virtual void applyBindings(QObject *, QQmlCompiledData *, const QList &); }; @@ -1165,7 +1165,7 @@ private: class SimpleObjectCustomParser : public QQmlCustomParser { - virtual void verifyBindings(const QV4::CompiledData::QmlUnit *, const QList &) {} + virtual void verifyBindings(const QV4::CompiledData::Unit *, const QList &) {} virtual void applyBindings(QObject *, QQmlCompiledData *, const QList &); }; diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index 8bc937d2bc..bba558d85e 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -1954,18 +1954,18 @@ void tst_qqmllanguage::scriptStringWithoutSourceCode() QQmlTypeData *td = eng->typeLoader.getType(url); Q_ASSERT(td); - QV4::CompiledData::QmlUnit *qmlUnit = td->compiledData()->qmlUnit; + QV4::CompiledData::Unit *qmlUnit = td->compiledData()->compilationUnit->data; Q_ASSERT(qmlUnit); const QV4::CompiledData::Object *rootObject = qmlUnit->objectAt(qmlUnit->indexOfRootObject); - QCOMPARE(qmlUnit->header.stringAt(rootObject->inheritedTypeNameIndex), QString("MyTypeObject")); + QCOMPARE(qmlUnit->stringAt(rootObject->inheritedTypeNameIndex), QString("MyTypeObject")); quint32 i; for (i = 0; i < rootObject->nBindings; ++i) { const QV4::CompiledData::Binding *binding = rootObject->bindingTable() + i; - if (qmlUnit->header.stringAt(binding->propertyNameIndex) != QString("scriptProperty")) + if (qmlUnit->stringAt(binding->propertyNameIndex) != QString("scriptProperty")) continue; - QCOMPARE(binding->valueAsScriptString(&qmlUnit->header), QString("intProperty")); + QCOMPARE(binding->valueAsScriptString(qmlUnit), QString("intProperty")); const_cast(binding)->stringIndex = 0; // empty string index - QVERIFY(binding->valueAsScriptString(&qmlUnit->header).isEmpty()); + QVERIFY(binding->valueAsScriptString(qmlUnit).isEmpty()); break; } QVERIFY(i < rootObject->nBindings); diff --git a/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp b/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp index d8e3d99e84..00111f3344 100644 --- a/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp +++ b/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp @@ -98,11 +98,11 @@ void tst_qqmltranslation::translation() << QStringLiteral("disambiguation") << QStringLiteral("singular") << QStringLiteral("plural"); - const QV4::CompiledData::QmlUnit *unit = cdata->qmlUnit; + const QV4::CompiledData::Unit *unit = cdata->compilationUnit->data; const QV4::CompiledData::Object *rootObject = unit->objectAt(unit->indexOfRootObject); const QV4::CompiledData::Binding *binding = rootObject->bindingTable(); for (quint32 i = 0; i < rootObject->nBindings; ++i, ++binding) { - const QString propertyName = unit->header.stringAt(binding->propertyNameIndex); + const QString propertyName = unit->stringAt(binding->propertyNameIndex); const bool expectCompiledTranslation = compiledTranslations.contains(propertyName); @@ -153,11 +153,11 @@ void tst_qqmltranslation::idTranslation() QQmlCompiledData *cdata = typeData->compiledData(); QVERIFY(cdata); - const QV4::CompiledData::QmlUnit *unit = cdata->qmlUnit; + const QV4::CompiledData::Unit *unit = cdata->compilationUnit->data; const QV4::CompiledData::Object *rootObject = unit->objectAt(unit->indexOfRootObject); const QV4::CompiledData::Binding *binding = rootObject->bindingTable(); for (quint32 i = 0; i < rootObject->nBindings; ++i, ++binding) { - const QString propertyName = unit->header.stringAt(binding->propertyNameIndex); + const QString propertyName = unit->stringAt(binding->propertyNameIndex); if (propertyName == "idTranslation") { if (binding->type != QV4::CompiledData::Binding::Type_TranslationById) qDebug() << "binding for property" << propertyName << "is not a compiled translation"; -- cgit v1.2.3