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>

10 files changed, 89 insertions, 89 deletions

diff --git a/examples/corelib/serialization/convert/cborconverter.cpp b/examples/corelib/serialization/convert/cborconverter.cpp
index 60410ed26a..77df367e50 100644
--- a/examples/corelib/serialization/convert/cborconverter.cpp
+++ b/examples/corelib/serialization/convert/cborconverter.cpp
@@ -134,7 +134,7 @@ static QVariant convertCborValue(const QCborValue &value)
 enum TrimFloatingPoint { Double, Float, Float16 };
 static QCborValue convertFromVariant(const QVariant &v, TrimFloatingPoint fpTrimming)
 {
-    if (v.userType() == QVariant::List) {
+    if (v.userType() == QMetaType::QVariantList) {
         const QVariantList list = v.toList();
         QCborArray array;
         for (const QVariant &v : list)
@@ -152,7 +152,7 @@ static QCborValue convertFromVariant(const QVariant &v, TrimFloatingPoint fpTrim
         return map;
     }
 
-    if (v.userType() == QVariant::Double && fpTrimming != Double) {
+    if (v.userType() == QMetaType::Double && fpTrimming != Double) {
         float f = float(v.toDouble());
         if (fpTrimming == Float16)
             return float(qfloat16(f));
diff --git a/examples/corelib/serialization/convert/datastreamconverter.cpp b/examples/corelib/serialization/convert/datastreamconverter.cpp
index 7e9f5e1bdc..6f0ca41ff5 100644
--- a/examples/corelib/serialization/convert/datastreamconverter.cpp
+++ b/examples/corelib/serialization/convert/datastreamconverter.cpp
@@ -96,8 +96,8 @@ static QString dumpVariant(const QVariant &v, const QString &indent = QLatin1Str
     QString indented = indent + QLatin1String("  ");
 
     int type = v.userType();
-    if (type == qMetaTypeId<VariantOrderedMap>() || type == QVariant::Map) {
-        const auto map = (type == QVariant::Map) ?
+    if (type == qMetaTypeId<VariantOrderedMap>() || type == QMetaType::QVariantMap) {
+        const auto map = (type == QMetaType::QVariantMap) ?
                     VariantOrderedMap(v.toMap()) : qvariant_cast<VariantOrderedMap>(v);
 
         result = QLatin1String("Map {");
@@ -109,7 +109,7 @@ static QString dumpVariant(const QVariant &v, const QString &indent = QLatin1Str
         }
         result.chop(1);             // remove comma
         result += indent + QLatin1String("},");
-    } else if (type == QVariant::List) {
+    } else if (type == QMetaType::QVariantList) {
         const QVariantList list = v.toList();
 
         result = QLatin1String("List [");
diff --git a/examples/corelib/serialization/convert/textconverter.cpp b/examples/corelib/serialization/convert/textconverter.cpp
index 7aed08f96c..ae03b9a334 100644
--- a/examples/corelib/serialization/convert/textconverter.cpp
+++ b/examples/corelib/serialization/convert/textconverter.cpp
@@ -56,21 +56,21 @@
 static void dumpVariant(QTextStream &out, const QVariant &v)
 {
     switch (v.userType()) {
-    case QVariant::List: {
+    case QMetaType::QVariantList: {
         const QVariantList list = v.toList();
         for (const QVariant &item : list)
             dumpVariant(out, item);
         break;
     }
 
-    case QVariant::String: {
+    case QMetaType::QString: {
         const QStringList list = v.toStringList();
         for (const QString &s : list)
             out << s << Qt::endl;
         break;
     }
 
-    case QVariant::Map: {
+    case QMetaType::QVariantMap: {
         const QVariantMap map = v.toMap();
         for (auto it = map.begin(); it != map.end(); ++it) {
             out << it.key() << " => ";
diff --git a/examples/corelib/serialization/convert/xmlconverter.cpp b/examples/corelib/serialization/convert/xmlconverter.cpp
index d9e724dfe1..42cb10100a 100644
--- a/examples/corelib/serialization/convert/xmlconverter.cpp
+++ b/examples/corelib/serialization/convert/xmlconverter.cpp
@@ -284,18 +284,18 @@ static QVariant variantFromXml(QXmlStreamReader &xml, Converter::Options options
         ba.resize(n);
         result = ba;
     } else {
-        int id = QVariant::Invalid;
+        int id = QMetaType::UnknownType;
         if (type == QLatin1String("datetime"))
-            id = QVariant::DateTime;
+            id = QMetaType::QDateTime;
         else if (type == QLatin1String("url"))
-            id = QVariant::Url;
+            id = QMetaType::QUrl;
         else if (type == QLatin1String("uuid"))
-            id = QVariant::Uuid;
+            id = QMetaType::QUuid;
         else if (type == QLatin1String("regex"))
-            id = QVariant::RegularExpression;
+            id = QMetaType::QRegularExpression;
         else
             id = QMetaType::type(type.toLatin1());
-        if (id == QVariant::Invalid) {
+        if (id == QMetaType::UnknownType) {
             fprintf(stderr, "%lld:%lld: Invalid XML: unknown type '%s'.\n",
                     xml.lineNumber(), xml.columnNumber(), qPrintable(type.toString()));
             exit(EXIT_FAILURE);
@@ -327,14 +327,14 @@ static QVariant variantFromXml(QXmlStreamReader &xml, Converter::Options options
 static void variantToXml(QXmlStreamWriter &xml, const QVariant &v)
 {
     int type = v.userType();
-    if (type == QVariant::List) {
+    if (type == QMetaType::QVariantList) {
         QVariantList list = v.toList();
         xml.writeStartElement("list");
         for (const QVariant &v : list)
             variantToXml(xml, v);
         xml.writeEndElement();
-    } else if (type == QVariant::Map || type == qMetaTypeId<VariantOrderedMap>()) {
-        const VariantOrderedMap map = (type == QVariant::Map) ?
+    } else if (type == QMetaType::QVariantMap || type == qMetaTypeId<VariantOrderedMap>()) {
+        const VariantOrderedMap map = (type == QMetaType::QVariantMap) ?
                     VariantOrderedMap(v.toMap()) :
                     qvariant_cast<VariantOrderedMap>(v);
 
@@ -433,7 +433,7 @@ static void variantToXml(QXmlStreamWriter &xml, const QVariant &v)
                 // does this convert to string?
                 const char *typeName = v.typeName();
                 QVariant copy = v;
-                if (copy.convert(QVariant::String)) {
+                if (copy.convert(QMetaType::QString)) {
                     xml.writeAttribute(typeString, QString::fromLatin1(typeName));
                     xml.writeCharacters(copy.toString());
                 } else {
diff --git a/examples/network/torrent/trackerclient.cpp b/examples/network/torrent/trackerclient.cpp
index 540ab31557..a50a49fd64 100644
--- a/examples/network/torrent/trackerclient.cpp
+++ b/examples/network/torrent/trackerclient.cpp
@@ -209,7 +209,7 @@ void TrackerClient::httpRequestDone(QNetworkReply *reply)
         // store it
         peers.clear();
         QVariant peerEntry = dict.value("peers");
-        if (peerEntry.type() == QVariant::List) {
+        if (peerEntry.userType() == QMetaType::QVariantList) {
             QList<QVariant> peerTmp = peerEntry.toList();
             for (int i = 0; i < peerTmp.size(); ++i) {
                 TorrentPeer tmp;
diff --git a/examples/widgets/itemviews/coloreditorfactory/window.cpp b/examples/widgets/itemviews/coloreditorfactory/window.cpp
index e4a9379d8f..25e196a80c 100644
--- a/examples/widgets/itemviews/coloreditorfactory/window.cpp
+++ b/examples/widgets/itemviews/coloreditorfactory/window.cpp
@@ -61,7 +61,7 @@ Window::Window()
     QItemEditorCreatorBase *colorListCreator =
         new QStandardItemEditorCreator<ColorListEditor>();
 
-    factory->registerEditor(QVariant::Color, colorListCreator);
+    factory->registerEditor(QMetaType::QColor, colorListCreator);
 
     QItemEditorFactory::setDefaultFactory(factory);
 
diff --git a/examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp b/examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp
index 4753d04d9b..b0b4017e62 100644
--- a/examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp
+++ b/examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp
@@ -98,7 +98,7 @@ bool MySortFilterProxyModel::lessThan(const QModelIndex &left,
 //! [4]
 
 //! [6]
-    if (leftData.type() == QVariant::DateTime) {
+    if (leftData.userType() == QMetaType::QDateTime) {
         return leftData.toDateTime() < rightData.toDateTime();
     } else {
         static const QRegularExpression emailPattern("[\\w\\.]*@[\\w\\.]*");
diff --git a/examples/widgets/tools/settingseditor/settingstree.cpp b/examples/widgets/tools/settingseditor/settingstree.cpp
index 49d299bf72..9132368e4a 100644
--- a/examples/widgets/tools/settingseditor/settingstree.cpp
+++ b/examples/widgets/tools/settingseditor/settingstree.cpp
@@ -208,7 +208,7 @@ void SettingsTree::updateChildItems(QTreeWidgetItem *parent)
         }
 
         QVariant value = settings->value(key);
-        if (value.type() == QVariant::Invalid) {
+        if (value.userType() == QMetaType::UnknownType) {
             child->setText(1, "Invalid");
         } else {
             child->setText(1, value.typeName());
diff --git a/examples/widgets/tools/settingseditor/variantdelegate.cpp b/examples/widgets/tools/settingseditor/variantdelegate.cpp
index 9772fe8a41..eb822f0dc2 100644
--- a/examples/widgets/tools/settingseditor/variantdelegate.cpp
+++ b/examples/widgets/tools/settingseditor/variantdelegate.cpp
@@ -81,7 +81,7 @@ void VariantDelegate::paint(QPainter *painter,
 {
     if (index.column() == 2) {
         QVariant value = index.model()->data(index, Qt::UserRole);
-        if (!isSupportedType(value.type())) {
+        if (!isSupportedType(value.userType())) {
             QStyleOptionViewItem myOption = option;
             myOption.state &= ~QStyle::State_Enabled;
             QStyledItemDelegate::paint(painter, myOption, index);
@@ -100,7 +100,7 @@ QWidget *VariantDelegate::createEditor(QWidget *parent,
         return nullptr;
 
     QVariant originalValue = index.model()->data(index, Qt::UserRole);
-    if (!isSupportedType(originalValue.type()))
+    if (!isSupportedType(originalValue.userType()))
         return nullptr;
 
     QLineEdit *lineEdit = new QLineEdit(parent);
@@ -108,46 +108,46 @@ QWidget *VariantDelegate::createEditor(QWidget *parent,
 
     QRegularExpression regExp;
 
-    switch (originalValue.type()) {
-    case QVariant::Bool:
+    switch (originalValue.userType()) {
+    case QMetaType::Bool:
         regExp = boolExp;
         break;
-    case QVariant::ByteArray:
+    case QMetaType::QByteArray:
         regExp = byteArrayExp;
         break;
-    case QVariant::Char:
+    case QMetaType::QChar:
         regExp = charExp;
         break;
-    case QVariant::Color:
+    case QMetaType::QColor:
         regExp = colorExp;
         break;
-    case QVariant::Date:
+    case QMetaType::QDate:
         regExp = dateExp;
         break;
-    case QVariant::DateTime:
+    case QMetaType::QDateTime:
         regExp = dateTimeExp;
         break;
-    case QVariant::Double:
+    case QMetaType::Double:
         regExp = doubleExp;
         break;
-    case QVariant::Int:
-    case QVariant::LongLong:
+    case QMetaType::Int:
+    case QMetaType::LongLong:
         regExp = signedIntegerExp;
         break;
-    case QVariant::Point:
+    case QMetaType::QPoint:
         regExp = pointExp;
         break;
-    case QVariant::Rect:
+    case QMetaType::QRect:
         regExp = rectExp;
         break;
-    case QVariant::Size:
+    case QMetaType::QSize:
         regExp = sizeExp;
         break;
-    case QVariant::Time:
+    case QMetaType::QTime:
         regExp = timeExp;
         break;
-    case QVariant::UInt:
-    case QVariant::ULongLong:
+    case QMetaType::UInt:
+    case QMetaType::ULongLong:
         regExp = unsignedIntegerExp;
         break;
     default:
@@ -189,18 +189,18 @@ void VariantDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
     QVariant value;
     QRegularExpressionMatch match;
 
-    switch (originalValue.type()) {
-    case QVariant::Char:
+    switch (originalValue.userType()) {
+    case QMetaType::QChar:
         value = text.at(0);
         break;
-    case QVariant::Color:
+    case QMetaType::QColor:
         match = colorExp.match(text);
         value = QColor(qMin(match.captured(1).toInt(), 255),
                        qMin(match.captured(2).toInt(), 255),
                        qMin(match.captured(3).toInt(), 255),
                        qMin(match.captured(4).toInt(), 255));
         break;
-    case QVariant::Date:
+    case QMetaType::QDate:
         {
             QDate date = QDate::fromString(text, Qt::ISODate);
             if (!date.isValid())
@@ -208,7 +208,7 @@ void VariantDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
             value = date;
         }
         break;
-    case QVariant::DateTime:
+    case QMetaType::QDateTime:
         {
             QDateTime dateTime = QDateTime::fromString(text, Qt::ISODate);
             if (!dateTime.isValid())
@@ -216,23 +216,23 @@ void VariantDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
             value = dateTime;
         }
         break;
-    case QVariant::Point:
+    case QMetaType::QPoint:
         match = pointExp.match(text);
         value = QPoint(match.captured(1).toInt(), match.captured(2).toInt());
         break;
-    case QVariant::Rect:
+    case QMetaType::QRect:
         match = rectExp.match(text);
         value = QRect(match.captured(1).toInt(), match.captured(2).toInt(),
                       match.captured(3).toInt(), match.captured(4).toInt());
         break;
-    case QVariant::Size:
+    case QMetaType::QSize:
         match = sizeExp.match(text);
         value = QSize(match.captured(1).toInt(), match.captured(2).toInt());
         break;
-    case QVariant::StringList:
+    case QMetaType::QStringList:
         value = text.split(',');
         break;
-    case QVariant::Time:
+    case QMetaType::QTime:
         {
             QTime time = QTime::fromString(text, Qt::ISODate);
             if (!time.isValid())
@@ -242,33 +242,33 @@ void VariantDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
         break;
     default:
         value = text;
-        value.convert(originalValue.type());
+        value.convert(originalValue.userType());
     }
 
     model->setData(index, displayText(value), Qt::DisplayRole);
     model->setData(index, value, Qt::UserRole);
 }
 
-bool VariantDelegate::isSupportedType(QVariant::Type type)
+bool VariantDelegate::isSupportedType(int type)
 {
     switch (type) {
-    case QVariant::Bool:
-    case QVariant::ByteArray:
-    case QVariant::Char:
-    case QVariant::Color:
-    case QVariant::Date:
-    case QVariant::DateTime:
-    case QVariant::Double:
-    case QVariant::Int:
-    case QVariant::LongLong:
-    case QVariant::Point:
-    case QVariant::Rect:
-    case QVariant::Size:
-    case QVariant::String:
-    case QVariant::StringList:
-    case QVariant::Time:
-    case QVariant::UInt:
-    case QVariant::ULongLong:
+    case QMetaType::Bool:
+    case QMetaType::QByteArray:
+    case QMetaType::QChar:
+    case QMetaType::QColor:
+    case QMetaType::QDate:
+    case QMetaType::QDateTime:
+    case QMetaType::Double:
+    case QMetaType::Int:
+    case QMetaType::LongLong:
+    case QMetaType::QPoint:
+    case QMetaType::QRect:
+    case QMetaType::QSize:
+    case QMetaType::QString:
+    case QMetaType::QStringList:
+    case QMetaType::QTime:
+    case QMetaType::UInt:
+    case QMetaType::ULongLong:
         return true;
     default:
         return false;
@@ -277,50 +277,50 @@ bool VariantDelegate::isSupportedType(QVariant::Type type)
 
 QString VariantDelegate::displayText(const QVariant &value)
 {
-    switch (value.type()) {
-    case QVariant::Bool:
-    case QVariant::ByteArray:
-    case QVariant::Char:
-    case QVariant::Double:
-    case QVariant::Int:
-    case QVariant::LongLong:
-    case QVariant::String:
-    case QVariant::UInt:
-    case QVariant::ULongLong:
+    switch (value.userType()) {
+    case QMetaType::Bool:
+    case QMetaType::QByteArray:
+    case QMetaType::QChar:
+    case QMetaType::Double:
+    case QMetaType::Int:
+    case QMetaType::LongLong:
+    case QMetaType::QString:
+    case QMetaType::UInt:
+    case QMetaType::ULongLong:
         return value.toString();
-    case QVariant::Color:
+    case QMetaType::QColor:
         {
             QColor color = qvariant_cast<QColor>(value);
             return QString("(%1,%2,%3,%4)")
                    .arg(color.red()).arg(color.green())
                    .arg(color.blue()).arg(color.alpha());
         }
-    case QVariant::Date:
+    case QMetaType::QDate:
         return value.toDate().toString(Qt::ISODate);
-    case QVariant::DateTime:
+    case QMetaType::QDateTime:
         return value.toDateTime().toString(Qt::ISODate);
-    case QVariant::Invalid:
+    case QMetaType::UnknownType:
         return "<Invalid>";
-    case QVariant::Point:
+    case QMetaType::QPoint:
         {
             QPoint point = value.toPoint();
             return QString("(%1,%2)").arg(point.x()).arg(point.y());
         }
-    case QVariant::Rect:
+    case QMetaType::QRect:
         {
             QRect rect = value.toRect();
             return QString("(%1,%2,%3,%4)")
                    .arg(rect.x()).arg(rect.y())
                    .arg(rect.width()).arg(rect.height());
         }
-    case QVariant::Size:
+    case QMetaType::QSize:
         {
             QSize size = value.toSize();
             return QString("(%1,%2)").arg(size.width()).arg(size.height());
         }
-    case QVariant::StringList:
+    case QMetaType::QStringList:
         return value.toStringList().join(',');
-    case QVariant::Time:
+    case QMetaType::QTime:
         return value.toTime().toString(Qt::ISODate);
     default:
         break;
diff --git a/examples/widgets/tools/settingseditor/variantdelegate.h b/examples/widgets/tools/settingseditor/variantdelegate.h
index 68f21fa3f6..96e44fd181 100644
--- a/examples/widgets/tools/settingseditor/variantdelegate.h
+++ b/examples/widgets/tools/settingseditor/variantdelegate.h
@@ -69,7 +69,7 @@ public:
     void setModelData(QWidget *editor, QAbstractItemModel *model,
                       const QModelIndex &index) const override;
 
-    static bool isSupportedType(QVariant::Type type);
+    static bool isSupportedType(int type);
     static QString displayText(const QVariant &value);
 
 private: