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

Q(Date|Time)+: in QDebug's <<, handle invalid explicitly

Browse Source 
The output didn't previously make clear that the datum was invalid.
It's now explicitly invalid.  At the same time, use QDebug's space()
and nospace() methods to make spacing choices explicit.
Revised a QDate test to match.

Change-Id: I4699f5897530b4caa31c22fdb07de149832b30f4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2017-06-02 15:18:43 +02:00
parent cc3b9cf3b3
commit fcb423d1f2
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5303,39 +5303,53 @@ QDataStream &operator>>(QDataStream &in, QDateTime &dateTime)
QDebug operator<<(QDebug dbg, const QDate &date) QDebug operator<<(QDebug dbg, const QDate &date)
{ {
QDebugStateSaver saver(dbg); QDebugStateSaver saver(dbg);
dbg.nospace() << "QDate(" << date.toString(Qt::ISODate) << ')'; dbg.nospace() << "QDate(";
if (date.isValid())
dbg.nospace() << date.toString(Qt::ISODate);
else
dbg.nospace() << "Invalid";
dbg.nospace() << ')';
return dbg; return dbg;
} }
QDebug operator<<(QDebug dbg, const QTime &time) QDebug operator<<(QDebug dbg, const QTime &time)
{ {
QDebugStateSaver saver(dbg); QDebugStateSaver saver(dbg);
dbg.nospace() << "QTime(" << time.toString(QStringViewLiteral("HH:mm:ss.zzz")) << ')'; dbg.nospace() << "QTime(";
if (time.isValid())
dbg.nospace() << time.toString(QStringViewLiteral("HH:mm:ss.zzz"));
else
dbg.nospace() << "Invalid";
dbg.nospace() << ')';
return dbg; return dbg;
} }
QDebug operator<<(QDebug dbg, const QDateTime &date) QDebug operator<<(QDebug dbg, const QDateTime &date)
{ {
QDebugStateSaver saver(dbg); QDebugStateSaver saver(dbg);
const Qt::TimeSpec ts = date.timeSpec();
dbg.nospace() << "QDateTime("; dbg.nospace() << "QDateTime(";
dbg.noquote() << date.toString(QStringViewLiteral("yyyy-MM-dd HH:mm:ss.zzz t")) if (date.isValid()) {
<< ' ' << ts; const Qt::TimeSpec ts = date.timeSpec();
switch (ts) { dbg.noquote() << date.toString(QStringViewLiteral("yyyy-MM-dd HH:mm:ss.zzz t"))
case Qt::UTC: << ' ' << ts;
break; switch (ts) {
case Qt::OffsetFromUTC: case Qt::UTC:
dbg << ' ' << date.offsetFromUtc() << 's'; break;
break; case Qt::OffsetFromUTC:
case Qt::TimeZone: dbg.space() << date.offsetFromUtc() << 's';
break;
case Qt::TimeZone:
#if QT_CONFIG(timezone) #if QT_CONFIG(timezone)
dbg << ' ' << date.timeZone().id(); dbg.space() << date.timeZone().id();
#endif // timezone #endif // timezone
break; break;
case Qt::LocalTime: case Qt::LocalTime:
break; break;
}
} else {
dbg.nospace() << "Invalid";
} }
return dbg << ')'; return dbg.nospace() << ')';
} }
#endif #endif

2
tests/auto/corelib/tools/qdate/tst_qdate.cpp
View File

@ -1490,7 +1490,7 @@ void tst_QDate::roundtrip() const
void tst_QDate::qdebug() const void tst_QDate::qdebug() const
{ {
QTest::ignoreMessage(QtDebugMsg, "QDate(\"\")"); QTest::ignoreMessage(QtDebugMsg, "QDate(Invalid)");
qDebug() << QDate(); qDebug() << QDate();
QTest::ignoreMessage(QtDebugMsg, "QDate(\"1983-08-07\")"); QTest::ignoreMessage(QtDebugMsg, "QDate(\"1983-08-07\")");
qDebug() << QDate(1983, 8, 7); qDebug() << QDate(1983, 8, 7);