Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove redundant QDateTimePrivate::LocalDST enum

Browse source 
treated same as QDateTimePrivate::LocalStandard

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2020-10-19 02:36:43 +03:00
parent 1d1d9e41df
commit 5d1d502b37
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/tools/qdatetime.cpp
View file

@ -2120,8 +2120,7 @@ void QDateTime::setDate(const QDate &date)
{
detach();
d->date = date;
if (d->spec == QDateTimePrivate::LocalStandard
|| d->spec == QDateTimePrivate::LocalDST)
if (d->spec == QDateTimePrivate::LocalStandard)
d->spec = QDateTimePrivate::LocalUnknown;
if (date.isValid() && !d->time.isValid())
d->time = QTime(0, 0, 0);
@ -2136,8 +2135,7 @@ void QDateTime::setDate(const QDate &date)
void QDateTime::setTime(const QTime &time)
{
detach();
if (d->spec == QDateTimePrivate::LocalStandard
|| d->spec == QDateTimePrivate::LocalDST)
if (d->spec == QDateTimePrivate::LocalStandard)
d->spec = QDateTimePrivate::LocalUnknown;
d->time = time;
}
@ -2830,9 +2828,8 @@ QDateTime QDateTime::currentDateTime()
dt.d->time.mds = msecsFromDecomposed(t->tm_hour, t->tm_min, t->tm_sec, tv.tv_usec / 1000);
dt.d->date.jd = julianDayFromDate(t->tm_year + 1900, t->tm_mon + 1, t->tm_mday);
dt.d->spec = t->tm_isdst > 0 ? QDateTimePrivate::LocalDST :
t->tm_isdst == 0 ? QDateTimePrivate::LocalStandard :
QDateTimePrivate::LocalUnknown;
dt.d->spec = (t->tm_isdst >= 0 ? QDateTimePrivate::LocalStandard :
QDateTimePrivate::LocalUnknown);
return dt;
}
@ -3494,9 +3491,7 @@ static QDateTimePrivate::Spec utcToLocal(QDate &date, QTime &time)
date = QDate(brokenDown->tm_year + 1900, brokenDown->tm_mon + 1, brokenDown->tm_mday);
time = QTime(brokenDown->tm_hour, brokenDown->tm_min, brokenDown->tm_sec, time.msec());
date = date.addDays(deltaDays);
if (brokenDown->tm_isdst > 0)
return QDateTimePrivate::LocalDST;
else if (brokenDown->tm_isdst < 0)
if (brokenDown->tm_isdst < 0)
return QDateTimePrivate::LocalUnknown;
else
return QDateTimePrivate::LocalStandard;

2
src/core/tools/qdatetime_p.h
View file

@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE
class QDateTimePrivate
{
public:
enum Spec { LocalUnknown = -1, LocalStandard = 0, LocalDST = 1, UTC = 2, OffsetFromUTC = 3};
enum Spec { LocalUnknown = -1, LocalStandard = 0, UTC = 1, OffsetFromUTC = 2 };
QDateTimePrivate() : spec(LocalUnknown), utcOffset(0) {}
QDateTimePrivate(const QDateTimePrivate &other)