diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-04-01 12:25:42 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-04-01 13:49:32 +0000 |
commit | 85f94782278113c97f87a53c14fc5b732548d376 (patch) | |
tree | e024fb03b0f1d2011c9090ca516d493cd9f99898 /src/gui/opengl/qopengldebug.cpp | |
parent | 8299e408df73f085744cec8b9cae3af4171035f8 (diff) |
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.
Change-Id: I0fe86bb1adbdd4a76ab6d2f8c19e063b45ddcf3b
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/gui/opengl/qopengldebug.cpp')
-rw-r--r-- | src/gui/opengl/qopengldebug.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/gui/opengl/qopengldebug.cpp b/src/gui/opengl/qopengldebug.cpp index 114f118989..e747372df9 100644 --- a/src/gui/opengl/qopengldebug.cpp +++ b/src/gui/opengl/qopengldebug.cpp @@ -1039,10 +1039,11 @@ bool QOpenGLDebugMessage::operator==(const QOpenGLDebugMessage &debugMessage) co */ QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Source source) { + QDebugStateSaver saver(debug); debug.nospace() << "QOpenGLDebugMessage::Source(" << qt_messageSourceToString(source) - << ")"; - return debug.space(); + << ')'; + return debug; } /*! @@ -1053,10 +1054,11 @@ QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Source source) */ QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Type type) { + QDebugStateSaver saver(debug); debug.nospace() << "QOpenGLDebugMessage::Type(" << qt_messageTypeToString(type) - << ")"; - return debug.space(); + << ')'; + return debug; } /*! @@ -1067,10 +1069,11 @@ QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Type type) */ QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Severity severity) { + QDebugStateSaver saver(debug); debug.nospace() << "QOpenGLDebugMessage::Severity(" << qt_messageSeverityToString(severity) - << ")"; - return debug.space(); + << ')'; + return debug; } /*! @@ -1081,13 +1084,14 @@ QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Severity severity) */ QDebug operator<<(QDebug debug, const QOpenGLDebugMessage &message) { + QDebugStateSaver saver(debug); debug.nospace() << "QOpenGLDebugMessage(" << qt_messageSourceToString(message.source()) << ", " << message.id() << ", " << message.message() << ", " << qt_messageSeverityToString(message.severity()) << ", " - << qt_messageTypeToString(message.type()) << ")"; - return debug.space(); + << qt_messageTypeToString(message.type()) << ')'; + return debug; } #endif // QT_NO_DEBUG_STREAM |