From 73d1476fb1397948a4d806bd921fce372bd8d63b Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Mon, 2 Dec 2019 17:54:48 +0100
Subject: 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>
---
 src/widgets/itemviews/qitemeditorfactory.cpp | 34 ++++++++++++++--------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/widgets/itemviews/qitemeditorfactory.cpp')

diff --git a/src/widgets/itemviews/qitemeditorfactory.cpp b/src/widgets/itemviews/qitemeditorfactory.cpp
index f874597d59..fe9b482122 100644
--- a/src/widgets/itemviews/qitemeditorfactory.cpp
+++ b/src/widgets/itemviews/qitemeditorfactory.cpp
@@ -241,21 +241,21 @@ QWidget *QDefaultItemEditorFactory::createEditor(int userType, QWidget *parent)
 {
     switch (userType) {
 #if QT_CONFIG(combobox)
-    case QVariant::Bool: {
+    case QMetaType::Bool: {
         QBooleanComboBox *cb = new QBooleanComboBox(parent);
         cb->setFrame(false);
         cb->setSizePolicy(QSizePolicy::Ignored, cb->sizePolicy().verticalPolicy());
         return cb; }
 #endif
 #if QT_CONFIG(spinbox)
-    case QVariant::UInt: {
+    case QMetaType::UInt: {
         QSpinBox *sb = new QUIntSpinBox(parent);
         sb->setFrame(false);
         sb->setMinimum(0);
         sb->setMaximum(INT_MAX);
         sb->setSizePolicy(QSizePolicy::Ignored, sb->sizePolicy().verticalPolicy());
         return sb; }
-    case QVariant::Int: {
+    case QMetaType::Int: {
         QSpinBox *sb = new QSpinBox(parent);
         sb->setFrame(false);
         sb->setMinimum(INT_MIN);
@@ -264,25 +264,25 @@ QWidget *QDefaultItemEditorFactory::createEditor(int userType, QWidget *parent)
         return sb; }
 #endif
 #if QT_CONFIG(datetimeedit)
-    case QVariant::Date: {
+    case QMetaType::QDate: {
         QDateTimeEdit *ed = new QDateEdit(parent);
         ed->setFrame(false);
         return ed; }
-    case QVariant::Time: {
+    case QMetaType::QTime: {
         QDateTimeEdit *ed = new QTimeEdit(parent);
         ed->setFrame(false);
         return ed; }
-    case QVariant::DateTime: {
+    case QMetaType::QDateTime: {
         QDateTimeEdit *ed = new QDateTimeEdit(parent);
         ed->setFrame(false);
         return ed; }
 #endif
 #if QT_CONFIG(label)
-    case QVariant::Pixmap:
+    case QMetaType::QPixmap:
         return new QLabel(parent);
 #endif
 #if QT_CONFIG(spinbox)
-    case QVariant::Double: {
+    case QMetaType::Double: {
         QDoubleSpinBox *sb = new QDoubleSpinBox(parent);
         sb->setFrame(false);
         sb->setMinimum(-DBL_MAX);
@@ -291,7 +291,7 @@ QWidget *QDefaultItemEditorFactory::createEditor(int userType, QWidget *parent)
         return sb; }
 #endif
 #if QT_CONFIG(lineedit)
-    case QVariant::String:
+    case QMetaType::QString:
     default: {
         // the default editor is a lineedit
         QExpandingLineEdit *le = new QExpandingLineEdit(parent);
@@ -311,24 +311,24 @@ QByteArray QDefaultItemEditorFactory::valuePropertyName(int userType) const
 {
     switch (userType) {
 #if QT_CONFIG(combobox)
-    case QVariant::Bool:
+    case QMetaType::Bool:
         return "currentIndex";
 #endif
 #if QT_CONFIG(spinbox)
-    case QVariant::UInt:
-    case QVariant::Int:
-    case QVariant::Double:
+    case QMetaType::UInt:
+    case QMetaType::Int:
+    case QMetaType::Double:
         return "value";
 #endif
 #if QT_CONFIG(datetimeedit)
-    case QVariant::Date:
+    case QMetaType::QDate:
         return "date";
-    case QVariant::Time:
+    case QMetaType::QTime:
         return "time";
-    case QVariant::DateTime:
+    case QMetaType::QDateTime:
         return "dateTime";
 #endif
-    case QVariant::String:
+    case QMetaType::QString:
     default:
         // the default editor is a lineedit
         return "text";
-- 
cgit v1.2.3