From: Stephen Kelly Date: Tue, 24 Jul 2012 07:25:45 +0000 (+0200) Subject: Replace old typedefs with their built-in equivalents. X-Git-Tag: v5.0.0-beta1~643 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=349f16b03cb75c5284022f957c122446ebfc0b79;p=profile%2Fivi%2Fqtbase.git Replace old typedefs with their built-in equivalents. Change-Id: I3ecb75ace431b92a13de67aa6426cf570398587f Reviewed-by: Sean Harmer --- diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index 5e0fce3..ae4d155 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("writeVariant"); QTest::addColumn("isNull"); { - typedef QList 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 variantsMap; - variantsMap vMap; + QVariantMap vMap; vMap.insert( "int", QVariant( 1 ) ); vMap.insert( "string", QVariant( QString("Two") ) ); vMap.insert( "double", QVariant( 3.45 ) );