diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2016-11-04 16:20:06 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2017-01-10 18:11:38 +0000 |
commit | 7277fdd603c940fb99c3eda183f5d75f32c57e7b (patch) | |
tree | d6eab09f5a941ab291ca693162e5637da79c21c4 /tests/auto/qml/qqmllocale | |
parent | 676340aef688e6271bb3df456a45cf26be52f588 (diff) |
tst_qqmllocale: avoid duplicating a QLocale::toString() call
Reuse the same const QString in both places, in each of the functions
that repeated this pattern.
Change-Id: Ic20281692d84b3ad5257af9837957e0893452b1a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmllocale')
-rw-r--r-- | tests/auto/qml/qqmllocale/tst_qqmllocale.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp b/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp index 1b83738ecf..d0ce83b997 100644 --- a/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp +++ b/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp @@ -921,13 +921,14 @@ void tst_qqmllocale::dateFromLocaleString() Q_ARG(QVariant, QVariant(locale))); QLocale l(locale); + const QString localeText(l.toString(dt, format)); QVariant val; QMetaObject::invokeMethod(obj, "fromLocaleString", Qt::DirectConnection, Q_RETURN_ARG(QVariant, val), - Q_ARG(QVariant, QVariant(l.toString(dt, format))), + Q_ARG(QVariant, QVariant(localeText)), Q_ARG(QVariant, QVariant(format))); - QDateTime pd = l.toDateTime(l.toString(dt, format), format); + QDateTime pd = l.toDateTime(localeText, format); QCOMPARE(val.toDateTime(), pd); } @@ -963,13 +964,14 @@ void tst_qqmllocale::dateFromLocaleDateString() Q_ARG(QVariant, QVariant(locale))); QLocale l(locale); + const QString localeText(l.toString(dt, format)); QVariant val; QMetaObject::invokeMethod(obj, "fromLocaleDateString", Qt::DirectConnection, Q_RETURN_ARG(QVariant, val), - Q_ARG(QVariant, QVariant(l.toString(dt, format))), + Q_ARG(QVariant, QVariant(localeText)), Q_ARG(QVariant, QVariant(format))); - QDate pd = l.toDate(l.toString(dt, format), format); + QDate pd = l.toDate(localeText, format); QCOMPARE(val.toDate(), pd); } @@ -1005,13 +1007,14 @@ void tst_qqmllocale::dateFromLocaleTimeString() Q_ARG(QVariant, QVariant(locale))); QLocale l(locale); + const QString localeText(l.toString(dt, format)); QVariant val; QMetaObject::invokeMethod(obj, "fromLocaleTimeString", Qt::DirectConnection, Q_RETURN_ARG(QVariant, val), - Q_ARG(QVariant, QVariant(l.toString(dt, format))), + Q_ARG(QVariant, QVariant(localeText)), Q_ARG(QVariant, QVariant(format))); - QTime pd = l.toTime(l.toString(dt, format), format); + QTime pd = l.toTime(localeText, format); QCOMPARE(val.toTime(), pd); } |