diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-11 03:09:46 +0200 |
---|---|---|
committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-11 22:17:46 +0200 |
commit | 737635fa56f5e4f50dabb495a5b8087e908b4713 (patch) | |
tree | 79b0425b0185bcdcd6c6308d03cefc7014a31256 /src/corelib/io/qdebug.h | |
parent | 18693916a4b6224b55d33c7cd650ea2849b3ac7b (diff) |
QDebug: sprinkle usage of QDebugStateSaver
Change-Id: I6dc134acca2bbc010139113f196869b36da9b240
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/io/qdebug.h')
-rw-r--r-- | src/corelib/io/qdebug.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 76fea1a3e0..723bb478ad 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -234,7 +234,7 @@ namespace QtPrivate { template <typename SequentialContainer> inline QDebug printSequentialContainer(QDebug debug, const char *which, const SequentialContainer &c) { - const bool oldSetting = debug.autoInsertSpaces(); + const QDebugStateSaver saver(debug); debug.nospace() << which << '('; typename SequentialContainer::const_iterator it = c.begin(), end = c.end(); if (it != end) { @@ -246,22 +246,20 @@ inline QDebug printSequentialContainer(QDebug debug, const char *which, const Se ++it; } debug << ')'; - debug.setAutoInsertSpaces(oldSetting); - return debug.maybeSpace(); + return debug; } template <typename AssociativeContainer> inline QDebug printAssociativeContainer(QDebug debug, const char *which, const AssociativeContainer &c) { - const bool oldSetting = debug.autoInsertSpaces(); + const QDebugStateSaver saver(debug); debug.nospace() << which << "("; for (typename AssociativeContainer::const_iterator it = c.constBegin(); it != c.constEnd(); ++it) { debug << '(' << it.key() << ", " << it.value() << ')'; } debug << ')'; - debug.setAutoInsertSpaces(oldSetting); - return debug.maybeSpace(); + return debug; } } // namespace QtPrivate @@ -332,10 +330,9 @@ inline QDebug operator<<(QDebug debug, const QPair<T1, T2> &pair) template <class T1, class T2> inline QDebug operator<<(QDebug debug, const std::pair<T1, T2> &pair) { - const bool oldSetting = debug.autoInsertSpaces(); + const QDebugStateSaver saver(debug); debug.nospace() << "std::pair(" << pair.first << ',' << pair.second << ')'; - debug.setAutoInsertSpaces(oldSetting); - return debug.maybeSpace(); + return debug; } template <typename T> @@ -347,7 +344,7 @@ inline QDebug operator<<(QDebug debug, const QSet<T> &set) template <class T> inline QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache) { - const bool oldSetting = debug.autoInsertSpaces(); + const QDebugStateSaver saver(debug); debug.nospace() << "QContiguousCache("; for (int i = cache.firstIndex(); i <= cache.lastIndex(); ++i) { debug << cache[i]; @@ -355,8 +352,7 @@ inline QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache) debug << ", "; } debug << ')'; - debug.setAutoInsertSpaces(oldSetting); - return debug.maybeSpace(); + return debug; } template <class T> |