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

QDateTime: Remove redundant check.

Browse Source 
Change-Id: I1a027526f24707f9431fe60ad08e41b5b07ffea3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Christian Kandeler 2015-09-22 15:13:40 +02:00
parent e01fa5f152
commit a6e2213e00
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/corelib/tools/qdatetime.cpp
View File

@ -4792,23 +4792,21 @@ QDataStream &operator<<(QDataStream &out, const QDateTime &dateTime)
// From 4.0 to 5.1 (except 5.0) we used QDateTimePrivate::Spec // From 4.0 to 5.1 (except 5.0) we used QDateTimePrivate::Spec
dateAndTime = dateTime.d->getDateTime(); dateAndTime = dateTime.d->getDateTime();
out << dateAndTime; out << dateAndTime;
if (out.version() >= QDataStream::Qt_4_0) { switch (dateTime.timeSpec()) {
switch (dateTime.timeSpec()) { case Qt::UTC:
case Qt::UTC: out << (qint8)QDateTimePrivate::UTC;
out << (qint8)QDateTimePrivate::UTC; break;
break; case Qt::OffsetFromUTC:
case Qt::OffsetFromUTC: out << (qint8)QDateTimePrivate::OffsetFromUTC;
out << (qint8)QDateTimePrivate::OffsetFromUTC; break;
break; case Qt::TimeZone:
case Qt::TimeZone:
#ifndef QT_BOOTSTRAPPED #ifndef QT_BOOTSTRAPPED
out << (qint8)QDateTimePrivate::TimeZone; out << (qint8)QDateTimePrivate::TimeZone;
break; break;
#endif // QT_BOOTSTRAPPED #endif // QT_BOOTSTRAPPED
case Qt::LocalTime: case Qt::LocalTime:
out << (qint8)QDateTimePrivate::LocalUnknown; out << (qint8)QDateTimePrivate::LocalUnknown;
break; break;
}
} }
} else { // version < QDataStream::Qt_4_0 } else { // version < QDataStream::Qt_4_0