From 2d0c603cdba36196bf7fc3e82d8dfd3b4aaa6857 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 20 Apr 2022 16:10:37 +0200 Subject: [PATCH] tst_QSettings::testVariantTypes(): modernize list initializations Change-Id: Ia84cd7590f9bcc95a790efb1e1dab46ab368cd2d Reviewed-by: Thiago Macieira --- .../auto/corelib/io/qsettings/tst_qsettings.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index 781650b85b..9c0030267d 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -1327,20 +1327,17 @@ void tst_QSettings::testVariantTypes() m2.insert("borba", "dorba"); testValue("customMap", m2, QVariantMap); - QStringList l2; - - l2 << "ene" << "due" << "@Point(1 2)" << "@fake"; + QStringList l2 { "ene", "due", "@Point(1 2)", "@fake" }; testValue("stringsAt", l2, QStringList); - l2.clear(); - l2 << "ene" << "due" << "rike" << "fake"; + l2 = { "ene", "due", "rike", "fake" }; testValue("strings", l2, QStringList); - QList l3; QDate date = QDate::currentDate(); QTime time = QTime::currentTime(); - l3 << QString("ene") << 10 << QVariant::fromValue(QColor(1, 2, 3)) << QVariant(QRect(1, 2, 3, 4)) - << QVariant(QSize(4, 56)) << QVariant(QPoint(4, 2)) << true << false << date << time; + QList l3 { QString("ene"), 10, QVariant::fromValue(QColor(1, 2, 3)), + QVariant(QRect(1, 2, 3, 4)), QVariant(QSize(4, 56)), QVariant(QPoint(4, 2)), + true, false, date, time }; testValue("mixedList", l3, QVariantList); testValue("string", QString("hello"), QString); @@ -1352,8 +1349,7 @@ void tst_QSettings::testVariantTypes() testValue("time", time, QTime); testValue("byteArray", QByteArray("foo bar"), QByteArray); - QList l4; - l4 << QVariant(m2) << QVariant(l2) << QVariant(l3); + QList l4 { QVariant(m2), QVariant(l2), QVariant(l3) }; testValue("collectList", l4, QVariantList); QDateTime dt = QDateTime::currentDateTime();