Replace most use of QVariant::type and occurrences of QVariant::Type

I made a clazy automated check that replaced the use of QVariant::Type
by the equivalent in QMetaType.
This has been deprecated since Qt 5.0, but many uses were not yet removed.

In addition, there was some manual changes to fix the compilation errors.

Adapted the Private API of QDateTimeParser and QMimeDataPrivate
and adjust QDateTimeEdit and QSpinBox.

QVariant(QVariant::Invalid) in qstylesheet made no sense.

But note that in QVariant::save, we actually wanted to use the non-user type.

In the SQL module, many changes were actually reverted because the API
still expects QVarient::Type.

Change-Id: I98c368490e4ee465ed3a3b63bda8b8eaa50ea67e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

9 files changed, 54 insertions, 54 deletions

diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index c0b0071e4d..a12eb98528 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -707,7 +707,7 @@ static Qt::Alignment parseAlignment(const QCss::Value *values, int count)
 static ColorData parseColorValue(QCss::Value v)
 {
     if (v.type == Value::Identifier || v.type == Value::String) {
-        v.variant.convert(QVariant::Color);
+        v.variant.convert(QMetaType::QColor);
         v.type = Value::Color;
     }
 
@@ -1143,7 +1143,7 @@ static bool setFontSizeFromValue(QCss::Value value, QFont *font, int *fontSizeAd
     } else if (s.endsWith(QLatin1String("px"), Qt::CaseInsensitive)) {
         s.chop(2);
         value.variant = s;
-        if (value.variant.convert(QVariant::Int)) {
+        if (value.variant.convert(QMetaType::Int)) {
             font->setPixelSize(value.variant.toInt());
             valid = true;
         }
@@ -1420,9 +1420,9 @@ QColor Declaration::colorValue(const QPalette &pal) const
         return QColor();
 
     if (d->parsed.isValid()) {
-        if (d->parsed.type() == QVariant::Color)
+        if (d->parsed.userType() == QMetaType::QColor)
             return qvariant_cast<QColor>(d->parsed);
-        if (d->parsed.type() == QVariant::Int)
+        if (d->parsed.userType() == QMetaType::Int)
             return pal.color((QPalette::ColorRole)(d->parsed.toInt()));
     }
 
@@ -1442,9 +1442,9 @@ QBrush Declaration::brushValue(const QPalette &pal) const
         return QBrush();
 
     if (d->parsed.isValid()) {
-        if (d->parsed.type() == QVariant::Brush)
+        if (d->parsed.userType() == QMetaType::QBrush)
             return qvariant_cast<QBrush>(d->parsed);
-        if (d->parsed.type() == QVariant::Int)
+        if (d->parsed.userType() == QMetaType::Int)
             return pal.color((QPalette::ColorRole)(d->parsed.toInt()));
     }
 
@@ -1469,9 +1469,9 @@ void Declaration::brushValues(QBrush *c, const QPalette &pal) const
         needParse = 0;
         QList<QVariant> v = d->parsed.toList();
         for (i = 0; i < qMin(v.count(), 4); i++) {
-            if (v.at(i).type() == QVariant::Brush) {
+            if (v.at(i).userType() == QMetaType::QBrush) {
                 c[i] = qvariant_cast<QBrush>(v.at(i));
-            } else if (v.at(i).type() == QVariant::Int) {
+            } else if (v.at(i).userType() == QMetaType::Int) {
                 c[i] = pal.color((QPalette::ColorRole)(v.at(i).toInt()));
             } else {
                 needParse |= (1<<i);
@@ -1598,7 +1598,7 @@ void Declaration::colorValues(QColor *c, const QPalette &pal) const
     if (d->parsed.isValid()) {
         QList<QVariant> v = d->parsed.toList();
         for (i = 0; i < qMin(d->values.count(), 4); i++) {
-            if (v.at(i).type() == QVariant::Color) {
+            if (v.at(i).userType() == QMetaType::QColor) {
                 c[i] = qvariant_cast<QColor>(v.at(i));
             } else {
                 c[i] = pal.color((QPalette::ColorRole)(v.at(i).toInt()));
@@ -2723,7 +2723,7 @@ bool Parser::parseTerm(Value *value)
     switch (lookup()) {
         case NUMBER:
             value->type = Value::Number;
-            value->variant.convert(QVariant::Double);
+            value->variant.convert(QMetaType::Double);
             break;
         case PERCENTAGE:
             value->type = Value::Percentage;
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 2e7d898a70..8f0d7d9d38 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -1753,7 +1753,7 @@ bool QFont::operator!=(const QFont &f) const
 */
 QFont::operator QVariant() const
 {
-    return QVariant(QVariant::Font, this);
+    return QVariant(QMetaType::QFont, this);
 }
 
 /*!
diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp
index 02e25bb6af..48ba8987f3 100644
--- a/src/gui/text/qplatformfontdatabase.cpp
+++ b/src/gui/text/qplatformfontdatabase.cpp
@@ -82,7 +82,7 @@ void QPlatformFontDatabase::registerQPF2Font(const QByteArray &dataArray, void *
 
         if (!fontName.isEmpty() && pixelSize) {
             QFont::Weight fontWeight = QFont::Normal;
-            if (weight.type() == QVariant::Int || weight.type() == QVariant::UInt)
+            if (weight.userType() == QMetaType::Int || weight.userType() == QMetaType::UInt)
                 fontWeight = QFont::Weight(weight.toInt());
 
             QFont::Style fontStyle = static_cast<QFont::Style>(style.toInt());
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 2d7f2bb844..46cfc79643 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -2234,7 +2234,7 @@ QVariant QTextDocument::loadResource(int type, const QUrl &name)
     }
 
     if (!r.isNull()) {
-        if (type == ImageResource && r.type() == QVariant::ByteArray) {
+        if (type == ImageResource && r.userType() == QMetaType::QByteArray) {
             if (qApp->thread() != QThread::currentThread()) {
                 // must use images in non-GUI threads
                 QImage image;
@@ -3049,12 +3049,12 @@ QString QTextHtmlExporter::findUrlForImage(const QTextDocument *doc, qint64 cach
         for (; it != priv->cachedResources.constEnd(); ++it) {
 
             const QVariant &v = it.value();
-            if (v.type() == QVariant::Image && !isPixmap) {
+            if (v.userType() == QMetaType::QImage && !isPixmap) {
                 if (qvariant_cast<QImage>(v).cacheKey() == cacheKey)
                     break;
             }
 
-            if (v.type() == QVariant::Pixmap && isPixmap) {
+            if (v.userType() == QMetaType::QPixmap && isPixmap) {
                 if (qvariant_cast<QPixmap>(v).cacheKey() == cacheKey)
                     break;
             }
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp
index e21a8d8d52..9d70873590 100644
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -248,7 +248,7 @@ public:
         if (v.isNull()) {
             return cellPadding;
         } else {
-            Q_ASSERT(v.userType() == QVariant::Double || v.userType() == QMetaType::Float);
+            Q_ASSERT(v.userType() == QMetaType::Double || v.userType() == QMetaType::Float);
             return QFixed::fromReal(v.toReal() * deviceScale);
         }
     }
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index e3bd49a15e..10b8ade117 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -144,7 +144,7 @@ QT_BEGIN_NAMESPACE
 */
 QTextLength::operator QVariant() const
 {
-    return QVariant(QVariant::TextLength, this);
+    return QVariant(QMetaType::QTextLength, this);
 }
 
 #ifndef QT_NO_DATASTREAM
@@ -288,20 +288,20 @@ static inline uint variantHash(const QVariant &variant)
 {
     // simple and fast hash functions to differentiate between type and value
     switch (variant.userType()) { // sorted by occurrence frequency
-    case QVariant::String: return qHash(variant.toString());
-    case QVariant::Double: return qHash(variant.toDouble());
-    case QVariant::Int: return 0x811890 + variant.toInt();
-    case QVariant::Brush:
+    case QMetaType::QString: return qHash(variant.toString());
+    case QMetaType::Double: return qHash(variant.toDouble());
+    case QMetaType::Int: return 0x811890 + variant.toInt();
+    case QMetaType::QBrush:
         return 0x01010101 + hash(qvariant_cast<QBrush>(variant));
-    case QVariant::Bool: return 0x371818 + variant.toBool();
-    case QVariant::Pen: return 0x02020202 + hash(qvariant_cast<QPen>(variant));
-    case QVariant::List:
+    case QMetaType::Bool: return 0x371818 + variant.toBool();
+    case QMetaType::QPen: return 0x02020202 + hash(qvariant_cast<QPen>(variant));
+    case QMetaType::QVariantList:
         return 0x8377 + qvariant_cast<QVariantList>(variant).count();
-    case QVariant::Color: return hash(qvariant_cast<QColor>(variant));
-      case QVariant::TextLength:
+    case QMetaType::QColor: return hash(qvariant_cast<QColor>(variant));
+      case QMetaType::QTextLength:
         return 0x377 + hash(qvariant_cast<QTextLength>(variant).rawValue());
     case QMetaType::Float: return qHash(variant.toFloat());
-    case QVariant::Invalid: return 0;
+    case QMetaType::UnknownType: return 0;
     default: break;
     }
     return qHash(variant.typeName());
@@ -874,7 +874,7 @@ QTextFormat::~QTextFormat()
 */
 QTextFormat::operator QVariant() const
 {
-    return QVariant(QVariant::TextFormat, this);
+    return QVariant(QMetaType::QTextFormat, this);
 }
 
 /*!
@@ -984,7 +984,7 @@ bool QTextFormat::boolProperty(int propertyId) const
     if (!d)
         return false;
     const QVariant prop = d->property(propertyId);
-    if (prop.userType() != QVariant::Bool)
+    if (prop.userType() != QMetaType::Bool)
         return false;
     return prop.toBool();
 }
@@ -1004,7 +1004,7 @@ int QTextFormat::intProperty(int propertyId) const
     if (!d)
         return def;
     const QVariant prop = d->property(propertyId);
-    if (prop.userType() != QVariant::Int)
+    if (prop.userType() != QMetaType::Int)
         return def;
     return prop.toInt();
 }
@@ -1022,7 +1022,7 @@ qreal QTextFormat::doubleProperty(int propertyId) const
     if (!d)
         return 0.;
     const QVariant prop = d->property(propertyId);
-    if (prop.userType() != QVariant::Double && prop.userType() != QMetaType::Float)
+    if (prop.userType() != QMetaType::Double && prop.userType() != QMetaType::Float)
         return 0.;
     return qvariant_cast<qreal>(prop);
 }
@@ -1040,7 +1040,7 @@ QString QTextFormat::stringProperty(int propertyId) const
     if (!d)
         return QString();
     const QVariant prop = d->property(propertyId);
-    if (prop.userType() != QVariant::String)
+    if (prop.userType() != QMetaType::QString)
         return QString();
     return prop.toString();
 }
@@ -1058,7 +1058,7 @@ QColor QTextFormat::colorProperty(int propertyId) const
     if (!d)
         return QColor();
     const QVariant prop = d->property(propertyId);
-    if (prop.userType() != QVariant::Color)
+    if (prop.userType() != QMetaType::QColor)
         return QColor();
     return qvariant_cast<QColor>(prop);
 }
@@ -1076,7 +1076,7 @@ QPen QTextFormat::penProperty(int propertyId) const
     if (!d)
         return QPen(Qt::NoPen);
     const QVariant prop = d->property(propertyId);
-    if (prop.userType() != QVariant::Pen)
+    if (prop.userType() != QMetaType::QPen)
         return QPen(Qt::NoPen);
     return qvariant_cast<QPen>(prop);
 }
@@ -1094,7 +1094,7 @@ QBrush QTextFormat::brushProperty(int propertyId) const
     if (!d)
         return QBrush(Qt::NoBrush);
     const QVariant prop = d->property(propertyId);
-    if (prop.userType() != QVariant::Brush)
+    if (prop.userType() != QMetaType::QBrush)
         return QBrush(Qt::NoBrush);
     return qvariant_cast<QBrush>(prop);
 }
@@ -1126,13 +1126,13 @@ QVector<QTextLength> QTextFormat::lengthVectorProperty(int propertyId) const
     if (!d)
         return vector;
     const QVariant prop = d->property(propertyId);
-    if (prop.userType() != QVariant::List)
+    if (prop.userType() != QMetaType::QVariantList)
         return vector;
 
     QList<QVariant> propertyList = prop.toList();
     for (int i=0; i<propertyList.size(); ++i) {
         QVariant var = propertyList.at(i);
-        if (var.userType() == QVariant::TextLength)
+        if (var.userType() == QMetaType::QTextLength)
             vector.append(qvariant_cast<QTextLength>(var));
     }
 
@@ -1222,7 +1222,7 @@ int QTextFormat::objectIndex() const
     if (!d)
         return -1;
     const QVariant prop = d->property(ObjectIndex);
-    if (prop.userType() != QVariant::Int) // ####
+    if (prop.userType() != QMetaType::Int) // ####
         return -1;
     return prop.toInt();
 }
@@ -1859,9 +1859,9 @@ void QTextCharFormat::setUnderlineStyle(UnderlineStyle style)
 QString QTextCharFormat::anchorName() const
 {
     QVariant prop = property(AnchorName);
-    if (prop.userType() == QVariant::StringList)
+    if (prop.userType() == QMetaType::QStringList)
         return prop.toStringList().value(0);
-    else if (prop.userType() != QVariant::String)
+    else if (prop.userType() != QMetaType::QString)
         return QString();
     return prop.toString();
 }
@@ -1878,9 +1878,9 @@ QString QTextCharFormat::anchorName() const
 QStringList QTextCharFormat::anchorNames() const
 {
     QVariant prop = property(AnchorName);
-    if (prop.userType() == QVariant::StringList)
+    if (prop.userType() == QMetaType::QStringList)
         return prop.toStringList();
-    else if (prop.userType() != QVariant::String)
+    else if (prop.userType() != QMetaType::QString)
         return QStringList();
     return QStringList(prop.toString());
 }
diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp
index 3b9f2d253e..f003544391 100644
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
@@ -1451,19 +1451,19 @@ void QTextHtmlParserNode::applyBackgroundImage(const QString &url, const QTextDo
 
         if (QCoreApplication::instance()->thread() != QThread::currentThread()) {
             // must use images in non-GUI threads
-            if (val.type() == QVariant::Image) {
+            if (val.userType() == QMetaType::QImage) {
                 QImage image = qvariant_cast<QImage>(val);
                 charFormat.setBackground(image);
-            } else if (val.type() == QVariant::ByteArray) {
+            } else if (val.userType() == QMetaType::QByteArray) {
                 QImage image;
                 if (image.loadFromData(val.toByteArray())) {
                     charFormat.setBackground(image);
                 }
             }
         } else {
-            if (val.type() == QVariant::Image || val.type() == QVariant::Pixmap) {
+            if (val.userType() == QMetaType::QImage || val.userType() == QMetaType::QPixmap) {
                 charFormat.setBackground(qvariant_cast<QPixmap>(val));
-            } else if (val.type() == QVariant::ByteArray) {
+            } else if (val.userType() == QMetaType::QByteArray) {
                 QPixmap pm;
                 if (pm.loadFromData(val.toByteArray())) {
                     charFormat.setBackground(pm);
@@ -1907,9 +1907,9 @@ void QTextHtmlParser::importStyleSheet(const QString &href)
 
     QVariant res = resourceProvider->resource(QTextDocument::StyleSheetResource, href);
     QString css;
-    if (res.type() == QVariant::String) {
+    if (res.userType() == QMetaType::QString) {
         css = res.toString();
-    } else if (res.type() == QVariant::ByteArray) {
+    } else if (res.userType() == QMetaType::QByteArray) {
         // #### detect @charset
         css = QString::fromUtf8(res.toByteArray());
     }
diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp
index 14018f34da..0d87a2135d 100644
--- a/src/gui/text/qtextimagehandler.cpp
+++ b/src/gui/text/qtextimagehandler.cpp
@@ -88,9 +88,9 @@ static QPixmap getPixmap(QTextDocument *doc, const QTextImageFormat &format, con
     qreal sourcePixelRatio = 1.0;
     name = resolveFileName(name, &url, devicePixelRatio, &sourcePixelRatio);
     const QVariant data = doc->resource(QTextDocument::ImageResource, url);
-    if (data.type() == QVariant::Pixmap || data.type() == QVariant::Image) {
+    if (data.userType() == QMetaType::QPixmap || data.userType() == QMetaType::QImage) {
         pm = qvariant_cast<QPixmap>(data);
-    } else if (data.type() == QVariant::ByteArray) {
+    } else if (data.userType() == QMetaType::QByteArray) {
         pm.loadFromData(data.toByteArray());
     }
 
@@ -170,9 +170,9 @@ static QImage getImage(QTextDocument *doc, const QTextImageFormat &format, const
     qreal sourcePixelRatio = 1.0;
     name = resolveFileName(name, &url, devicePixelRatio, &sourcePixelRatio);
     const QVariant data = doc->resource(QTextDocument::ImageResource, url);
-    if (data.type() == QVariant::Image) {
+    if (data.userType() == QMetaType::QImage) {
         image = qvariant_cast<QImage>(data);
-    } else if (data.type() == QVariant::ByteArray) {
+    } else if (data.userType() == QMetaType::QByteArray) {
         image.loadFromData(data.toByteArray());
     }
 
diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index 408e3ec167..155ec43c50 100644
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -455,9 +455,9 @@ void QTextOdfWriter::writeInlineCharacter(QXmlStreamWriter &writer, const QTextF
             name.prepend(QLatin1String("qrc"));
         QUrl url = QUrl(name);
         const QVariant variant = m_document->resource(QTextDocument::ImageResource, url);
-        if (variant.type() == QVariant::Image) {
+        if (variant.userType() == QMetaType::QImage) {
             image = qvariant_cast<QImage>(variant);
-        } else if (variant.type() == QVariant::ByteArray) {
+        } else if (variant.userType() == QMetaType::QByteArray) {
             data = variant.toByteArray();
 
             QBuffer buffer(&data);