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>

1 files changed, 4 insertions, 4 deletions

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";