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 /tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | |
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 'tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp')
-rw-r--r-- | tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index af0d1e0cf1..b1cf955e93 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -4515,7 +4515,7 @@ void tst_QVariant::shouldDeleteVariantDataWorksForSequential() iterator._metaType_flags = QVariantConstructionFlags::ShouldDeleteVariantData; iterator._size = [](const void *) {return 1;}; - iterator._metaType_id = qMetaTypeId<MyType>(); + iterator._metaType = QMetaType::fromType<MyType>(); iterator._moveTo = [](const void *, void **, QtMetaTypePrivate::QSequentialIterableImpl::Position) {}; iterator._append = [](const void *, const void *) {}; iterator._advance = [](void **, int) {}; @@ -4526,9 +4526,9 @@ void tst_QVariant::shouldDeleteVariantDataWorksForSequential() MyType mytype {1, "eins"}; return QMetaType::create(qMetaTypeId<MyType>(), &mytype); }; - iterator._get = [](void * const *, int, uint) -> QtMetaTypePrivate::VariantData { + iterator._get = [](void * const *, const QMetaType &, uint) -> QtMetaTypePrivate::VariantData { MyType mytype {2, "zwei"}; - return {qMetaTypeId<MyType>(), QMetaType::create(qMetaTypeId<MyType>(), &mytype), QVariantConstructionFlags::ShouldDeleteVariantData}; + return {QMetaType::fromType<MyType>(), QMetaType::create(qMetaTypeId<MyType>(), &mytype), QVariantConstructionFlags::ShouldDeleteVariantData}; }; QSequentialIterable iterable {iterator}; QVariant value1 = iterable.at(0); @@ -4550,8 +4550,8 @@ void tst_QVariant::shouldDeleteVariantDataWorksForAssociative() iterator._metaType_flags_value = QVariantConstructionFlags::ShouldDeleteVariantData; iterator._size = [](const void *) {return 1;}; - iterator._metaType_id_value = qMetaTypeId<MyType>(); - iterator._metaType_id_key = qMetaTypeId<MyType>(); + iterator._metaType_value = QMetaType::fromType<MyType>(); + iterator._metaType_key = QMetaType::fromType<MyType>(); iterator._begin = [](const void *, void **) {}; iterator._end = [](const void *, void **) {}; iterator._advance = [](void **, int) {}; @@ -4561,21 +4561,21 @@ void tst_QVariant::shouldDeleteVariantDataWorksForAssociative() iterator._find = [](const void *, const void *, void **iterator ) -> void { (*iterator) = reinterpret_cast<void *>(quintptr(42)); }; - iterator._getKey = [](void * const *iterator, int, uint) -> QtMetaTypePrivate::VariantData { + iterator._getKey = [](void * const *iterator, const QMetaType &, uint) -> QtMetaTypePrivate::VariantData { MyType mytype {1, "key"}; if (reinterpret_cast<quintptr>(*iterator) == 42) { mytype.number = 42; mytype.text = "find_key"; } - return {qMetaTypeId<MyType>(), QMetaType::create(qMetaTypeId<MyType>(), &mytype), QVariantConstructionFlags::ShouldDeleteVariantData}; + return {QMetaType::fromType<MyType>(), QMetaType::create(qMetaTypeId<MyType>(), &mytype), QVariantConstructionFlags::ShouldDeleteVariantData}; }; - iterator._getValue = [](void * const *iterator, int, uint) -> QtMetaTypePrivate::VariantData { + iterator._getValue = [](void * const *iterator, const QMetaType &, uint) -> QtMetaTypePrivate::VariantData { MyType mytype {2, "value"}; if (reinterpret_cast<quintptr>(*iterator) == 42) { mytype.number = 42; mytype.text = "find_value"; } - return {qMetaTypeId<MyType>(), QMetaType::create(qMetaTypeId<MyType>(), &mytype), QVariantConstructionFlags::ShouldDeleteVariantData}; + return {QMetaType::fromType<MyType>(), QMetaType::create(qMetaTypeId<MyType>(), &mytype), QVariantConstructionFlags::ShouldDeleteVariantData}; }; QAssociativeIterable iterable {iterator}; auto it = iterable.begin(); |