From 2bedff619c3775081bc5c8dfafa50fd7e11d8cb1 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 7 Jun 2021 15:24:42 +0200 Subject: Rename QQmlMetaType::metaObjectForMetaType into metaObjectForValueType It really only works for value types and it's not intended to do anythign else. The name should reflect this. Change-Id: Ib73bf7e9655971f7826fe72145e2d2fab363363c Reviewed-by: Fabian Kosmale --- src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp | 2 +- src/qml/jsruntime/qv4engine.cpp | 4 ++-- src/qml/jsruntime/qv4qobjectwrapper.cpp | 4 ++-- src/qml/qml/qqmlbinding.cpp | 2 +- src/qml/qml/qqmlmetatype.cpp | 4 ++-- src/qml/qml/qqmlmetatype_p.h | 2 +- src/qml/qml/qqmlproperty.cpp | 6 +++--- src/qml/qml/qqmlpropertycachecreator.cpp | 2 +- src/qml/qml/qqmlpropertycachecreator_p.h | 2 +- src/qml/qml/qqmlpropertyvalidator.cpp | 4 ++-- src/qml/qml/qqmltypecompiler.cpp | 2 +- src/qml/qml/qqmlvaluetypewrapper.cpp | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp index 812c48b72e..3afda162e6 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp @@ -259,7 +259,7 @@ QVariant QQmlEngineDebugServiceImpl::valueContents(QVariant value) const return value.toJsonDocument().toVariant(); default: if (QQmlMetaType::isValueType(metaType)) { - const QMetaObject *mo = QQmlMetaType::metaObjectForMetaType(metaType); + const QMetaObject *mo = QQmlMetaType::metaObjectForValueType(metaType); if (mo) { int toStringIndex = mo->indexOfMethod("toString()"); if (toStringIndex != -1) { diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index c17478c0cc..958a994cc3 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -1825,7 +1825,7 @@ QV4::ReturnedValue ExecutionEngine::fromData( break; } - if (const QMetaObject *vtmo = QQmlMetaType::metaObjectForMetaType(metaType)) + if (const QMetaObject *vtmo = QQmlMetaType::metaObjectForValueType(metaType)) return QV4::QQmlValueTypeWrapper::create(this, ptr, vtmo, metaType); } else { QV4::Scope scope(this); @@ -1885,7 +1885,7 @@ QV4::ReturnedValue ExecutionEngine::fromData( return sequentialIterableToJS(this, lst); } - if (const QMetaObject *vtmo = QQmlMetaType::metaObjectForMetaType(metaType)) + if (const QMetaObject *vtmo = QQmlMetaType::metaObjectForValueType(metaType)) return QV4::QQmlValueTypeWrapper::create(this, ptr, vtmo, metaType); } diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index ac9d52292b..20ccb00093 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -189,13 +189,13 @@ static QV4::ReturnedValue loadProperty(QV4::ExecutionEngine *v4, QObject *object property.readProperty(object, &v); if (QQmlMetaType::isValueType(v.metaType())) { - if (const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForMetaType(v.metaType())) + if (const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForValueType(v.metaType())) return QV4::QQmlValueTypeWrapper::create(v4, object, property.coreIndex(), valueTypeMetaObject, v.metaType()); // VariantReference value-type. } return scope.engine->fromVariant(v); } else if (QQmlMetaType::isValueType(propMetaType)) { - if (const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForMetaType(propMetaType)) + if (const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForValueType(propMetaType)) return QV4::QQmlValueTypeWrapper::create(v4, object, property.coreIndex(), valueTypeMetaObject, propMetaType); } else { #if QT_CONFIG(qml_sequence_object) diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index 2fdd31e671..788d03b8e2 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -733,7 +733,7 @@ void QQmlBinding::getPropertyData(QQmlPropertyData **propertyData, QQmlPropertyD Q_ASSERT(*propertyData); if (Q_UNLIKELY(m_targetIndex.hasValueTypeIndex() && valueTypeData)) { - const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForMetaType((*propertyData)->propType()); + const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForValueType((*propertyData)->propType()); Q_ASSERT(valueTypeMetaObject); QMetaProperty vtProp = valueTypeMetaObject->property(m_targetIndex.valueTypeIndex()); valueTypeData->setFlags(QQmlPropertyData::flagsForProperty(vtProp)); diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp index 79bb95c8c2..e412263825 100644 --- a/src/qml/qml/qqmlmetatype.cpp +++ b/src/qml/qml/qqmlmetatype.cpp @@ -1578,7 +1578,7 @@ bool QQmlMetaType::isValueType(QMetaType type) return valueType(type) != nullptr; } -const QMetaObject *QQmlMetaType::metaObjectForMetaType(QMetaType metaType) +const QMetaObject *QQmlMetaType::metaObjectForValueType(QMetaType metaType) { const int t = metaType.id(); switch (t) { @@ -1643,7 +1643,7 @@ QQmlValueType *QQmlMetaType::valueType(QMetaType type) if (it != data->metaTypeToValueType.constEnd()) return *it; - if (const QMetaObject *mo = metaObjectForMetaType(type)) + if (const QMetaObject *mo = metaObjectForValueType(type)) return *data->metaTypeToValueType.insert(idx, new QQmlValueType(idx, mo)); return *data->metaTypeToValueType.insert(idx, nullptr); } diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h index 3080afc530..7ee16f9dc9 100644 --- a/src/qml/qml/qqmlmetatype_p.h +++ b/src/qml/qml/qqmlmetatype_p.h @@ -255,7 +255,7 @@ public: static bool isValueType(QMetaType type); static QQmlValueType *valueType(QMetaType metaType); - static const QMetaObject *metaObjectForMetaType(QMetaType type); + static const QMetaObject *metaObjectForValueType(QMetaType type); }; Q_DECLARE_TYPEINFO(QQmlMetaType, Q_RELOCATABLE_TYPE); diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index 7067bf8b6a..b24b57a0e4 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -319,7 +319,7 @@ void QQmlPropertyPrivate::initProperty(QObject *obj, const QString &name) if (ii == (path.count() - 2) && QQmlMetaType::isValueType(property->propType())) { // We're now at a value type property - const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForMetaType(property->propType()); + const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForValueType(property->propType()); if (!valueTypeMetaObject) return; // Not a value type int idx = valueTypeMetaObject->indexOfProperty(path.last().toUtf8().constData()); @@ -502,7 +502,7 @@ const char *QQmlProperty::propertyTypeName() const if (!d) return nullptr; if (d->isValueType()) { - const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForMetaType(d->core.propType()); + const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForValueType(d->core.propType()); Q_ASSERT(valueTypeMetaObject); return valueTypeMetaObject->property(d->valueTypeData.coreIndex()).typeName(); } else if (d->object && type() & Property && d->core.isValid()) { @@ -703,7 +703,7 @@ QString QQmlProperty::name() const // ### if (!d->object) { } else if (d->isValueType()) { - const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForMetaType(d->core.propType()); + const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForValueType(d->core.propType()); Q_ASSERT(valueTypeMetaObject); const char *vtName = valueTypeMetaObject->property(d->valueTypeData.coreIndex()).name(); diff --git a/src/qml/qml/qqmlpropertycachecreator.cpp b/src/qml/qml/qqmlpropertycachecreator.cpp index 5b44bd4f9d..ff607add09 100644 --- a/src/qml/qml/qqmlpropertycachecreator.cpp +++ b/src/qml/qml/qqmlpropertycachecreator.cpp @@ -132,7 +132,7 @@ QQmlRefPointer QQmlBindingInstantiationContext::instantiating // There is another overload that takes no version, which we shall not use here. return enginePrivate->rawPropertyCacheForType(instantiatingProperty->propType().id(), instantiatingProperty->typeVersion()); - } else if (const QMetaObject *vtmo = QQmlMetaType::metaObjectForMetaType(instantiatingProperty->propType())) { + } else if (const QMetaObject *vtmo = QQmlMetaType::metaObjectForValueType(instantiatingProperty->propType())) { return enginePrivate->cache(vtmo, instantiatingProperty->typeVersion()); } } diff --git a/src/qml/qml/qqmlpropertycachecreator_p.h b/src/qml/qml/qqmlpropertycachecreator_p.h index ae906bcf6c..0a5e642c9f 100644 --- a/src/qml/qml/qqmlpropertycachecreator_p.h +++ b/src/qml/qml/qqmlpropertycachecreator_p.h @@ -941,7 +941,7 @@ inline QQmlError QQmlPropertyCacheAliasCreator::propertyDataFor bindable = targetProperty->isBindable(); if (valueTypeIndex != -1) { - const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForMetaType(*type); + const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForValueType(*type); if (valueTypeMetaObject->property(valueTypeIndex).isEnumType()) *type = QMetaType::fromType(); else diff --git a/src/qml/qml/qqmlpropertyvalidator.cpp b/src/qml/qml/qqmlpropertyvalidator.cpp index 76a53e6737..deb747fa2f 100644 --- a/src/qml/qml/qqmlpropertyvalidator.cpp +++ b/src/qml/qml/qqmlpropertyvalidator.cpp @@ -231,7 +231,7 @@ QVector QQmlPropertyValidator::validateObject( if (binding->type >= QV4::CompiledData::Binding::Type_Object && (pd || binding->isAttachedProperty())) { const bool populatingValueTypeGroupProperty = pd - && QQmlMetaType::metaObjectForMetaType(pd->propType()) + && QQmlMetaType::metaObjectForValueType(pd->propType()) && !(binding->flags & QV4::CompiledData::Binding::IsOnAssignment); const QVector subObjectValidatorErrors = validateObject(binding->value.objectIndex, binding, @@ -299,7 +299,7 @@ QVector QQmlPropertyValidator::validateObject( return recordError(bindingError); } else if (binding->isGroupProperty()) { if (QQmlMetaType::isValueType(pd->propType())) { - if (QQmlMetaType::metaObjectForMetaType(pd->propType())) { + if (QQmlMetaType::metaObjectForValueType(pd->propType())) { if (!pd->isWritable()) { return recordError(binding->location, tr("Invalid property assignment: \"%1\" is a read-only property").arg(name)); } diff --git a/src/qml/qml/qqmltypecompiler.cpp b/src/qml/qml/qqmltypecompiler.cpp index 3eb71821ca..839d417a56 100644 --- a/src/qml/qml/qqmltypecompiler.cpp +++ b/src/qml/qml/qqmltypecompiler.cpp @@ -1145,7 +1145,7 @@ QQmlComponentAndAliasResolver::resolveAliasesInObject(int objectIndex, propIdx = QQmlPropertyIndex(targetProperty->coreIndex()); if (!subProperty.isEmpty()) { - const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForMetaType(targetProperty->propType()); + const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForValueType(targetProperty->propType()); if (!valueTypeMetaObject) { // could be a deep alias bool isDeepAlias = subProperty.at(0).isLower(); diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp index 2bada389ce..c2bbd7f498 100644 --- a/src/qml/qml/qqmlvaluetypewrapper.cpp +++ b/src/qml/qml/qqmlvaluetypewrapper.cpp @@ -120,7 +120,7 @@ bool QQmlValueTypeReference::readReferenceValue() const // We need to modify this reference to the updated value type, if // possible, or return false if it is not a value type. if (QQmlMetaType::isValueType(variantReferenceType)) { - const QMetaObject *mo = QQmlMetaType::metaObjectForMetaType(variantReferenceType); + const QMetaObject *mo = QQmlMetaType::metaObjectForValueType(variantReferenceType); if (d()->gadgetPtr()) { d()->valueType()->metaType.destruct(d()->gadgetPtr()); ::operator delete(d()->gadgetPtr()); -- cgit v1.2.3