From 772b853ad31f9571610d20ca80bbb6c5faff3e1e Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 31 Jul 2019 17:50:44 +0200 Subject: Fix Qt6 build Change-Id: Ic10dea33d940a139d96dbb721b7bb399ed5adbb4 Reviewed-by: Simon Hausmann --- examples/multimedia/audiodecoder/audiodecoder.cpp | 24 +++++++++++------------ examples/multimedia/audiodecoder/main.cpp | 10 +++++----- examples/multimedia/spectrum/app/engine.cpp | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) (limited to 'examples') diff --git a/examples/multimedia/audiodecoder/audiodecoder.cpp b/examples/multimedia/audiodecoder/audiodecoder.cpp index 86904f7c9..15c88ebc9 100644 --- a/examples/multimedia/audiodecoder/audiodecoder.cpp +++ b/examples/multimedia/audiodecoder/audiodecoder.cpp @@ -129,16 +129,16 @@ void AudioDecoder::error(QAudioDecoder::Error error) case QAudioDecoder::NoError: return; case QAudioDecoder::ResourceError: - m_cout << "Resource error" << endl; + m_cout << "Resource error" << Qt::endl; break; case QAudioDecoder::FormatError: - m_cout << "Format error" << endl; + m_cout << "Format error" << Qt::endl; break; case QAudioDecoder::AccessDeniedError: - m_cout << "Access denied error" << endl; + m_cout << "Access denied error" << Qt::endl; break; case QAudioDecoder::ServiceMissingError: - m_cout << "Service missing error" << endl; + m_cout << "Service missing error" << Qt::endl; break; } @@ -149,10 +149,10 @@ void AudioDecoder::stateChanged(QAudioDecoder::State newState) { switch (newState) { case QAudioDecoder::DecodingState: - m_cout << "Decoding..." << endl; + m_cout << "Decoding..." << Qt::endl; break; case QAudioDecoder::StoppedState: - m_cout << "Decoding stopped" << endl; + m_cout << "Decoding stopped" << Qt::endl; break; } } @@ -160,12 +160,12 @@ void AudioDecoder::stateChanged(QAudioDecoder::State newState) void AudioDecoder::finished() { if (!m_fileWriter.close()) - m_cout << "Failed to finilize output file" << endl; + m_cout << "Failed to finilize output file" << Qt::endl; - m_cout << "Decoding finished" << endl; + m_cout << "Decoding finished" << Qt::endl; if (m_isPlayback) { - m_cout << "Starting playback" << endl; + m_cout << "Starting playback" << Qt::endl; m_soundEffect.setSource(QUrl::fromLocalFile(m_targetFilename)); m_soundEffect.play(); } else { @@ -176,7 +176,7 @@ void AudioDecoder::finished() void AudioDecoder::playbackStatusChanged() { if (m_soundEffect.status() == QSoundEffect::Error) { - m_cout << "Playback error" << endl; + m_cout << "Playback error" << Qt::endl; emit done(); } } @@ -184,7 +184,7 @@ void AudioDecoder::playbackStatusChanged() void AudioDecoder::playingChanged() { if (!m_soundEffect.isPlaying()) { - m_cout << "Playback finished" << endl; + m_cout << "Playback finished" << Qt::endl; if (m_isDelete) QFile::remove(m_targetFilename); emit done(); @@ -200,7 +200,7 @@ void AudioDecoder::updateProgress() progress = position / (qreal)duration; if (progress > m_progress + 0.1) { - m_cout << "Decoding progress: " << (int)(progress * 100.0) << "%" << endl; + m_cout << "Decoding progress: " << (int)(progress * 100.0) << "%" << Qt::endl; m_progress = progress; } } diff --git a/examples/multimedia/audiodecoder/main.cpp b/examples/multimedia/audiodecoder/main.cpp index c0947b83f..46e70445e 100644 --- a/examples/multimedia/audiodecoder/main.cpp +++ b/examples/multimedia/audiodecoder/main.cpp @@ -63,10 +63,10 @@ int main(int argc, char *argv[]) QTextStream cout(stdout, QIODevice::WriteOnly); if (app.arguments().size() < 2) { - cout << "Usage: audiodecoder [-p] [-pd] SOURCEFILE [TARGETFILE]" << endl; - cout << "Set -p option if you want to play output file." << endl; - cout << "Set -pd option if you want to play output file and delete it after successful playback." << endl; - cout << "Default TARGETFILE name is \"out.wav\" in the same directory as the source file." << endl; + cout << "Usage: audiodecoder [-p] [-pd] SOURCEFILE [TARGETFILE]" << Qt::endl; + cout << "Set -p option if you want to play output file." << Qt::endl; + cout << "Set -pd option if you want to play output file and delete it after successful playback." << Qt::endl; + cout << "Default TARGETFILE name is \"out.wav\" in the same directory as the source file." << Qt::endl; return 0; } @@ -85,7 +85,7 @@ int main(int argc, char *argv[]) int sourceFileIndex = (isPlayback || isDelete) ? 2 : 1; if (app.arguments().size() <= sourceFileIndex) { - cout << "Error: source filename is not specified." << endl; + cout << "Error: source filename is not specified." << Qt::endl; return 0; } sourceFile.setFile(app.arguments().at(sourceFileIndex)); diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp index fd977785b..49df1c028 100644 --- a/examples/multimedia/spectrum/app/engine.cpp +++ b/examples/multimedia/spectrum/app/engine.cpp @@ -569,14 +569,14 @@ bool Engine::selectFormat() sampleRatesList += m_audioInputDevice.supportedSampleRates(); sampleRatesList += m_audioOutputDevice.supportedSampleRates(); - sampleRatesList = sampleRatesList.toSet().toList(); // remove duplicates + sampleRatesList = QSet(sampleRatesList.begin(), sampleRatesList.end()).values(); // remove duplicates std::sort(sampleRatesList.begin(), sampleRatesList.end()); ENGINE_DEBUG << "Engine::initialize frequenciesList" << sampleRatesList; QList channelsList; channelsList += m_audioInputDevice.supportedChannelCounts(); channelsList += m_audioOutputDevice.supportedChannelCounts(); - channelsList = channelsList.toSet().toList(); + channelsList = QSet(channelsList.begin(), channelsList.end()).values(); std::sort(channelsList.begin(), channelsList.end()); ENGINE_DEBUG << "Engine::initialize channelsList" << channelsList; -- cgit v1.2.3