diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-07-06 23:48:59 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-24 00:17:04 +0200 |
| commit | 49f2253be31266a26d1720888cd8d2577baf5df9 (patch) | |
| tree | b6bc20f79bfa22bd5b184798a590d907bf2e14d6 /src/corelib/kernel/qvariant.h | |
| parent | d78df774853e594af100cf282b1df938b9e40c39 (diff) | |
Cleanups in the Iterable classes
Store a QMetaType, not a meta type id in the classes.
Change-Id: If27a60512a46fa029cc914d65b8cad7f89d7f3b0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qvariant.h')
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index ed54eaee2b..281080d332 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -817,13 +817,13 @@ namespace QtPrivate { if (QMetaType::hasRegisteredConverterFunction(typeId, qMetaTypeId<QtMetaTypePrivate::QPairVariantInterfaceImpl>()) && !(typeId == qMetaTypeId<QPair<QVariant, QVariant> >())) { QtMetaTypePrivate::QPairVariantInterfaceImpl pi = v.value<QtMetaTypePrivate::QPairVariantInterfaceImpl>(); const QtMetaTypePrivate::VariantData d1 = pi.first(); - QVariant v1(QMetaType(d1.metaTypeId), d1.data); - if (d1.metaTypeId == qMetaTypeId<QVariant>()) + QVariant v1(d1.metaType, d1.data); + if (d1.metaType == QMetaType::fromType<QVariant>()) v1 = *reinterpret_cast<const QVariant*>(d1.data); const QtMetaTypePrivate::VariantData d2 = pi.second(); - QVariant v2(QMetaType(d2.metaTypeId), d2.data); - if (d2.metaTypeId == qMetaTypeId<QVariant>()) + QVariant v2(d2.metaType, d2.data); + if (d2.metaType == QMetaType::fromType<QVariant>()) v2 = *reinterpret_cast<const QVariant*>(d2.data); return QPair<QVariant, QVariant>(v1, v2); |