From d9ae822e05c90ee6b4df3fdbf7a8d798b2f92c72 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 1 Apr 2022 15:27:09 +0200 Subject: [PATCH] Minor post-""_L1-ification tidy-up in QDateTimeParser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ibbead3922446b820bfe6def5f1278fd7825f0425 Reviewed-by: Sona Kurazyan Reviewed-by: Mårten Nordheim --- src/corelib/time/qdatetimeparser.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/corelib/time/qdatetimeparser.cpp b/src/corelib/time/qdatetimeparser.cpp index b71d4f27b6..61b56dfb1c 100644 --- a/src/corelib/time/qdatetimeparser.cpp +++ b/src/corelib/time/qdatetimeparser.cpp @@ -1268,7 +1268,7 @@ QDateTimeParser::scanString(const QDateTime &defaultValue, bool fixup) const if (fixup && sect.state == Intermediate && sect.used < sn.count) { const FieldInfo fi = fieldInfo(index); if ((fi & (Numeric|FixedWidth)) == (Numeric|FixedWidth)) { - const QString newText = QString::fromLatin1("%1").arg(sect.value, sn.count, 10, '0'_L1); + const QString newText = QString("%1"_L1).arg(sect.value, sn.count, 10, '0'_L1); m_text.replace(pos, sect.used, newText); sect.used = sn.count; } @@ -1287,12 +1287,10 @@ QDateTimeParser::scanString(const QDateTime &defaultValue, bool fixup) const QStringView zoneName = QStringView{m_text}.sliced(pos, sect.used); Q_ASSERT(!zoneName.isEmpty()); // sect.used > 0 - const QStringView offsetStr = zoneName.startsWith("UTC"_L1) - ? zoneName.sliced(3) : zoneName; - const bool isUtcOffset = offsetStr.startsWith(u'+') - || offsetStr.startsWith(u'-'); - const bool isUtc = zoneName == "Z"_L1 - || zoneName == "UTC"_L1; + const QStringView offsetStr + = zoneName.startsWith("UTC"_L1) ? zoneName.sliced(3) : zoneName; + const bool isUtcOffset = offsetStr.startsWith(u'+') || offsetStr.startsWith(u'-'); + const bool isUtc = zoneName == "Z"_L1 || zoneName == "UTC"_L1; if (isUtc || isUtcOffset) { tspec = sect.value ? Qt::OffsetFromUTC : Qt::UTC;