diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2019-12-11 12:47:39 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-04-01 09:29:26 +0100 |
| commit | 66f06a930da0114f62a5470e778182c50117ad27 (patch) | |
| tree | 0c6ab19aea2142838c7237090aace3c02bc4a6d7 /tests/auto/corelib/time | |
| parent | 098d2edb07e08da6485fee4efbea72f43ddc766e (diff) | |
Make QLocale(QString) explicit
We should not implicitly convert a QString to a QLocale object. It can
easily create unwanted side effects.
Change-Id: I7bd9b4a4e4512c0e60176ee4d241d172f00fdc32
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto/corelib/time')
| -rw-r--r-- | tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp index 332a00efb5..5c2af3b115 100644 --- a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp +++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp @@ -344,9 +344,9 @@ void tst_QTimeZone::dataStreamTest() QCOMPARE(tz2.comment(), QString("Qt Testing")); QCOMPARE(tz2.country(), QLocale::Norway); QCOMPARE(tz2.abbreviation(QDateTime::currentDateTime()), QString("QST")); - QCOMPARE(tz2.displayName(QTimeZone::StandardTime, QTimeZone::LongName, QString()), + QCOMPARE(tz2.displayName(QTimeZone::StandardTime, QTimeZone::LongName, QLocale()), QString("Qt Standard Time")); - QCOMPARE(tz2.displayName(QTimeZone::DaylightTime, QTimeZone::LongName, QString()), + QCOMPARE(tz2.displayName(QTimeZone::DaylightTime, QTimeZone::LongName, QLocale()), QString("Qt Standard Time")); QCOMPARE(tz2.offsetFromUtc(QDateTime::currentDateTime()), 123456); @@ -944,7 +944,7 @@ void tst_QTimeZone::utcTest() QCOMPARE(tzp.id(), QByteArray("UTC")); QCOMPARE(tzp.country(), QLocale::AnyCountry); QCOMPARE(tzp.abbreviation(0), QString("UTC")); - QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::LongName, QString()), QString("UTC")); + QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::LongName, QLocale()), QString("UTC")); QCOMPARE(tzp.offsetFromUtc(0), 0); QCOMPARE(tzp.standardTimeOffset(0), 0); QCOMPARE(tzp.daylightTimeOffset(0), 0); @@ -985,7 +985,7 @@ void tst_QTimeZone::utcTest() QCOMPARE(tz.comment(), QString("Qt Testing")); QCOMPARE(tz.country(), QLocale::Norway); QCOMPARE(tz.abbreviation(now), QString("QST")); - QCOMPARE(tz.displayName(QTimeZone::StandardTime, QTimeZone::LongName, QString()), + QCOMPARE(tz.displayName(QTimeZone::StandardTime, QTimeZone::LongName, QLocale()), QString("Qt Standard Time")); QCOMPARE(tz.offsetFromUtc(now), 123456); QCOMPARE(tz.standardTimeOffset(now), 123456); |