diff options
Diffstat (limited to 'src/multimedia/audio/qaudio.cpp')
-rw-r--r-- | src/multimedia/audio/qaudio.cpp | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/src/multimedia/audio/qaudio.cpp b/src/multimedia/audio/qaudio.cpp index 846971131..8b452a118 100644 --- a/src/multimedia/audio/qaudio.cpp +++ b/src/multimedia/audio/qaudio.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$ @@ -86,59 +86,62 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterAudioMetaTypes) #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, QAudio::Error error) { - QDebug nospace = dbg.nospace(); + QDebugStateSaver saver(dbg); + dbg.nospace(); switch (error) { case QAudio::NoError: - nospace << "NoError"; + dbg << "NoError"; break; case QAudio::OpenError: - nospace << "OpenError"; + dbg << "OpenError"; break; case QAudio::IOError: - nospace << "IOError"; + dbg << "IOError"; break; case QAudio::UnderrunError: - nospace << "UnderrunError"; + dbg << "UnderrunError"; break; case QAudio::FatalError: - nospace << "FatalError"; + dbg << "FatalError"; break; } - return nospace; + return dbg; } QDebug operator<<(QDebug dbg, QAudio::State state) { - QDebug nospace = dbg.nospace(); + QDebugStateSaver saver(dbg); + dbg.nospace(); switch (state) { case QAudio::ActiveState: - nospace << "ActiveState"; + dbg << "ActiveState"; break; case QAudio::SuspendedState: - nospace << "SuspendedState"; + dbg << "SuspendedState"; break; case QAudio::StoppedState: - nospace << "StoppedState"; + dbg << "StoppedState"; break; case QAudio::IdleState: - nospace << "IdleState"; + dbg << "IdleState"; break; } - return nospace; + return dbg; } QDebug operator<<(QDebug dbg, QAudio::Mode mode) { - QDebug nospace = dbg.nospace(); + QDebugStateSaver saver(dbg); + dbg.nospace(); switch (mode) { case QAudio::AudioInput: - nospace << "AudioInput"; + dbg << "AudioInput"; break; case QAudio::AudioOutput: - nospace << "AudioOutput"; + dbg << "AudioOutput"; break; } - return nospace; + return dbg; } #endif |