diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2019-12-03 20:24:38 +0100 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2020-01-17 11:31:35 +0100 |
commit | c6899f16389458766904d8d913054f09076e06dd (patch) | |
tree | e24f942a01720775391ae04557e24a35839f7361 /src/qml/jsapi | |
parent | 9e674be4fb8c369873a009f58e3152a12d2c4cce (diff) |
Replace QVariant::type with QVariant::userType
as type is going to be deprecated.
This change was done automatically with the help of clazy.
In addition, ColumnRoleMetadata was changed to take an int instead
of a QVariant::Type
Change-Id: Ibc02d7b52e7d931a56c19fdebc4788b5e6df2a39
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/jsapi')
-rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index c2957dd294..b40bc1f18b 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -314,7 +314,7 @@ bool QJSValue::isBool() const if (val) return val->isBoolean(); QVariant *variant = QJSValuePrivate::getVariant(this); - return variant && variant->type() == QVariant::Bool; + return variant && variant->userType() == QMetaType::Bool; } /*! @@ -520,9 +520,9 @@ QString QJSValue::toString() const if (!val) { QVariant *variant = QJSValuePrivate::getVariant(this); Q_ASSERT(variant); - if (variant->type() == QVariant::Map) + if (variant->userType() == QMetaType::QVariantMap) return QStringLiteral("[object Object]"); - else if (variant->type() == QVariant::List) { + else if (variant->userType() == QMetaType::QVariantList) { const QVariantList list = variant->toList(); QString result; for (int i = 0; i < list.count(); ++i) { @@ -558,7 +558,7 @@ double QJSValue::toNumber() const QVariant *variant = QJSValuePrivate::getVariant(this); Q_ASSERT(variant); - if (variant->type() == QVariant::String) + if (variant->userType() == QMetaType::QString) return RuntimeHelpers::stringToNumber(variant->toString()); else if (variant->canConvert<double>()) return variant->value<double>(); @@ -1040,7 +1040,7 @@ bool QJSValue::equals(const QJSValue& other) const Q_ASSERT(variant); if (!ov) return *variant == *QJSValuePrivate::getVariant(&other); - if (variant->type() == QVariant::Map || variant->type() == QVariant::List) + if (variant->userType() == QMetaType::QVariantMap || variant->userType() == QMetaType::QVariantList) return false; return js_equal(variant->toString(), *ov); } @@ -1083,7 +1083,7 @@ bool QJSValue::strictlyEquals(const QJSValue& other) const Q_ASSERT(variant); if (!ov) return *variant == *QJSValuePrivate::getVariant(&other); - if (variant->type() == QVariant::Map || variant->type() == QVariant::List) + if (variant->userType() == QMetaType::QVariantMap || variant->userType() == QMetaType::QVariantList) return false; if (String *s = ov->stringValue()) return variant->toString() == s->toQString(); |