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

Refine minor details in Darwin time-zone backend

Browse Source 
It's Darwin, no longer OS X.
Include a link to the URL of NSTimeZone's docs.
Use actuall Q_UNREACHABLE() rather than a comment.
Correct a TODO comment (there *is* API for it, but fiddly).
Make a lower bound constexpr rather than merely const.

Task-number: QTBUG-104012
Change-Id: I9bf2018fa27ac9f6aa38eaebbf6b0f90ff5f6188
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2023-07-25 15:39:56 +02:00
parent e73e972aa6
commit 35d0f012ee
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/time/qtimezoneprivate_mac.mm
View File

@ -19,7 +19,8 @@ QT_BEGIN_NAMESPACE
/* /*
Private Private
OS X system implementation Darwin system implementation
https://developer.apple.com/documentation/foundation/nstimezone
*/ */
// Create the system default time zone // Create the system default time zone
@ -113,7 +114,7 @@ QString QMacTimeZonePrivate::displayName(QTimeZone::TimeType timeType,
style = NSTimeZoneNameStyleStandard; style = NSTimeZoneNameStyleStandard;
break; break;
case QTimeZone::OffsetName : case QTimeZone::OffsetName :
// Unreachable Q_UNREACHABLE();
break; break;
} }
@ -149,7 +150,7 @@ int QMacTimeZonePrivate::daylightTimeOffset(qint64 atMSecsSinceEpoch) const
bool QMacTimeZonePrivate::hasDaylightTime() const bool QMacTimeZonePrivate::hasDaylightTime() const
{ {
// TODO No Mac API, assume if has transitions // TODO Scan transitions for one after which isDaylightSavingTimeForDate is true.
return hasTransitions(); return hasTransitions();
} }
@ -204,7 +205,7 @@ QTimeZonePrivate::Data QMacTimeZonePrivate::nextTransition(qint64 afterMSecsSinc
QTimeZonePrivate::Data QMacTimeZonePrivate::previousTransition(qint64 beforeMSecsSinceEpoch) const QTimeZonePrivate::Data QMacTimeZonePrivate::previousTransition(qint64 beforeMSecsSinceEpoch) const
{ {
// The native API only lets us search forward, so we need to find an early-enough start: // The native API only lets us search forward, so we need to find an early-enough start:
const NSTimeInterval lowerBound = std::numeric_limits<NSTimeInterval>::lowest(); constexpr NSTimeInterval lowerBound = std::numeric_limits<NSTimeInterval>::lowest();
const qint64 endSecs = beforeMSecsSinceEpoch / 1000; const qint64 endSecs = beforeMSecsSinceEpoch / 1000;
const int year = 366 * 24 * 3600; // a (long) year, in seconds const int year = 366 * 24 * 3600; // a (long) year, in seconds
NSTimeInterval prevSecs = endSecs; // sentinel for later check NSTimeInterval prevSecs = endSecs; // sentinel for later check