diff options
Diffstat (limited to 'src/multimedia/video/qabstractvideobuffer.cpp')
| -rw-r--r-- | src/multimedia/video/qabstractvideobuffer.cpp | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp index 2bdd030bc..ff29bd0b4 100644 --- a/src/multimedia/video/qabstractvideobuffer.cpp +++ b/src/multimedia/video/qabstractvideobuffer.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -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 |