diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-09-16 21:00:53 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 09:05:56 +0200 |
commit | 4c83183e711fb61d10f7c2475cbdbb04c4c36802 (patch) | |
tree | 076f90700a8428b386c225a0864fd08a499383da /tests/auto/corelib | |
parent | 09f9c6e1b9b5f0c2e8066444600106d41301bc6b (diff) |
MetaType: Add assignment operator to the container iterators.
Change-Id: Ib4f2197a0ab6bd41c91de667cd3087fb40e44097
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r-- | tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index a375ac1797..6366c47601 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -3830,13 +3830,8 @@ void tst_QVariant::iterateContainerElements() for ( ; it != end; ++it, ++i) { QCOMPARE(ints.at(i), *it); } - } - { - QVariantList ints; - ints << 1 << 2 << 3; - QVariant var = QVariant::fromValue(ints); - QSequentialIterable iter = var.value<QSequentialIterable>(); - QSequentialIterable::const_iterator it = iter.begin(); + + it = iter.begin(); QVariantList intsCopy; intsCopy << *(it++); @@ -3894,17 +3889,11 @@ void tst_QVariant::iterateContainerElements() for ( ; it != end; ++it, ++i) { QCOMPARE(*(mapping.begin() + i), (*it).toString()); } - } - { + QVariantList nums; nums << "one" << "two" << "three"; - QMap<int, QString> mapping; - mapping.insert(1, "one"); - mapping.insert(2, "two"); - mapping.insert(3, "three"); - QVariant var = QVariant::fromValue(mapping); - QAssociativeIterable iter = var.value<QAssociativeIterable>(); - QAssociativeIterable::const_iterator it = iter.begin(); + + it = iter.begin(); QVariantList numsCopy; numsCopy << *(it++); |