diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-04-01 17:09:45 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-04-07 17:21:38 +0000 |
commit | 4d17db19f895ddaa778120c346d8a6a33a710194 (patch) | |
tree | 5c931f662f4a793cb82fb5f2099f595990e25437 /src/multimedia/video/qabstractvideobuffer.cpp | |
parent | 9fccf8064dea35f324f822b30116828acc3855a9 (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, streamline code.
Change-Id: I18ae7324b172ea801aa9b5fe56ddf6fe527fdde9
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/multimedia/video/qabstractvideobuffer.cpp')
-rw-r--r-- | src/multimedia/video/qabstractvideobuffer.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp index 657e4fc8d..ff29bd0b4 100644 --- a/src/multimedia/video/qabstractvideobuffer.cpp +++ b/src/multimedia/video/qabstractvideobuffer.cpp @@ -350,33 +350,37 @@ uchar *QAbstractPlanarVideoBuffer::map(MapMode mode, int *numBytes, int *bytesPe #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, QAbstractVideoBuffer::HandleType type) { + QDebugStateSaver saver(dbg); + dbg.nospace(); switch (type) { case QAbstractVideoBuffer::NoHandle: - return dbg.nospace() << "NoHandle"; + return dbg << "NoHandle"; case QAbstractVideoBuffer::GLTextureHandle: - return dbg.nospace() << "GLTextureHandle"; + return dbg << "GLTextureHandle"; case QAbstractVideoBuffer::XvShmImageHandle: - return dbg.nospace() << "XvShmImageHandle"; + return dbg << "XvShmImageHandle"; case QAbstractVideoBuffer::CoreImageHandle: - return dbg.nospace() << "CoreImageHandle"; + return dbg << "CoreImageHandle"; case QAbstractVideoBuffer::QPixmapHandle: - return dbg.nospace() << "QPixmapHandle"; + return dbg << "QPixmapHandle"; default: - return dbg.nospace() << QString(QLatin1String("UserHandle(%1)")).arg(int(type)).toLatin1().constData(); + return dbg << "UserHandle(" << int(type) << ')'; } } QDebug operator<<(QDebug dbg, QAbstractVideoBuffer::MapMode mode) { + QDebugStateSaver saver(dbg); + dbg.nospace(); switch (mode) { case QAbstractVideoBuffer::ReadOnly: - return dbg.nospace() << "ReadOnly"; + return dbg << "ReadOnly"; case QAbstractVideoBuffer::ReadWrite: - return dbg.nospace() << "ReadWrite"; + return dbg << "ReadWrite"; case QAbstractVideoBuffer::WriteOnly: - return dbg.nospace() << "WriteOnly"; + return dbg << "WriteOnly"; default: - return dbg.nospace() << "NotMapped"; + return dbg << "NotMapped"; } } #endif |