From 8929c0a3550ae27cb5c9ed276d4c5a85594ba682 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Mon, 15 Jun 2020 09:09:08 +0200
Subject: Remove QVariant(int type, void *data, ...) constructor

It was marked internal anyway. Use the constructor taking a
QMetaType instead.

Change-Id: I15b9cd0911aac063a0f0fe0352fa2c84b7f7c691
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/plugins/sqldrivers/db2/qsql_db2.cpp     | 4 ++--
 src/plugins/sqldrivers/ibase/qsql_ibase.cpp | 4 ++--
 src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 2 +-
 src/plugins/sqldrivers/oci/qsql_oci.cpp     | 5 ++---
 src/plugins/sqldrivers/odbc/qsql_odbc.cpp   | 4 ++--
 5 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/sqldrivers/db2/qsql_db2.cpp b/src/plugins/sqldrivers/db2/qsql_db2.cpp
index da5ff95179..02cb15348b 100644
--- a/src/plugins/sqldrivers/db2/qsql_db2.cpp
+++ b/src/plugins/sqldrivers/db2/qsql_db2.cpp
@@ -591,7 +591,7 @@ static bool qMakeStatement(QDB2ResultPrivate* d, bool forwardOnly, bool setForwa
 QVariant QDB2Result::handle() const
 {
     Q_D(const QDB2Result);
-    return QVariant(qRegisterMetaType<SQLHANDLE>("SQLHANDLE"), &d->hStmt);
+    return QVariant(QMetaType::fromType<SQLHANDLE>(), &d->hStmt);
 }
 
 /************************************/
@@ -1729,7 +1729,7 @@ QString QDB2Driver::formatValue(const QSqlField &field, bool trimStrings) const
 QVariant QDB2Driver::handle() const
 {
     Q_D(const QDB2Driver);
-    return QVariant(qRegisterMetaType<SQLHANDLE>("SQLHANDLE"), &d->hDbc);
+    return QVariant(QMetaType::fromType<SQLHANDLE>(), &d->hDbc);
 }
 
 QString QDB2Driver::escapeIdentifier(const QString &identifier, IdentifierType) const
diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
index 75fc68ca9b..f14cb2e15b 100644
--- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
+++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
@@ -1379,7 +1379,7 @@ QSqlRecord QIBaseResult::record() const
 QVariant QIBaseResult::handle() const
 {
     Q_D(const QIBaseResult);
-    return QVariant(qRegisterMetaType<isc_stmt_handle>("isc_stmt_handle"), &d->stmt);
+    return QVariant(QMetaType::fromType<isc_stmt_handle>(), &d->stmt);
 }
 
 /*********************************/
@@ -1730,7 +1730,7 @@ QString QIBaseDriver::formatValue(const QSqlField &field, bool trimStrings) cons
 QVariant QIBaseDriver::handle() const
 {
     Q_D(const QIBaseDriver);
-    return QVariant(qRegisterMetaType<isc_db_handle>("isc_db_handle"), &d->ibase);
+    return QVariant(QMetaType::fromType<isc_db_handle>(), &d->ibase);
 }
 
 static ISC_EVENT_CALLBACK qEventCallback(char *result, ISC_USHORT length, const ISC_UCHAR *updated)
diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
index d720c843ad..93c9a4841f 100644
--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
@@ -544,7 +544,7 @@ QVariant QMYSQLResult::data(int field)
             return QVariant(QVariant::Type(f.type));
 
         if (qIsInteger(f.type)) {
-            QVariant variant(f.type, f.outField);
+            QVariant variant(QMetaType(f.type), f.outField);
             // we never want to return char variants here, see QTBUG-53397
             if (static_cast<int>(f.type) == QMetaType::UChar)
                 return variant.toUInt();
diff --git a/src/plugins/sqldrivers/oci/qsql_oci.cpp b/src/plugins/sqldrivers/oci/qsql_oci.cpp
index 378e9322e2..4edafd1029 100644
--- a/src/plugins/sqldrivers/oci/qsql_oci.cpp
+++ b/src/plugins/sqldrivers/oci/qsql_oci.cpp
@@ -561,7 +561,7 @@ void QOCIResultPrivate::outValues(QVariantList &values, IndicatorArray &indicato
 
         qOraOutValue(values[i], tmpStorage, env, err);
 
-        QVariant::Type typ = values.at(i).type();
+        auto typ = values.at(i).metaType();
         if (indicators[i] == -1) // NULL
             values[i] = QVariant(typ);
         else
@@ -1618,8 +1618,7 @@ bool QOCICols::execBatch(QOCIResultPrivate *d, QVariantList &boundValues, bool a
         if (!d->isOutValue(i))
             continue;
 
-        QVariant::Type tp = boundValues.at(i).type();
-        if (tp != QVariant::List) {
+        if (auto tp = boundValues.at(i).metaType(); tp.id() != QVariant::List) {
             qOraOutValue(boundValues[i], tmpStorage, d->env, d->err);
             if (*columns[i].indicators == -1)
                 boundValues[i] = QVariant(tp);
diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
index 8b3dc57e76..ffd8b5dc6e 100644
--- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
+++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
@@ -1779,7 +1779,7 @@ QVariant QODBCResult::lastInsertId() const
 QVariant QODBCResult::handle() const
 {
     Q_D(const QODBCResult);
-    return QVariant(qRegisterMetaType<SQLHANDLE>("SQLHANDLE"), &d->hStmt);
+    return QVariant(QMetaType::fromType<SQLHANDLE>(), &d->hStmt);
 }
 
 bool QODBCResult::nextResult()
@@ -2618,7 +2618,7 @@ QString QODBCDriver::formatValue(const QSqlField &field,
 QVariant QODBCDriver::handle() const
 {
     Q_D(const QODBCDriver);
-    return QVariant(qRegisterMetaType<SQLHANDLE>("SQLHANDLE"), &d->hDbc);
+    return QVariant(QMetaType::fromType<SQLHANDLE>(), &d->hDbc);
 }
 
 QString QODBCDriver::escapeIdentifier(const QString &identifier, IdentifierType) const
-- 
cgit v1.2.3