From 8929c0a3550ae27cb5c9ed276d4c5a85594ba682 Mon Sep 17 00:00:00 2001 From: Lars Knoll 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 --- src/corelib/kernel/qvariant.cpp | 17 +---------------- src/corelib/kernel/qvariant.h | 5 ++--- src/corelib/statemachine/qstatemachine.cpp | 2 +- src/dbus/qdbusabstractadaptor.cpp | 2 +- src/dbus/qdbusabstractinterface.cpp | 2 +- src/dbus/qdbusargument.cpp | 3 +-- src/dbus/qdbusintegrator.cpp | 8 +++----- src/dbus/qdbusinterface.cpp | 2 +- src/dbus/qdbusinternalfilters.cpp | 3 +-- src/dbus/qdbusreply.h | 5 ++--- src/gui/image/qbitmap.cpp | 2 +- src/gui/image/qicon.cpp | 2 +- src/gui/image/qimage.cpp | 2 +- src/gui/image/qpixmap.cpp | 2 +- src/gui/kernel/qcursor.cpp | 2 +- src/gui/kernel/qkeysequence.cpp | 2 +- src/gui/kernel/qpalette.cpp | 2 +- src/gui/math3d/qmatrix4x4.cpp | 2 +- src/gui/math3d/qquaternion.cpp | 2 +- src/gui/math3d/qvector2d.cpp | 2 +- src/gui/math3d/qvector3d.cpp | 2 +- src/gui/math3d/qvector4d.cpp | 2 +- src/gui/painting/qbrush.cpp | 2 +- src/gui/painting/qcolor.cpp | 2 +- src/gui/painting/qcolorspace.cpp | 2 +- src/gui/painting/qpen.cpp | 2 +- src/gui/painting/qpolygon.cpp | 4 ++-- src/gui/painting/qregion.cpp | 2 +- src/gui/painting/qtransform.cpp | 2 +- src/gui/text/qfont.cpp | 2 +- src/gui/text/qtextformat.cpp | 4 ++-- 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 ++-- src/sql/models/qsqlrelationaldelegate.h | 2 +- src/testlib/qsignaldumper.cpp | 2 +- src/testlib/qsignalspy.h | 2 +- src/widgets/itemviews/qitemdelegate.cpp | 2 +- src/widgets/itemviews/qstyleditemdelegate.cpp | 2 +- src/widgets/kernel/qsizepolicy.cpp | 2 +- 42 files changed, 52 insertions(+), 74 deletions(-) (limited to 'src') diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index f8970212f0..c0aea0e98d 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -2032,21 +2032,6 @@ QVariant::QVariant(Type type) /*! \internal - flags is true if it is a pointer type - */ -QVariant::QVariant(int typeId, const void *copy, uint flags) -{ - if (flags) { //type is a pointer type - d = Private(QMetaType(typeId)); - d.data.ptr = *reinterpret_cast(copy); - } else { - create(typeId, copy); - } -} - -/*! - \internal - flags is true if it is a pointer type */ QVariant::QVariant(QMetaType type, const void *copy) : d(type) { @@ -4307,7 +4292,7 @@ static const QVariant variantFromVariantDataHelper(const QtMetaTypePrivate::Vari if (d.metaTypeId == qMetaTypeId()) v = *reinterpret_cast(d.data); else - v = QVariant(d.metaTypeId, d.data, d.flags & ~QVariantConstructionFlags::ShouldDeleteVariantData); + v = QVariant(QMetaType(d.metaTypeId), d.data); if (d.flags & QVariantConstructionFlags::ShouldDeleteVariantData) QMetaType::destroy(d.metaTypeId, const_cast(d.data)); return v; diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index e64c118b9d..78870458f9 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -208,7 +208,6 @@ class Q_CORE_EXPORT QVariant QVariant() noexcept : d() {} ~QVariant(); QVariant(Type type); - QVariant(int typeId, const void *copy, uint flags = 0); // ### Qt6 TODO deprecate explicit QVariant(QMetaType type, const void *copy = nullptr); QVariant(const QVariant &other); @@ -820,12 +819,12 @@ namespace QtPrivate { if (QMetaType::hasRegisteredConverterFunction(typeId, qMetaTypeId()) && !(typeId == qMetaTypeId >())) { QtMetaTypePrivate::QPairVariantInterfaceImpl pi = v.value(); const QtMetaTypePrivate::VariantData d1 = pi.first(); - QVariant v1(d1.metaTypeId, d1.data, d1.flags); + QVariant v1(QMetaType(d1.metaTypeId), d1.data); if (d1.metaTypeId == qMetaTypeId()) v1 = *reinterpret_cast(d1.data); const QtMetaTypePrivate::VariantData d2 = pi.second(); - QVariant v2(d2.metaTypeId, d2.data, d2.flags); + QVariant v2(QMetaType(d2.metaTypeId), d2.data); if (d2.metaTypeId == qMetaTypeId()) v2 = *reinterpret_cast(d2.data); diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 878a968515..873892552f 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -2435,7 +2435,7 @@ void QStateMachinePrivate::handleTransitionSignal(QObject *sender, int signalInd QList vargs; vargs.reserve(argc); for (int i = 0; i < argc; ++i) { - int type = method.parameterType(i); + auto type = method.parameterMetaType(i); vargs.append(QVariant(type, argv[i+1])); } diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp index 0a4a23d780..0d59efe145 100644 --- a/src/dbus/qdbusabstractadaptor.cpp +++ b/src/dbus/qdbusabstractadaptor.cpp @@ -327,7 +327,7 @@ void QDBusAdaptorConnector::relay(QObject *senderObj, int lastSignalIdx, void ** const int numTypes = types.count(); args.reserve(numTypes - 1); for (int i = 1; i < numTypes; ++i) - args << QVariant(types.at(i), argv[i]); + args << QVariant(QMetaType(types.at(i)), argv[i]); // now emit the signal with all the information emit relaySignal(realObject, senderMetaObject, lastSignalIdx, args); diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index d603264a1e..60df1b30aa 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -284,7 +284,7 @@ int QDBusAbstractInterfaceBase::qt_metacall(QMetaObject::Call _c, int _id, void if (mp.userType() == qMetaTypeId()) value = reinterpret_cast(_a[0])->variant(); else - value = QVariant(mp.userType(), _a[0]); + value = QVariant(mp.metaType(), _a[0]); status = d_func()->setProperty(mp, value) ? 1 : 0; } else { bool readStatus = d_func()->property(mp, _a[0]); diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index 2c6be1994c..ef630a766c 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -74,8 +74,7 @@ QByteArray QDBusArgumentPrivate::createSignature(int id) marshaller->ba = &signature; // run it - void *null = nullptr; - QVariant v(id, null); + QVariant v{QMetaType(id)}; QDBusArgument arg(marshaller); QDBusMetaType::marshall(arg, v.userType(), v.constData()); arg.d = nullptr; diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index ac55b7cb76..74bebc7459 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -946,8 +946,7 @@ void QDBusConnectionPrivate::deliverCall(QObject *object, int /*flags*/, const Q params.append(const_cast(arg.constData())); else if (arg.userType() == qMetaTypeId()) { // convert to what the function expects - void *null = nullptr; - auxParameters.append(QVariant(id, null)); + auxParameters.append(QVariant(QMetaType(id))); const QDBusArgument &in = *reinterpret_cast(arg.constData()); @@ -974,10 +973,9 @@ void QDBusConnectionPrivate::deliverCall(QObject *object, int /*flags*/, const Q // output arguments const int numMetaTypes = metaTypes.count(); QVariantList outputArgs; - void *null = nullptr; if (metaTypes[0] != QMetaType::Void && metaTypes[0] != QMetaType::UnknownType) { outputArgs.reserve(numMetaTypes - i + 1); - QVariant arg(metaTypes[0], null); + QVariant arg{QMetaType(metaTypes[0])}; outputArgs.append( arg ); params[0] = const_cast(outputArgs.at( outputArgs.count() - 1 ).constData()); } else { @@ -985,7 +983,7 @@ void QDBusConnectionPrivate::deliverCall(QObject *object, int /*flags*/, const Q } for ( ; i < numMetaTypes; ++i) { - QVariant arg(metaTypes[i], null); + QVariant arg{QMetaType(metaTypes[i])}; outputArgs.append( arg ); params.append(const_cast(outputArgs.at( outputArgs.count() - 1 ).constData())); } diff --git a/src/dbus/qdbusinterface.cpp b/src/dbus/qdbusinterface.cpp index c1b0feea37..612ee874b3 100644 --- a/src/dbus/qdbusinterface.cpp +++ b/src/dbus/qdbusinterface.cpp @@ -289,7 +289,7 @@ int QDBusInterfacePrivate::metacall(QMetaObject::Call c, int id, void **argv) args.reserve(inputTypesCount); int i = 1; for ( ; i <= inputTypesCount; ++i) - args << QVariant(inputTypes[i], argv[i]); + args << QVariant(QMetaType(inputTypes[i]), argv[i]); // make the call QDBusMessage reply = q->callWithArgumentList(QDBus::Block, methodName, args); diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp index 74cc470596..3c210a4641 100644 --- a/src/dbus/qdbusinternalfilters.cpp +++ b/src/dbus/qdbusinternalfilters.cpp @@ -358,8 +358,7 @@ static int writeProperty(QObject *obj, const QByteArray &property_name, QVariant if (id != QMetaType::QVariant && value.userType() == QDBusMetaTypeId::argument()) { // we have to demarshall before writing - void *null = nullptr; - QVariant other(id, null); + QVariant other{QMetaType(id)}; if (!QDBusMetaType::demarshall(qvariant_cast(value), id, other.data())) { qWarning("QDBusConnection: type `%s' (%d) is not registered with QtDBus. " "Use qDBusRegisterMetaType to register it", diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h index f7879f2d01..03dfe4a4f0 100644 --- a/src/dbus/qdbusreply.h +++ b/src/dbus/qdbusreply.h @@ -67,7 +67,7 @@ public: inline QDBusReply(const QDBusReply &) = default; inline QDBusReply& operator=(const QDBusMessage &reply) { - QVariant data(qMetaTypeId(), nullptr); + QVariant data(QMetaType::fromType()); qDBusReplyFill(reply, m_error, data); m_data = qvariant_cast(data); return *this; @@ -131,8 +131,7 @@ private: template<> inline QDBusReply& QDBusReply::operator=(const QDBusMessage &reply) { - void *null = nullptr; - QVariant data(qMetaTypeId(), null); + QVariant data(QMetaType::fromType()); qDBusReplyFill(reply, m_error, data); m_data = qvariant_cast(data).variant(); return *this; diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp index 88af4073c8..7ee3989684 100644 --- a/src/gui/image/qbitmap.cpp +++ b/src/gui/image/qbitmap.cpp @@ -218,7 +218,7 @@ QBitmap::~QBitmap() */ QBitmap::operator QVariant() const { - return QVariant(QMetaType::QBitmap, this); + return QVariant::fromValue(*this); } static QBitmap makeBitmap(QImage &&image, Qt::ImageConversionFlags flags) diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 0ad24f04b8..92d17b368d 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -782,7 +782,7 @@ QIcon &QIcon::operator=(const QIcon &other) */ QIcon::operator QVariant() const { - return QVariant(QMetaType::QIcon, this); + return QVariant::fromValue(*this); } /*! diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 188fb42b28..4f00a03268 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -1083,7 +1083,7 @@ int QImage::devType() const */ QImage::operator QVariant() const { - return QVariant(QMetaType::QImage, this); + return QVariant::fromValue(*this); } /*! diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 3b9b98d58f..e8ac61feb0 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -404,7 +404,7 @@ QPixmap &QPixmap::operator=(const QPixmap &pixmap) */ QPixmap::operator QVariant() const { - return QVariant(QMetaType::QPixmap, this); + return QVariant::fromValue(*this); } /*! diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp index 7ebf59290c..9e97470dfb 100644 --- a/src/gui/kernel/qcursor.cpp +++ b/src/gui/kernel/qcursor.cpp @@ -688,7 +688,7 @@ QCursor &QCursor::operator=(const QCursor &c) */ QCursor::operator QVariant() const { - return QVariant(QMetaType::QCursor, this); + return QVariant::fromValue(*this); } #ifndef QT_NO_DEBUG_STREAM diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 649673003d..13e6a058cb 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -1390,7 +1390,7 @@ QKeySequence::SequenceMatch QKeySequence::matches(const QKeySequence &seq) const */ QKeySequence::operator QVariant() const { - return QVariant(QMetaType::QKeySequence, this); + return QVariant::fromValue(*this); } /*! diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index 2c636dc553..4129e189f3 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -725,7 +725,7 @@ QPalette &QPalette::operator=(const QPalette &p) */ QPalette::operator QVariant() const { - return QVariant(QMetaType::QPalette, this); + return QVariant::fromValue(*this); } /*! diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp index a727d6d222..31bc51b9e1 100644 --- a/src/gui/math3d/qmatrix4x4.cpp +++ b/src/gui/math3d/qmatrix4x4.cpp @@ -1977,7 +1977,7 @@ void QMatrix4x4::optimize() */ QMatrix4x4::operator QVariant() const { - return QVariant(QMetaType::QMatrix4x4, this); + return QVariant::fromValue(*this); } #ifndef QT_NO_DEBUG_STREAM diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp index 5f15949c5b..0d65b1f839 100644 --- a/src/gui/math3d/qquaternion.cpp +++ b/src/gui/math3d/qquaternion.cpp @@ -983,7 +983,7 @@ QQuaternion QQuaternion::nlerp */ QQuaternion::operator QVariant() const { - return QVariant(QMetaType::QQuaternion, this); + return QVariant::fromValue(*this); } #ifndef QT_NO_DEBUG_STREAM diff --git a/src/gui/math3d/qvector2d.cpp b/src/gui/math3d/qvector2d.cpp index 9cd4b5924a..bd5d9edbf8 100644 --- a/src/gui/math3d/qvector2d.cpp +++ b/src/gui/math3d/qvector2d.cpp @@ -531,7 +531,7 @@ QVector4D QVector2D::toVector4D() const */ QVector2D::operator QVariant() const { - return QVariant(QMetaType::QVector2D, this); + return QVariant::fromValue(*this); } #ifndef QT_NO_DEBUG_STREAM diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp index afe1e4789a..312679a365 100644 --- a/src/gui/math3d/qvector3d.cpp +++ b/src/gui/math3d/qvector3d.cpp @@ -706,7 +706,7 @@ QVector4D QVector3D::toVector4D() const */ QVector3D::operator QVariant() const { - return QVariant(QMetaType::QVector3D, this); + return QVariant::fromValue(*this); } /*! diff --git a/src/gui/math3d/qvector4d.cpp b/src/gui/math3d/qvector4d.cpp index 43cfb0c61c..c42986d777 100644 --- a/src/gui/math3d/qvector4d.cpp +++ b/src/gui/math3d/qvector4d.cpp @@ -608,7 +608,7 @@ QVector3D QVector4D::toVector3DAffine() const */ QVector4D::operator QVariant() const { - return QVariant(QMetaType::QVector4D, this); + return QVariant::fromValue(*this); } #ifndef QT_NO_DEBUG_STREAM diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index b2f610c188..7e83e83db6 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -672,7 +672,7 @@ QBrush &QBrush::operator=(const QBrush &b) */ QBrush::operator QVariant() const { - return QVariant(QMetaType::QBrush, this); + return QVariant::fromValue(*this); } /*! diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index 496d906c27..6b666435e6 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -2935,7 +2935,7 @@ bool QColor::operator!=(const QColor &color) const noexcept */ QColor::operator QVariant() const { - return QVariant(QMetaType::QColor, this); + return QVariant::fromValue(*this); } /*! \internal diff --git a/src/gui/painting/qcolorspace.cpp b/src/gui/painting/qcolorspace.cpp index 43efdc1166..86cb5db2ff 100644 --- a/src/gui/painting/qcolorspace.cpp +++ b/src/gui/painting/qcolorspace.cpp @@ -768,7 +768,7 @@ QColorTransform QColorSpace::transformationToColorSpace(const QColorSpace &color */ QColorSpace::operator QVariant() const { - return QVariant(QMetaType::QColorSpace, this); + return QVariant::fromValue(*this); } /***************************************************************************** diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp index 5790b74497..1c06567a32 100644 --- a/src/gui/painting/qpen.cpp +++ b/src/gui/painting/qpen.cpp @@ -408,7 +408,7 @@ QPen &QPen::operator=(const QPen &p) noexcept */ QPen::operator QVariant() const { - return QVariant(QMetaType::QPen, this); + return QVariant::fromValue(*this); } /*! diff --git a/src/gui/painting/qpolygon.cpp b/src/gui/painting/qpolygon.cpp index c053417e96..aa65fd5b99 100644 --- a/src/gui/painting/qpolygon.cpp +++ b/src/gui/painting/qpolygon.cpp @@ -716,7 +716,7 @@ QPolygon QPolygonF::toPolygon() const */ QPolygon::operator QVariant() const { - return QVariant(QMetaType::QPolygon, this); + return QVariant::fromValue(*this); } /***************************************************************************** @@ -1040,7 +1040,7 @@ bool QPolygonF::intersects(const QPolygonF &p) const QPolygonF::operator QVariant() const { - return QVariant(QMetaType::QPolygonF, this); + return QVariant::fromValue(*this); } QT_END_NAMESPACE diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index d18629026a..7acfceee8d 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -583,7 +583,7 @@ QRegion& QRegion::operator^=(const QRegion &r) */ QRegion::operator QVariant() const { - return QVariant(QMetaType::QRegion, this); + return QVariant::fromValue(*this); } /*! diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 8f8a675fc9..bfb0e6f4ec 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -2081,7 +2081,7 @@ QTransform::TransformationType QTransform::type() const */ QTransform::operator QVariant() const { - return QVariant(QMetaType::QTransform, this); + return QVariant::fromValue(*this); } diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index dab787bbde..b5eab1cdb5 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -1726,7 +1726,7 @@ bool QFont::operator!=(const QFont &f) const */ QFont::operator QVariant() const { - return QVariant(QMetaType::QFont, this); + return QVariant::fromValue(*this); } /*! diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index d12f7e152d..aead7d60e3 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(QMetaType::QTextLength, this); + return QVariant::fromValue(*this); } #ifndef QT_NO_DATASTREAM @@ -895,7 +895,7 @@ QTextFormat::~QTextFormat() */ QTextFormat::operator QVariant() const { - return QVariant(QMetaType::QTextFormat, this); + return QVariant::fromValue(*this); } /*! 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"), &d->hStmt); + return QVariant(QMetaType::fromType(), &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"), &d->hDbc); + return QVariant(QMetaType::fromType(), &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"), &d->stmt); + return QVariant(QMetaType::fromType(), &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"), &d->ibase); + return QVariant(QMetaType::fromType(), &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(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"), &d->hStmt); + return QVariant(QMetaType::fromType(), &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"), &d->hDbc); + return QVariant(QMetaType::fromType(), &d->hDbc); } QString QODBCDriver::escapeIdentifier(const QString &identifier, IdentifierType) const diff --git a/src/sql/models/qsqlrelationaldelegate.h b/src/sql/models/qsqlrelationaldelegate.h index 2f16a4a54b..189fc876fd 100644 --- a/src/sql/models/qsqlrelationaldelegate.h +++ b/src/sql/models/qsqlrelationaldelegate.h @@ -112,7 +112,7 @@ QWidget *createEditor(QWidget *aParent, const QByteArray n = editor->metaObject()->userProperty().name(); if (!n.isEmpty()) { if (!v.isValid()) - v = QVariant(editor->property(n.data()).userType(), nullptr); + v = QVariant(editor->property(n.data()).metaType()); editor->setProperty(n.data(), v); return; } diff --git a/src/testlib/qsignaldumper.cpp b/src/testlib/qsignaldumper.cpp index f43b3a8d92..977081e98e 100644 --- a/src/testlib/qsignaldumper.cpp +++ b/src/testlib/qsignaldumper.cpp @@ -112,7 +112,7 @@ static void qSignalDumperCallback(QObject *caller, int signal_index, void **argv Q_ASSERT(typeId != QMetaType::Void); // void parameter => metaobject is corrupt str.append(arg) .append('(') - .append(QVariant(typeId, argv[i + 1]).toString().toLocal8Bit()) + .append(QVariant(QMetaType(typeId), argv[i + 1]).toString().toLocal8Bit()) .append(')'); } str.append(", "); diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h index b514a71a2c..1d42995b4e 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -221,7 +221,7 @@ private: if (type == QMetaType::QVariant) list << *reinterpret_cast(a[i + 1]); else - list << QVariant(type, a[i + 1]); + list << QVariant(QMetaType(type), a[i + 1]); } append(list); diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index 522f1cc876..acbb9a2610 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -531,7 +531,7 @@ void QItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) con if (!n.isEmpty()) { if (!v.isValid()) - v = QVariant(editor->property(n).userType(), (const void *)nullptr); + v = QVariant(editor->property(n).metaType()); editor->setProperty(n, v); } #endif diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp index 06cc6fc296..915a401a25 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.cpp +++ b/src/widgets/itemviews/qstyleditemdelegate.cpp @@ -448,7 +448,7 @@ void QStyledItemDelegate::setEditorData(QWidget *editor, const QModelIndex &inde if (!n.isEmpty()) { if (!v.isValid()) - v = QVariant(editor->property(n).userType(), (const void *)nullptr); + v = QVariant(editor->property(n).metaType()); editor->setProperty(n, v); } #endif diff --git a/src/widgets/kernel/qsizepolicy.cpp b/src/widgets/kernel/qsizepolicy.cpp index bf3eb34d23..c354d14f5e 100644 --- a/src/widgets/kernel/qsizepolicy.cpp +++ b/src/widgets/kernel/qsizepolicy.cpp @@ -439,7 +439,7 @@ void QSizePolicy::setControlType(ControlType type) noexcept */ QSizePolicy::operator QVariant() const { - return QVariant(QMetaType::QSizePolicy, this); + return QVariant::fromValue(*this); } #ifndef QT_NO_DATASTREAM -- cgit v1.2.3