diff options
| -rw-r--r-- | src/qml/compiler/qv4compileddata_p.h | 4 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4executablecompilationunit_p.h | 5 | ||||
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlpropertyvalidator.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlpropertyvalidator_p.h | 2 |
6 files changed, 8 insertions, 9 deletions
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h index 649f83070f..60d0c50599 100644 --- a/src/qml/compiler/qv4compileddata_p.h +++ b/src/qml/compiler/qv4compileddata_p.h @@ -77,7 +77,6 @@ QT_BEGIN_NAMESPACE #define QV4_DATA_STRUCTURE_VERSION 0x24 // Collect function parameter types class QIODevice; -class QQmlPropertyData; class QQmlTypeNameCache; class QQmlType; class QQmlEngine; @@ -1095,9 +1094,6 @@ struct TypeReferenceMap : QHash<int, TypeReference> using DependentTypesHasher = std::function<QByteArray()>; -// index is per-object binding index -typedef QVector<QQmlPropertyData*> BindingPropertyData; - // This is how this hooks into the existing structures: struct CompilationUnitBase diff --git a/src/qml/jsruntime/qv4executablecompilationunit_p.h b/src/qml/jsruntime/qv4executablecompilationunit_p.h index 63a79ed656..6eef3b12c3 100644 --- a/src/qml/jsruntime/qv4executablecompilationunit_p.h +++ b/src/qml/jsruntime/qv4executablecompilationunit_p.h @@ -65,6 +65,9 @@ class QQmlScriptData; class QQmlEnginePrivate; namespace QV4 { +// index is per-object binding index +typedef QVector<QQmlPropertyData*> BindingPropertyData; + class CompilationUnitMapper; struct ResolvedTypeReference; // map from name index @@ -132,7 +135,7 @@ public: // index is object index. This allows fast access to the // property data when initializing bindings, avoiding expensive // lookups by string (property name). - QVector<CompiledData::BindingPropertyData> bindingPropertyDataPerObject; + QVector<BindingPropertyData> bindingPropertyDataPerObject; // mapping from component object index (CompiledData::Unit object index that points to component) to identifier hash of named objects // this is initialized on-demand by QQmlContextData diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index e8f4c6df74..b5c38ce522 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -1791,7 +1791,7 @@ void QQmlData::deferData(int objectIndex, const QQmlRefPointer<QV4::ExecutableCo deferData->context = context; const QV4::CompiledData::Object *compiledObject = compilationUnit->objectAt(objectIndex); - const QV4::CompiledData::BindingPropertyData &propertyData = compilationUnit->bindingPropertyDataPerObject.at(objectIndex); + const QV4::BindingPropertyData &propertyData = compilationUnit->bindingPropertyDataPerObject.at(objectIndex); const QV4::CompiledData::Binding *binding = compiledObject->bindingTable(); for (quint32 i = 0; i < compiledObject->nBindings; ++i, ++binding) { diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index dda6e96966..d5681b3449 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -736,7 +736,7 @@ void QQmlObjectCreator::setupBindings(bool applyDeferredBindings) QQmlListProperty<void> savedList; qSwap(_currentList, savedList); - const QV4::CompiledData::BindingPropertyData &propertyData = compilationUnit->bindingPropertyDataPerObject.at(_compiledObjectIndex); + const QV4::BindingPropertyData &propertyData = compilationUnit->bindingPropertyDataPerObject.at(_compiledObjectIndex); if (_compiledObject->idNameIndex) { const QQmlPropertyData *idProperty = propertyData.last(); diff --git a/src/qml/qml/qqmlpropertyvalidator.cpp b/src/qml/qml/qqmlpropertyvalidator.cpp index 610075f0c6..71964aca64 100644 --- a/src/qml/qml/qqmlpropertyvalidator.cpp +++ b/src/qml/qml/qqmlpropertyvalidator.cpp @@ -139,7 +139,7 @@ QVector<QQmlJS::DiagnosticMessage> QQmlPropertyValidator::validateObject( defaultProperty = propertyCache->defaultProperty(); } - QV4::CompiledData::BindingPropertyData collectedBindingPropertyData(obj->nBindings); + QV4::BindingPropertyData collectedBindingPropertyData(obj->nBindings); binding = obj->bindingTable(); for (quint32 i = 0; i < obj->nBindings; ++i, ++binding) { diff --git a/src/qml/qml/qqmlpropertyvalidator_p.h b/src/qml/qml/qqmlpropertyvalidator_p.h index 1e88b26165..74a1281927 100644 --- a/src/qml/qml/qqmlpropertyvalidator_p.h +++ b/src/qml/qml/qqmlpropertyvalidator_p.h @@ -97,7 +97,7 @@ private: const QV4::CompiledData::Unit *qmlUnit; const QQmlPropertyCacheVector &propertyCaches; - QVector<QV4::CompiledData::BindingPropertyData> * const bindingPropertyDataPerObject; + QVector<QV4::BindingPropertyData> * const bindingPropertyDataPerObject; }; QT_END_NAMESPACE |