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>

1 files changed, 7 insertions, 5 deletions

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index df1b4ed872..9e61813e20 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -3424,10 +3424,11 @@ bool QVariant::isNull() const
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug dbg, const QVariant &v)
 {
+    QDebugStateSaver saver(dbg);
     const uint typeId = v.d.type;
     dbg.nospace() << "QVariant(";
     if (typeId != QMetaType::UnknownType) {
-        dbg.nospace() << QMetaType::typeName(typeId) << ", ";
+        dbg << QMetaType::typeName(typeId) << ", ";
         bool userStream = false;
         bool canConvertToString = false;
         if (typeId >= QMetaType::User) {
@@ -3439,19 +3440,20 @@ QDebug operator<<(QDebug dbg, const QVariant &v)
         else if (!userStream)
             handlerManager[typeId]->debugStream(dbg, v);
     } else {
-        dbg.nospace() << "Invalid";
+        dbg << "Invalid";
     }
-    dbg.nospace() << ')';
-    return dbg.space();
+    dbg << ')';
+    return dbg;
 }
 
 QDebug operator<<(QDebug dbg, const QVariant::Type p)
 {
+    QDebugStateSaver saver(dbg);
     dbg.nospace() << "QVariant::"
                   << (int(p) != int(QMetaType::UnknownType)
                      ? QMetaType::typeName(p)
                      : "Invalid");
-    return dbg.space();
+    return dbg;
 }
 #endif