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

Use QDebugStateSaver in example operator<<()

Browse Source 
This makes sure that changes in the debug stream - like nospace() -
do not "leak". Also use the example snippet in QDebugStateSaver
documentation.

Change-Id: I934976d2c7c2335abfec68c763526a5cbb0e6f1e
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 9f5f64e9dbd916679bd881ee0331da9a3dacac32)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Kai Köhne 2022-03-12 11:05:12 +01:00 committed by Qt Cherry-pick Bot
parent db558fe10b
commit ca311cf1ab
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/corelib/tools/customtype/message.cpp
View File

@ -60,6 +60,7 @@ Message::Message(const QString &body, const QStringList &headers)
//! [custom type streaming operator] //! [custom type streaming operator]
QDebug operator<<(QDebug dbg, const Message &message) QDebug operator<<(QDebug dbg, const Message &message)
{ {
QDebugStateSaver saver(dbg);
QList<QStringView> pieces = message.body().split(u"\r\n", Qt::SkipEmptyParts); QList<QStringView> pieces = message.body().split(u"\r\n", Qt::SkipEmptyParts);
if (pieces.isEmpty()) if (pieces.isEmpty())
dbg.nospace() << "Message()"; dbg.nospace() << "Message()";
@ -67,7 +68,7 @@ QDebug operator<<(QDebug dbg, const Message &message)
dbg.nospace() << "Message(" << pieces.first() << ")"; dbg.nospace() << "Message(" << pieces.first() << ")";
else else
dbg.nospace() << "Message(" << pieces.first() << " ...)"; dbg.nospace() << "Message(" << pieces.first() << " ...)";
return dbg.maybeSpace(); return dbg;
} }
//! [custom type streaming operator] //! [custom type streaming operator]

4
src/corelib/io/qdebug.cpp
View File

@ -961,6 +961,10 @@ QDebug &QDebug::resetFormat()
so that using << Qt::hex in a QDebug operator doesn't affect other QDebug so that using << Qt::hex in a QDebug operator doesn't affect other QDebug
operators. operators.
QDebugStateSaver is typically used in the implementation of an operator<<() for debugging:
\snippet tools/customtype/message.cpp custom type streaming operator
\since 5.1 \since 5.1
*/ */