AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QDateTime: replace a bool parameter with an enum

Browse Source 
Change-Id: Ie72b1d482c67c83cb0e2e0bfd1e00f1be2fa4899
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Ahmad Samir 2023-04-03 13:44:25 +02:00
parent b490bd0265
commit b9786f21b8
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/corelib/time/qdatetime.cpp
View File

@ -831,7 +831,9 @@ static QTimeZone asTimeZone(Qt::TimeSpec spec, int offset, const char *warner)
}
#endif // Helper for 6.9 deprecation
static bool inDateTimeRange(qint64 jd, bool start)
enum class DaySide { Start, End };
static bool inDateTimeRange(qint64 jd, DaySide side)
{
using Bounds = std::numeric_limits<qint64>;
if (jd < Bounds::min() + JULIAN_DAY_FOR_EPOCH)
@ -842,9 +844,13 @@ static bool inDateTimeRange(qint64 jd, bool start)
// (Divisions rounded towards zero, as MSECS_PER_DAY is even - so doesn't
// divide max() - and has factors other than two, so doesn't divide min().)
// Range includes start of last day and end of first:
if (start)
switch (side) {
case DaySide::Start:
return jd > minDay && jd <= maxDay;
return jd >= minDay && jd < maxDay;
case DaySide::End:
return jd >= minDay && jd < maxDay;
}
Q_UNREACHABLE_RETURN(false);
}
static QDateTime toEarliest(QDate day, const QTimeZone &zone)
@ -927,7 +933,7 @@ static QDateTime toEarliest(QDate day, const QTimeZone &zone)
*/
QDateTime QDate::startOfDay(const QTimeZone &zone) const
{
if (!inDateTimeRange(jd, true) || !zone.isValid())
if (!inDateTimeRange(jd, DaySide::Start) || !zone.isValid())
return QDateTime();
QDateTime when(*this, QTime(0, 0), zone);
@ -1077,7 +1083,7 @@ static QDateTime toLatest(QDate day, const QTimeZone &zone)
*/
QDateTime QDate::endOfDay(const QTimeZone &zone) const
{
if (!inDateTimeRange(jd, false) || !zone.isValid())
if (!inDateTimeRange(jd, DaySide::End) || !zone.isValid())
return QDateTime();
QDateTime when(*this, QTime(23, 59, 59, 999), zone);