diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-23 16:19:11 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-02-09 11:30:02 +0000 |
commit | 868201155fd677dbc6d14346f5ea61e82ebce27b (patch) | |
tree | 75d02a144c205d659e5851f95f306e3a12b0ff5e /src/corelib/json/qjsonobject.cpp | |
parent | 6389160f04322449c34bd1ecfe53983e3b588943 (diff) |
QtCore: Use QDebugStateSaver in (almost) all QDebug operator<<
Unify the behavior of the different operator<< by always using
QDebugStateSaver (appending an optional space at exit), and making
sure that the space(), nospace() setting isn't 'leaked'.
Change-Id: I38e4f82fa6f7419d8b5edfc4dc37495af497e8ac
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/corelib/json/qjsonobject.cpp')
-rw-r--r-- | src/corelib/json/qjsonobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/json/qjsonobject.cpp b/src/corelib/json/qjsonobject.cpp index df604e4433..3210f05507 100644 --- a/src/corelib/json/qjsonobject.cpp +++ b/src/corelib/json/qjsonobject.cpp @@ -1111,6 +1111,7 @@ void QJsonObject::setValueAt(int i, const QJsonValue &val) #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY) QDebug operator<<(QDebug dbg, const QJsonObject &o) { + QDebugStateSaver saver(dbg); if (!o.o) { dbg << "QJsonObject()"; return dbg; @@ -1120,7 +1121,7 @@ QDebug operator<<(QDebug dbg, const QJsonObject &o) dbg.nospace() << "QJsonObject(" << json.constData() // print as utf-8 string without extra quotation marks << ")"; - return dbg.space(); + return dbg; } #endif |