1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework massaging of time zone offsets in formatted date-times

Browse Source 
Add a missing std::move() and rearrange comments.

Change-Id: I2d93e88f7b9b6f62e7d1cca5cacf794d2fef53b5
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2023-10-25 14:53:56 +02:00
parent b7b2375751
commit 31dc17c13a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/text/qlocale.cpp
View File

@ -3593,14 +3593,14 @@ QString QCalendarBackend::dateTimeToString(QStringView format, const QDateTime &
text = when.timeZone().displayName(when, QTimeZone::LongName);
break;
#endif // timezone
case 3:
case 2:
case 3: // ±hh:mm
case 2: // ±hhmm (we'll remove the ':' at the end)
text = when.toOffsetFromUtc(when.offsetFromUtc()).timeZoneAbbreviation();
// If the offset is UTC that'll be a Qt::UTC, otherwise Qt::OffsetFromUTC.
Q_ASSERT(text.startsWith("UTC"_L1));
// The Qt::UTC case omits the zero offset, which we want:
text = text.size() == 3 ? u"+00:00"_s : text.sliced(3);
if (repeat == 2) // +hhmm format, rather than +hh:mm format
Q_ASSERT(text.startsWith("UTC"_L1)); // Need to strip this.
// The Qt::UTC case omits the zero offset:
text = text.size() == 3 ? u"+00:00"_s : std::move(text).sliced(3);
if (repeat == 2)
text = text.remove(u':');
break;
default: