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

Add a warning and tidy some trivia

Browse Source 
An attempt to setSpec(TimeZone) gets treated as setSpec(LocalTime), as
the method has no parameter to carry *which* zone; this was done
silently, but should be brought to the caller's attention.  So warn.

Moved a declaration closer to its use, folded an if/else into a single
assignment using ?: and removed a fatuous \fn just before the function
it desribed.

Change-Id: Ia35c87e0ba373675d3ae1e6ef3bf05016c06c48d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2019-03-21 14:58:03 +01:00
parent a04411119e
commit bcc3472aa2
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2420,10 +2420,7 @@ static qint64 qt_mktime(QDate *date, QTime *time, QDateTimePrivate::DaylightStat
local.tm_mday = dd; local.tm_mday = dd;
local.tm_mon = mm - 1; local.tm_mon = mm - 1;
local.tm_year = yy - 1900; local.tm_year = yy - 1900;
if (daylightStatus) local.tm_isdst = daylightStatus ? int(*daylightStatus) : -1;
local.tm_isdst = int(*daylightStatus);
else
local.tm_isdst = -1;
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
int hh = local.tm_hour; int hh = local.tm_hour;
@ -2791,7 +2788,6 @@ static void refreshDateTime(QDateTimeData &d)
const auto spec = extractSpec(status); const auto spec = extractSpec(status);
const qint64 msecs = getMSecs(d); const qint64 msecs = getMSecs(d);
qint64 epochMSecs = 0; qint64 epochMSecs = 0;
int offsetFromUtc = 0;
QDate testDate; QDate testDate;
QTime testTime; QTime testTime;
Q_ASSERT(spec == Qt::TimeZone || spec == Qt::LocalTime); Q_ASSERT(spec == Qt::TimeZone || spec == Qt::LocalTime);
@ -2828,6 +2824,7 @@ static void refreshDateTime(QDateTimeData &d)
epochMSecs = localMSecsToEpochMSecs(msecs, &dstStatus, &testDate, &testTime); epochMSecs = localMSecsToEpochMSecs(msecs, &dstStatus, &testDate, &testTime);
status = mergeDaylightStatus(status, dstStatus); status = mergeDaylightStatus(status, dstStatus);
} }
int offsetFromUtc = 0;
if (timeToMSecs(testDate, testTime) == msecs) { if (timeToMSecs(testDate, testTime) == msecs) {
status |= QDateTimePrivate::ValidDateTime; status |= QDateTimePrivate::ValidDateTime;
// Cache the offset to use in offsetFromUtc() // Cache the offset to use in offsetFromUtc()
@ -2883,7 +2880,7 @@ static void setTimeSpec(QDateTimeData &d, Qt::TimeSpec spec, int offsetSeconds)
spec = Qt::UTC; spec = Qt::UTC;
break; break;
case Qt::TimeZone: case Qt::TimeZone:
// Use system time zone instead qWarning("Using TimeZone in setTimeSpec() is unsupported"); // Use system time zone instead
spec = Qt::LocalTime; spec = Qt::LocalTime;
Q_FALLTHROUGH(); Q_FALLTHROUGH();
case Qt::UTC: case Qt::UTC:
@ -4260,8 +4257,6 @@ qint64 QDateTime::msecsTo(const QDateTime &other) const
} }
/*! /*!
\fn QDateTime QDateTime::toTimeSpec(Qt::TimeSpec spec) const
Returns a copy of this datetime converted to the given time Returns a copy of this datetime converted to the given time
\a spec. \a spec.