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>

1 files changed, 10 insertions, 10 deletions

diff --git a/src/qml/jsruntime/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp
index e117e509ab..9d7b3c6e9a 100644
--- a/src/qml/jsruntime/qv4variantobject.cpp
+++ b/src/qml/jsruntime/qv4variantobject.cpp
@@ -65,8 +65,8 @@ void Heap::VariantObject::init(const QVariant &value)
 
 bool VariantObject::Data::isScarce() const
 {
-    QVariant::Type t = data().type();
-    return t == QVariant::Pixmap || t == QVariant::Image;
+    int t = data().userType();
+    return t == QMetaType::QPixmap || t == QMetaType::QImage;
 }
 
 bool VariantObject::virtualIsEqualTo(Managed *m, Managed *other)
@@ -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(QVariant::String)) {
+    if (result.isEmpty() && !variant.canConvert(QMetaType::QString)) {
         QDebug dbg(&result);
         dbg << variant;
         // QDebug appends a space, we're not interested in continuing the stream so we chop it off.
@@ -154,17 +154,17 @@ ReturnedValue VariantPrototype::method_valueOf(const FunctionObject *b, const Va
     const VariantObject *o = thisObject->as<QV4::VariantObject>();
     if (o) {
         QVariant v = o->d()->data();
-        switch (v.type()) {
-        case QVariant::Invalid:
+        switch (v.userType()) {
+        case QMetaType::UnknownType:
             return Encode::undefined();
-        case QVariant::String:
+        case QMetaType::QString:
             return Encode(b->engine()->newString(v.toString()));
-        case QVariant::Int:
+        case QMetaType::Int:
             return Encode(v.toInt());
-        case QVariant::Double:
-        case QVariant::UInt:
+        case QMetaType::Double:
+        case QMetaType::UInt:
             return Encode(v.toDouble());
-        case QVariant::Bool:
+        case QMetaType::Bool:
             return Encode(v.toBool());
         default:
             if (QMetaType::typeFlags(v.userType()) & QMetaType::IsEnumeration)