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, 7 insertions, 5 deletions

diff --git a/src/multimedia/qmediatimerange.cpp b/src/multimedia/qmediatimerange.cpp
index 13906b8ae..b30ee0439 100644
--- a/src/multimedia/qmediatimerange.cpp
+++ b/src/multimedia/qmediatimerange.cpp
@@ -705,11 +705,13 @@ QMediaTimeRange operator-(const QMediaTimeRange &r1, const QMediaTimeRange &r2)
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug dbg, const QMediaTimeRange &range)
 {
-    dbg.nospace() << "QMediaTimeRange( ";
-    foreach (const QMediaTimeInterval &interval, range.intervals()) {
-        dbg.nospace() << "(" <<  interval.start() << ", " << interval.end() << ") ";
-    }
-    dbg.space() << ")";
+    QDebugStateSaver saver(dbg);
+    dbg.nospace();
+    dbg << "QMediaTimeRange( ";
+    foreach (const QMediaTimeInterval &interval, range.intervals())
+        dbg << '(' <<  interval.start() << ", " << interval.end() << ") ";
+    dbg.space();
+    dbg << ')';
     return dbg;
 }
 #endif