diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-24 09:25:45 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-24 10:46:24 +0200 |
commit | 349f16b03cb75c5284022f957c122446ebfc0b79 (patch) | |
tree | 1f323321cf79c7c8e884d4efb2a3f05e35d16853 /tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | |
parent | 86992d6adb13c756a149fe84640e3d4253c7255b (diff) |
Replace old typedefs with their built-in equivalents.
Change-Id: I3ecb75ace431b92a13de67aa6426cf570398587f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp')
-rw-r--r-- | tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index 5e0fce3f81..ae4d155804 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -1398,8 +1398,7 @@ void tst_QVariant::writeToReadFromDataStream_data() QTest::addColumn<QVariant>("writeVariant"); QTest::addColumn<bool>("isNull"); { - typedef QList<QVariant> variantsList; - variantsList valuelist; + QVariantList valuelist; valuelist << QVariant( 1 ) << QVariant( QString("Two") ) << QVariant( 3.45 ); QVariant var(valuelist); QTest::newRow( "list_valid" ) << var << false; @@ -1445,8 +1444,7 @@ void tst_QVariant::writeToReadFromDataStream_data() QTest::newRow( "image_invalid" ) << QVariant::fromValue( QImage() ) << true; QTest::newRow( "keysequence_valid" ) << QVariant::fromValue( QKeySequence( Qt::CTRL + Qt::Key_A ) ) << false; QTest::newRow( "int_valid" ) << QVariant( -123 ) << false; - typedef QMap<QString, QVariant> variantsMap; - variantsMap vMap; + QVariantMap vMap; vMap.insert( "int", QVariant( 1 ) ); vMap.insert( "string", QVariant( QString("Two") ) ); vMap.insert( "double", QVariant( 3.45 ) ); |