diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-08 12:33:23 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-16 08:36:58 +0200 |
commit | 0b92a93e8e165520b12cb8ca1d0a8812ed6e046b (patch) | |
tree | abd70e7ce9477a31578d85d499ba69052d2befc5 /src/qml/jsruntime | |
parent | 7dab889190b2289a7c4b48e732d7cb7838dbf297 (diff) |
Avoid various warnings about deprected QMetaType methods
Change-Id: I8f4b2703fdd08ff341904219cec33c321e0511c7
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/qml/jsruntime')
-rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 8 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 16 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4variantobject.cpp | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index d1d8e47722..5d1fa758cd 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -1830,7 +1830,7 @@ QV4::ReturnedValue QV4::ExecutionEngine::fromVariant(const QVariant &variant) a->arrayPut(ii, (v = QV4::QObjectWrapper::wrap(this, list.at(ii)))); a->setArrayLengthUnchecked(list.count()); return a.asReturnedValue(); - } else if (QMetaType::typeFlags(type) & QMetaType::PointerToQObject) { + } else if (QMetaType(type).flags() & QMetaType::PointerToQObject) { return QV4::QObjectWrapper::wrap(this, *reinterpret_cast<QObject* const *>(ptr)); } @@ -2338,11 +2338,11 @@ bool ExecutionEngine::metaTypeFromJS(const Value &value, int type, void *data) // Try to use magic; for compatibility with qjsvalue_cast. - QByteArray name = QMetaType::typeName(type); + QByteArray name = QMetaType(type).name(); if (convertToNativeQObject(value, name, reinterpret_cast<void* *>(data))) return true; if (value.as<QV4::VariantObject>() && name.endsWith('*')) { - int valueType = QMetaType::type(name.left(name.size()-1)); + int valueType = QMetaType::fromName(name.left(name.size()-1)).id(); QVariant &var = value.as<QV4::VariantObject>()->d()->data(); if (valueType == var.userType()) { // We have T t, T* is requested, so return &t. @@ -2365,7 +2365,7 @@ bool ExecutionEngine::metaTypeFromJS(const Value &value, int type, void *data) canCast = qobject->qt_metacast(className) != nullptr; } if (canCast) { - QByteArray varTypeName = QMetaType::typeName(var.userType()); + QByteArray varTypeName = QMetaType(var.userType()).name(); if (varTypeName.endsWith('*')) *reinterpret_cast<void* *>(data) = *reinterpret_cast<void* *>(var.data()); else diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index 95672a8635..ee3be6fcdc 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -464,10 +464,10 @@ void QObjectWrapper::setProperty(ExecutionEngine *engine, QObject *object, QQmlP if (!property->isVarProperty() && property->propType() != qMetaTypeId<QJSValue>()) { // assigning a JS function to a non var or QJSValue property or is not allowed. QString error = QLatin1String("Cannot assign JavaScript function to "); - if (!QMetaType::typeName(property->propType())) + if (!QMetaType(property->propType()).name()) error += QLatin1String("[unknown property type]"); else - error += QLatin1String(QMetaType::typeName(property->propType())); + error += QLatin1String(QMetaType(property->propType()).name()); scope.engine->throwError(error); return; } @@ -533,10 +533,10 @@ void QObjectWrapper::setProperty(ExecutionEngine *engine, QObject *object, QQmlP PROPERTY_STORE(QJSValue, QJSValuePrivate::fromReturnedValue(value.asReturnedValue())); } else if (value.isUndefined() && property->propType() != qMetaTypeId<QQmlScriptString>()) { QString error = QLatin1String("Cannot assign [undefined] to "); - if (!QMetaType::typeName(property->propType())) + if (!QMetaType(property->propType()).name()) error += QLatin1String("[unknown property type]"); else - error += QLatin1String(QMetaType::typeName(property->propType())); + error += QLatin1String(QMetaType(property->propType()).name()); scope.engine->throwError(error); return; } else if (value.as<FunctionObject>()) { @@ -576,9 +576,9 @@ void QObjectWrapper::setProperty(ExecutionEngine *engine, QObject *object, QQmlP if (!QQmlPropertyPrivate::write(object, *property, v, callingQmlContext)) { const char *valueType = (v.userType() == QMetaType::UnknownType) ? "an unknown type" - : QMetaType::typeName(v.userType()); + : QMetaType(v.userType()).name(); - const char *targetTypeName = QMetaType::typeName(property->propType()); + const char *targetTypeName = QMetaType(property->propType()).name(); if (!targetTypeName) targetTypeName = "an unregistered type"; @@ -1441,7 +1441,7 @@ static int MatchScore(const QV4::Value &actual, int conversionType) case QMetaType::QJsonValue: return 0; default: { - const char *typeName = QMetaType::typeName(conversionType); + const char *typeName = QMetaType(conversionType).name(); if (typeName && typeName[strlen(typeName) - 1] == '*') return 0; else @@ -1471,7 +1471,7 @@ static int MatchScore(const QV4::Value &actual, int conversionType) const QVariant v = obj->engine()->toVariant(actual, -1); if (v.userType() == conversionType) return 0; - else if (v.canConvert(conversionType)) + else if (v.canConvert(QMetaType(conversionType))) return 5; return 10; } else if (conversionType == QMetaType::QJsonObject) { diff --git a/src/qml/jsruntime/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp index 9d7b3c6e9a..ee813b68de 100644 --- a/src/qml/jsruntime/qv4variantobject.cpp +++ b/src/qml/jsruntime/qv4variantobject.cpp @@ -139,7 +139,7 @@ ReturnedValue VariantPrototype::method_toString(const FunctionObject *b, const V RETURN_UNDEFINED(); const QVariant variant = o->d()->data(); QString result = variant.toString(); - if (result.isEmpty() && !variant.canConvert(QMetaType::QString)) { + if (result.isEmpty() && !variant.canConvert(QMetaType(QMetaType::QString))) { QDebug dbg(&result); dbg << variant; // QDebug appends a space, we're not interested in continuing the stream so we chop it off. @@ -167,7 +167,7 @@ ReturnedValue VariantPrototype::method_valueOf(const FunctionObject *b, const Va case QMetaType::Bool: return Encode(v.toBool()); default: - if (QMetaType::typeFlags(v.userType()) & QMetaType::IsEnumeration) + if (QMetaType(v.metaType()).flags() & QMetaType::IsEnumeration) RETURN_RESULT(Encode(v.toInt())); break; } |