From 676340aef688e6271bb3df456a45cf26be52f588 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 4 Nov 2016 16:04:36 +0100 Subject: tst_qqmllocale: simplify creation of a QDateTime Nine tests all used setDate and setTime on a default QDateTime, where just initializing it right, in one line, is simple, terse and easy to understand. This also allows it to be const. Change-Id: I77fd8b36b705cafc49f9020ae9280dfdcfece0d8 Reviewed-by: Simon Hausmann --- tests/auto/qml/qqmllocale/tst_qqmllocale.cpp | 36 +++++++--------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp b/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp index e0836468fb..1b83738ecf 100644 --- a/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp +++ b/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp @@ -640,9 +640,7 @@ void tst_qqmllocale::dateToLocaleString() QObject *obj = c.create(); QVERIFY(obj); - QDateTime dt; - dt.setDate(QDate(2011, 10, 7)); - dt.setTime(QTime(18, 53, 48, 345)); + const QDateTime dt(QDate(2011, 10, 7), QTime(18, 53, 48, 345)); QMetaObject::invokeMethod(obj, "setLocale", Qt::DirectConnection, Q_ARG(QVariant, QVariant(locale))); @@ -701,9 +699,7 @@ void tst_qqmllocale::dateToLocaleStringFormatted() QObject *obj = c.create(); QVERIFY(obj); - QDateTime dt; - dt.setDate(QDate(2011, 10, 7)); - dt.setTime(QTime(18, 53, 48, 345)); + const QDateTime dt(QDate(2011, 10, 7), QTime(18, 53, 48, 345)); QMetaObject::invokeMethod(obj, "setLocale", Qt::DirectConnection, Q_ARG(QVariant, QVariant(locale))); @@ -732,9 +728,7 @@ void tst_qqmllocale::dateToLocaleDateString() QObject *obj = c.create(); QVERIFY(obj); - QDateTime dt; - dt.setDate(QDate(2011, 10, 7)); - dt.setTime(QTime(18, 53, 48, 345)); + const QDateTime dt(QDate(2011, 10, 7), QTime(18, 53, 48, 345)); QMetaObject::invokeMethod(obj, "setLocale", Qt::DirectConnection, Q_ARG(QVariant, QVariant(locale))); @@ -793,9 +787,7 @@ void tst_qqmllocale::dateToLocaleDateStringFormatted() QObject *obj = c.create(); QVERIFY(obj); - QDateTime dt; - dt.setDate(QDate(2011, 10, 7)); - dt.setTime(QTime(18, 53, 48, 345)); + const QDateTime dt(QDate(2011, 10, 7), QTime(18, 53, 48, 345)); QMetaObject::invokeMethod(obj, "setLocale", Qt::DirectConnection, Q_ARG(QVariant, QVariant(locale))); @@ -824,9 +816,7 @@ void tst_qqmllocale::dateToLocaleTimeString() QObject *obj = c.create(); QVERIFY(obj); - QDateTime dt; - dt.setDate(QDate(2011, 10, 7)); - dt.setTime(QTime(18, 53, 48, 345)); + const QDateTime dt(QDate(2011, 10, 7), QTime(18, 53, 48, 345)); QMetaObject::invokeMethod(obj, "setLocale", Qt::DirectConnection, Q_ARG(QVariant, QVariant(locale))); @@ -885,9 +875,7 @@ void tst_qqmllocale::dateToLocaleTimeStringFormatted() QObject *obj = c.create(); QVERIFY(obj); - QDateTime dt; - dt.setDate(QDate(2011, 10, 7)); - dt.setTime(QTime(18, 53, 48, 345)); + const QDateTime dt(QDate(2011, 10, 7), QTime(18, 53, 48, 345)); QMetaObject::invokeMethod(obj, "setLocale", Qt::DirectConnection, Q_ARG(QVariant, QVariant(locale))); @@ -927,9 +915,7 @@ void tst_qqmllocale::dateFromLocaleString() QObject *obj = c.create(); QVERIFY(obj); - QDateTime dt; - dt.setDate(QDate(2011, 10, 7)); - dt.setTime(QTime(18, 53, 48, 345)); + const QDateTime dt(QDate(2011, 10, 7), QTime(18, 53, 48, 345)); QMetaObject::invokeMethod(obj, "setLocale", Qt::DirectConnection, Q_ARG(QVariant, QVariant(locale))); @@ -971,9 +957,7 @@ void tst_qqmllocale::dateFromLocaleDateString() QObject *obj = c.create(); QVERIFY(obj); - QDateTime dt; - dt.setDate(QDate(2011, 10, 7)); - dt.setTime(QTime(18, 53, 48, 345)); + const QDateTime dt(QDate(2011, 10, 7), QTime(18, 53, 48, 345)); QMetaObject::invokeMethod(obj, "setLocale", Qt::DirectConnection, Q_ARG(QVariant, QVariant(locale))); @@ -1015,9 +999,7 @@ void tst_qqmllocale::dateFromLocaleTimeString() QObject *obj = c.create(); QVERIFY(obj); - QDateTime dt; - dt.setDate(QDate(2011, 10, 7)); - dt.setTime(QTime(18, 53, 48, 345)); + const QDateTime dt(QDate(2011, 10, 7), QTime(18, 53, 48, 345)); QMetaObject::invokeMethod(obj, "setLocale", Qt::DirectConnection, Q_ARG(QVariant, QVariant(locale))); -- cgit v1.2.3