Fix debug stream operators.

- Use QDebugStateSaver to restore space setting in stream operators
  instead of returning dbg.space() which breaks formatting on streams
  that already have nospace() set.
- Fix some single character string constants, streamline code.

Change-Id: I18ae7324b172ea801aa9b5fe56ddf6fe527fdde9
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

1 files changed, 13 insertions, 5 deletions

diff --git a/src/multimedia/video/qabstractvideosurface.cpp b/src/multimedia/video/qabstractvideosurface.cpp
index d09c4e4c4..c86d52dd2 100644
--- a/src/multimedia/video/qabstractvideosurface.cpp
+++ b/src/multimedia/video/qabstractvideosurface.cpp
@@ -353,18 +353,26 @@ void QAbstractVideoSurface::setNativeResolution(const QSize &resolution)
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug dbg, const QAbstractVideoSurface::Error& error)
 {
+    QDebugStateSaver saver(dbg);
+    dbg.nospace();
     switch (error) {
     case QAbstractVideoSurface::UnsupportedFormatError:
-        return dbg.nospace() << "UnsupportedFormatError";
+        dbg << "UnsupportedFormatError";
+        break;
     case QAbstractVideoSurface::IncorrectFormatError:
-        return dbg.nospace() << "IncorrectFormatError";
+        dbg << "IncorrectFormatError";
+        break;
     case QAbstractVideoSurface::StoppedError:
-        return dbg.nospace() << "StoppedError";
+        dbg << "StoppedError";
+        break;
     case QAbstractVideoSurface::ResourceError:
-        return dbg.nospace() << "ResourceError";
+        dbg << "ResourceError";
+        break;
     default:
-        return dbg.nospace() << "NoError";
+        dbg << "NoError";
+        break;
     }
+    return dbg;
 }
 #endif