summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-11-11 16:26:04 +0100
committerMarc Mutz <marc.mutz@qt.io>2022-11-18 22:01:35 +0100
commit21a75150e38167fcadc8ad679cd75174356da8e5 (patch)
treee1cc85b95f6003ad3ddf758ecb02500df81a2d90
parentd8dc0de7ba43b2a6a30c349e08b5c2a0aea3306c (diff)
Port from qAsConst() to std::as_const()
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. This is a 6.4 re-run of the script we ran in dev, in order to avoid conflicts between the branches when cherry-picking. Change-Id: I5eca3df3179dfb2b2682c75a479ba9a4259cc703 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--examples/multimedia/audiorecorder/audiorecorder.cpp2
-rw-r--r--src/multimedia/qmediastoragelocation.cpp2
-rw-r--r--src/plugins/multimedia/ffmpeg/qffmpegclock.cpp8
-rw-r--r--src/plugins/multimedia/ffmpeg/qffmpegdecoder.cpp10
-rw-r--r--src/plugins/multimedia/ffmpeg/qv4l2camera.cpp2
-rw-r--r--src/plugins/multimedia/gstreamer/common/qgstpipeline.cpp4
-rw-r--r--src/plugins/multimedia/gstreamer/qgstreamerformatinfo.cpp2
-rw-r--r--src/plugins/multimedia/windows/evr/evrcustompresenter.cpp12
-rw-r--r--src/plugins/multimedia/windows/player/mftvideo.cpp4
-rw-r--r--src/plugins/multimedia/windows/player/mfvideorenderercontrol.cpp6
-rw-r--r--src/plugins/multimedia/windows/player/samplegrabber.cpp2
-rw-r--r--src/spatialaudio/qaudioengine.cpp8
-rw-r--r--tests/auto/integration/qaudiosink/tst_qaudiosink.cpp2
-rw-r--r--tests/auto/integration/qaudiosource/tst_qaudiosource.cpp2
14 files changed, 33 insertions, 33 deletions
diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp
index 81666f432..df17e8767 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.cpp
+++ b/examples/multimedia/audiorecorder/audiorecorder.cpp
@@ -207,7 +207,7 @@ void AudioRecorder::updateFormats()
void AudioRecorder::clearAudioLevels()
{
- for (auto m_audioLevel : qAsConst(m_audioLevels))
+ for (auto m_audioLevel : std::as_const(m_audioLevels))
m_audioLevel->setLevel(0);
}
diff --git a/src/multimedia/qmediastoragelocation.cpp b/src/multimedia/qmediastoragelocation.cpp
index 4363e06de..7b0433d8b 100644
--- a/src/multimedia/qmediastoragelocation.cpp
+++ b/src/multimedia/qmediastoragelocation.cpp
@@ -21,7 +21,7 @@ QDir QMediaStorageLocation::defaultDirectory(QStandardPaths::StandardLocation ty
dirCandidates << QDir::currentPath();
dirCandidates << QDir::tempPath();
- for (const QString &path : qAsConst(dirCandidates)) {
+ for (const QString &path : std::as_const(dirCandidates)) {
QDir dir(path);
if (dir.exists() && QFileInfo(path).isWritable())
return dir;
diff --git a/src/plugins/multimedia/ffmpeg/qffmpegclock.cpp b/src/plugins/multimedia/ffmpeg/qffmpegclock.cpp
index a3ca04d93..30e09a0a1 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpegclock.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpegclock.cpp
@@ -76,7 +76,7 @@ QFFmpeg::Clock::Type QFFmpeg::Clock::type() const
QFFmpeg::ClockController::~ClockController()
{
- for (auto *p : qAsConst(m_clocks))
+ for (auto *p : std::as_const(m_clocks))
p->setController(nullptr);
}
@@ -149,7 +149,7 @@ void QFFmpeg::ClockController::syncTo(qint64 usecs)
m_elapsedTimer.restart();
}
- for (auto *p : qAsConst(m_clocks))
+ for (auto *p : std::as_const(m_clocks))
p->syncTo(usecs);
}
@@ -166,7 +166,7 @@ void QFFmpeg::ClockController::setPlaybackRate(float rate)
m_playbackRate = rate;
}
- for (auto *p : qAsConst(m_clocks))
+ for (auto *p : std::as_const(m_clocks))
p->setPlaybackRate(rate, baseTime);
}
@@ -186,7 +186,7 @@ void QFFmpeg::ClockController::setPaused(bool paused)
}
}
- for (auto *p : qAsConst(m_clocks))
+ for (auto *p : std::as_const(m_clocks))
p->setPaused(paused);
}
diff --git a/src/plugins/multimedia/ffmpeg/qffmpegdecoder.cpp b/src/plugins/multimedia/ffmpeg/qffmpegdecoder.cpp
index 89a95f5a3..35fd9738a 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpegdecoder.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpegdecoder.cpp
@@ -157,15 +157,15 @@ void Demuxer::stopDecoding()
int Demuxer::seek(qint64 pos)
{
QMutexLocker locker(&mutex);
- for (StreamDecoder *d : qAsConst(streamDecoders)) {
+ for (StreamDecoder *d : std::as_const(streamDecoders)) {
if (d)
d->mutex.lock();
}
- for (StreamDecoder *d : qAsConst(streamDecoders)) {
+ for (StreamDecoder *d : std::as_const(streamDecoders)) {
if (d)
d->flush();
}
- for (StreamDecoder *d : qAsConst(streamDecoders)) {
+ for (StreamDecoder *d : std::as_const(streamDecoders)) {
if (d)
d->mutex.unlock();
}
@@ -193,7 +193,7 @@ void Demuxer::sendFinalPacketToStreams()
{
if (m_isStopped.loadAcquire())
return;
- for (auto *streamDecoder : qAsConst(streamDecoders)) {
+ for (auto *streamDecoder : std::as_const(streamDecoders)) {
qCDebug(qLcDemuxer) << "Demuxer: sending last packet to stream" << streamDecoder;
if (!streamDecoder)
continue;
@@ -211,7 +211,7 @@ void Demuxer::cleanup()
{
qCDebug(qLcDemuxer) << "Demuxer::cleanup";
#ifndef QT_NO_DEBUG
- for (auto *streamDecoder : qAsConst(streamDecoders)) {
+ for (auto *streamDecoder : std::as_const(streamDecoders)) {
Q_ASSERT(!streamDecoder);
}
#endif
diff --git a/src/plugins/multimedia/ffmpeg/qv4l2camera.cpp b/src/plugins/multimedia/ffmpeg/qv4l2camera.cpp
index f48ab35ad..e572d5671 100644
--- a/src/plugins/multimedia/ffmpeg/qv4l2camera.cpp
+++ b/src/plugins/multimedia/ffmpeg/qv4l2camera.cpp
@@ -257,7 +257,7 @@ void QV4L2CameraBuffers::release(int index)
void QV4L2CameraBuffers::unmapBuffers()
{
- for (const auto &b : qAsConst(mappedBuffers))
+ for (const auto &b : std::as_const(mappedBuffers))
munmap(b.data, b.size);
mappedBuffers.clear();
}
diff --git a/src/plugins/multimedia/gstreamer/common/qgstpipeline.cpp b/src/plugins/multimedia/gstreamer/common/qgstpipeline.cpp
index b2cfa79f8..f1ec37f22 100644
--- a/src/plugins/multimedia/gstreamer/common/qgstpipeline.cpp
+++ b/src/plugins/multimedia/gstreamer/common/qgstpipeline.cpp
@@ -51,7 +51,7 @@ public:
Q_UNUSED(bus);
QMutexLocker lock(&d->filterMutex);
- for (QGstreamerSyncMessageFilter *filter : qAsConst(d->syncFilters)) {
+ for (QGstreamerSyncMessageFilter *filter : std::as_const(d->syncFilters)) {
if (filter->processSyncMessage(QGstreamerMessage(message))) {
gst_message_unref(message);
return GST_BUS_DROP;
@@ -72,7 +72,7 @@ private Q_SLOTS:
}
void doProcessMessage(const QGstreamerMessage& msg)
{
- for (QGstreamerBusMessageFilter *filter : qAsConst(busFilters)) {
+ for (QGstreamerBusMessageFilter *filter : std::as_const(busFilters)) {
if (filter->processBusMessage(msg))
break;
}
diff --git a/src/plugins/multimedia/gstreamer/qgstreamerformatinfo.cpp b/src/plugins/multimedia/gstreamer/qgstreamerformatinfo.cpp
index fd759b1fe..538797cf8 100644
--- a/src/plugins/multimedia/gstreamer/qgstreamerformatinfo.cpp
+++ b/src/plugins/multimedia/gstreamer/qgstreamerformatinfo.cpp
@@ -254,7 +254,7 @@ QList<QGstreamerFormatInfo::CodecMap> QGstreamerFormatInfo::getMuxerList(bool de
}
}
if (!audioCodecs.isEmpty() || !videoCodecs.isEmpty()) {
- for (auto f : qAsConst(fileFormats)) {
+ for (auto f : std::as_const(fileFormats)) {
muxers.append({f, audioCodecs, videoCodecs});
if (f == QMediaFormat::MPEG4 && !fileFormats.contains(QMediaFormat::Mpeg4Audio)) {
muxers.append({QMediaFormat::Mpeg4Audio, audioCodecs, {}});
diff --git a/src/plugins/multimedia/windows/evr/evrcustompresenter.cpp b/src/plugins/multimedia/windows/evr/evrcustompresenter.cpp
index d520584f7..742608f0f 100644
--- a/src/plugins/multimedia/windows/evr/evrcustompresenter.cpp
+++ b/src/plugins/multimedia/windows/evr/evrcustompresenter.cpp
@@ -482,14 +482,14 @@ HRESULT SamplePool::initialize(QList<IMFSample*> &samples)
return MF_E_INVALIDREQUEST;
// Move these samples into our allocated queue.
- for (auto sample : qAsConst(samples)) {
+ for (auto sample : std::as_const(samples)) {
sample->AddRef();
m_videoSampleQueue.append(sample);
}
m_initialized = true;
- for (auto sample : qAsConst(samples))
+ for (auto sample : std::as_const(samples))
sample->Release();
samples.clear();
return S_OK;
@@ -499,7 +499,7 @@ HRESULT SamplePool::clear()
{
QMutexLocker locker(&m_mutex);
- for (auto sample : qAsConst(m_videoSampleQueue))
+ for (auto sample : std::as_const(m_videoSampleQueue))
sample->Release();
m_videoSampleQueue.clear();
m_initialized = false;
@@ -896,7 +896,7 @@ HRESULT EVRCustomPresenter::OnClockSetRate(MFTIME, float rate)
// frame-step operation.
if ((m_playbackRate == 0.0f) && (rate != 0.0f)) {
cancelFrameStep();
- for (auto sample : qAsConst(m_frameStep.samples))
+ for (auto sample : std::as_const(m_frameStep.samples))
sample->Release();
m_frameStep.samples.clear();
}
@@ -1100,7 +1100,7 @@ HRESULT EVRCustomPresenter::flush()
m_scheduler.flush();
// Flush the frame-step queue.
- for (auto sample : qAsConst(m_frameStep.samples))
+ for (auto sample : std::as_const(m_frameStep.samples))
sample->Release();
m_frameStep.samples.clear();
@@ -1408,7 +1408,7 @@ HRESULT EVRCustomPresenter::setMediaType(IMFMediaType *mediaType)
// Mark each sample with our token counter. If this batch of samples becomes
// invalid, we increment the counter, so that we know they should be discarded.
- for (auto sample : qAsConst(sampleQueue)) {
+ for (auto sample : std::as_const(sampleQueue)) {
hr = sample->SetUINT32(MFSamplePresenter_SampleCounter, m_tokenCounter);
if (FAILED(hr))
goto done;
diff --git a/src/plugins/multimedia/windows/player/mftvideo.cpp b/src/plugins/multimedia/windows/player/mftvideo.cpp
index 601c51e42..a2ef1db0b 100644
--- a/src/plugins/multimedia/windows/player/mftvideo.cpp
+++ b/src/plugins/multimedia/windows/player/mftvideo.cpp
@@ -489,7 +489,7 @@ STDMETHODIMP MFTransform::ProcessInput(DWORD dwInputStreamID, IMFSample *pSample
// if (!m_videoProbes.isEmpty()) {
// QVideoFrame frame = makeVideoFrame();
-// for (MFVideoProbeControl* probe : qAsConst(m_videoProbes))
+// for (MFVideoProbeControl* probe : std::as_const(m_videoProbes))
// probe->bufferProbed(frame);
// }
@@ -540,7 +540,7 @@ STDMETHODIMP MFTransform::ProcessOutput(DWORD dwFlags, DWORD cOutputBufferCount,
// if (!m_videoProbes.isEmpty()) {
// QVideoFrame frame = makeVideoFrame();
-// for (MFVideoProbeControl* probe : qAsConst(m_videoProbes))
+// for (MFVideoProbeControl* probe : std::as_const(m_videoProbes))
// probe->bufferProbed(frame);
// }
m_videoProbeMutex.unlock();
diff --git a/src/plugins/multimedia/windows/player/mfvideorenderercontrol.cpp b/src/plugins/multimedia/windows/player/mfvideorenderercontrol.cpp
index 05bc7b0f7..0dd094460 100644
--- a/src/plugins/multimedia/windows/player/mfvideorenderercontrol.cpp
+++ b/src/plugins/multimedia/windows/player/mfvideorenderercontrol.cpp
@@ -954,7 +954,7 @@ namespace
void clearMediaTypes()
{
- for (IMFMediaType* mediaType : qAsConst(m_mediaTypes))
+ for (IMFMediaType* mediaType : std::as_const(m_mediaTypes))
mediaType->Release();
m_mediaTypes.clear();
}
@@ -1172,7 +1172,7 @@ namespace
bool m_prerolling = false;
void clearSampleQueue() {
- for (IUnknown* sample : qAsConst(m_sampleQueue))
+ for (IUnknown* sample : std::as_const(m_sampleQueue))
sample->Release();
m_sampleQueue.clear();
}
@@ -1279,7 +1279,7 @@ namespace
void clearBufferCache()
{
- for (SampleBuffer sb : qAsConst(m_bufferCache))
+ for (SampleBuffer sb : std::as_const(m_bufferCache))
sb.m_buffer->Release();
m_bufferCache.clear();
diff --git a/src/plugins/multimedia/windows/player/samplegrabber.cpp b/src/plugins/multimedia/windows/player/samplegrabber.cpp
index c1d1c3ca5..6ceb6ccff 100644
--- a/src/plugins/multimedia/windows/player/samplegrabber.cpp
+++ b/src/plugins/multimedia/windows/player/samplegrabber.cpp
@@ -131,7 +131,7 @@ STDMETHODIMP AudioSampleGrabberCallback::OnProcessSample(REFGUID guidMajorMediaT
llSampleTime /= 10;
}
-// for (MFAudioProbeControl* probe : qAsConst(m_audioProbes))
+// for (MFAudioProbeControl* probe : std::as_const(m_audioProbes))
// probe->bufferProbed((const char*)pSampleBuffer, dwSampleSize, m_format, llSampleTime);
return S_OK;
diff --git a/src/spatialaudio/qaudioengine.cpp b/src/spatialaudio/qaudioengine.cpp
index 9020bae54..7825055d4 100644
--- a/src/spatialaudio/qaudioengine.cpp
+++ b/src/spatialaudio/qaudioengine.cpp
@@ -116,13 +116,13 @@ qint64 QAudioOutputStream::readData(char *data, qint64 len)
bool ok = true;
while (frames >= qint64(QAudioEnginePrivate::bufferSize)) {
// Fill input buffers
- for (auto *source : qAsConst(d->sources)) {
+ for (auto *source : std::as_const(d->sources)) {
auto *sp = QSpatialSoundPrivate::get(source);
float buf[QAudioEnginePrivate::bufferSize];
sp->getBuffer(buf, QAudioEnginePrivate::bufferSize, 1);
d->resonanceAudio->api->SetInterleavedBuffer(sp->sourceId, buf, 1, QAudioEnginePrivate::bufferSize);
}
- for (auto *source : qAsConst(d->stereoSources)) {
+ for (auto *source : std::as_const(d->stereoSources)) {
auto *sp = QAmbientSoundPrivate::get(source);
float buf[2*QAudioEnginePrivate::bufferSize];
sp->getBuffer(buf, QAudioEnginePrivate::bufferSize, 2);
@@ -231,7 +231,7 @@ void QAudioEnginePrivate::updateRooms()
float roomVolume = float(qInf());
QAudioRoom *room = nullptr;
// Find the smallest room that contains the listener and apply its room effects
- for (auto *r : qAsConst(rooms)) {
+ for (auto *r : std::as_const(rooms)) {
QVector3D dim2 = r->dimensions()/2.;
float vol = dim2.x()*dim2.y()*dim2.z();
if (vol > roomVolume)
@@ -267,7 +267,7 @@ void QAudioEnginePrivate::updateRooms()
resonanceAudio->api->SetReverbProperties(rp->reverb);
// update room effects for all sound sources
- for (auto *s : qAsConst(sources)) {
+ for (auto *s : std::as_const(sources)) {
auto *sp = QSpatialSoundPrivate::get(s);
sp->updateRoomEffects();
}
diff --git a/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp b/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp
index b7ef9d2bd..e3c869f02 100644
--- a/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp
+++ b/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp
@@ -199,7 +199,7 @@ void tst_QAudioSink::initTestCase()
QVERIFY(m_temporaryDir->isValid());
const QString temporaryAudioPath = m_temporaryDir->path() + slash;
- for (const QAudioFormat &format : qAsConst(testFormats)) {
+ for (const QAudioFormat &format : std::as_const(testFormats)) {
qint64 len = format.sampleRate()*format.bytesPerFrame(); // 1 second
createSineWaveData(format, len);
// Write generate sine wave data to file
diff --git a/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp b/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp
index 4877d4ae5..47b7a7f92 100644
--- a/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp
+++ b/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp
@@ -159,7 +159,7 @@ void tst_QAudioSource::initTestCase()
QVERIFY(m_temporaryDir->isValid());
const QString temporaryAudioPath = m_temporaryDir->path() + slash;
- for (const QAudioFormat &format : qAsConst(testFormats)) {
+ for (const QAudioFormat &format : std::as_const(testFormats)) {
const QString fileName = temporaryAudioPath + formatToFileName(format) + QStringLiteral(".wav");
audioFiles.append(FilePtr::create(fileName));
}