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

QDateTime: micro-optimize QDebug op<<

Browse Source 
Instead of constructing a QString that describes the QDateTime
instance, stream the constituents of the string into QDebug
directly, using op<< for Q_ENUM, now that it's available.

Adapt test to new format of enums.

Effects on Linux GCC 4.9 stripped release builds:
 text  -1068B
 data    +-0B
 relocs  +-0

Change-Id: I1a5ce28904edd7d0f6c8d982fd41c52e3536e036
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2015-01-21 14:35:25 +01:00
parent 85ecc44eee
commit 1d2efe1f27
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5007,26 +5007,23 @@ QDebug operator<<(QDebug dbg, const QTime &time)
QDebug operator<<(QDebug dbg, const QDateTime &date) QDebug operator<<(QDebug dbg, const QDateTime &date)
{ {
QDebugStateSaver saver(dbg); QDebugStateSaver saver(dbg);
QString spec; dbg.nospace() << "QDateTime(" << date.toString(QStringLiteral("yyyy-MM-dd HH:mm:ss.zzz t"))
<< ' ' << date.timeSpec();
switch (date.d->m_spec) { switch (date.d->m_spec) {
case Qt::UTC: case Qt::UTC:
spec = QStringLiteral(" Qt::UTC");
break; break;
case Qt::OffsetFromUTC: case Qt::OffsetFromUTC:
spec = QString::fromLatin1(" Qt::OffsetFromUTC %1s").arg(date.offsetFromUtc()); dbg << ' ' << date.offsetFromUtc() << 's';
break; break;
case Qt::TimeZone: case Qt::TimeZone:
#ifndef QT_BOOTSTRAPPED #ifndef QT_BOOTSTRAPPED
spec = QStringLiteral(" Qt::TimeZone ") + QString::fromLatin1(date.timeZone().id()); dbg << ' ' << date.timeZone().id();
break; break;
#endif // QT_BOOTSTRAPPED #endif // QT_BOOTSTRAPPED
case Qt::LocalTime: case Qt::LocalTime:
spec = QStringLiteral(" Qt::LocalTime");
break; break;
} }
QString output = date.toString(QStringLiteral("yyyy-MM-dd HH:mm:ss.zzz t")) + spec; return dbg << ')';
dbg.nospace() << "QDateTime(" << output << ')';
return dbg;
} }
#endif #endif

5
tests/auto/corelib/io/qnodebug/tst_qnodebug.cpp
View File

@ -69,9 +69,8 @@ void tst_QNoDebug::noDebugOutput() const
void tst_QNoDebug::streaming() const void tst_QNoDebug::streaming() const
{ {
QDateTime dt(QDate(1,2,3),QTime(4,5,6)); QDateTime dt(QDate(1,2,3),QTime(4,5,6));
QString debugString = dt.toString(QStringLiteral("yyyy-MM-dd HH:mm:ss.zzz t")) const QString debugString = dt.toString(QStringLiteral("yyyy-MM-dd HH:mm:ss.zzz t"));
+ QStringLiteral(" Qt::LocalTime"); QTest::ignoreMessage(QtWarningMsg, qPrintable(QString::asprintf("QDateTime(\"%1\" Qt::TimeSpec(LocalTime))").arg(debugString)));
QTest::ignoreMessage(QtWarningMsg, qPrintable(QString::fromLatin1("QDateTime(\"%1\")").arg(debugString)));
qWarning() << dt; qWarning() << dt;
} }