From f1453e0f51cf60773eddc37d9451375e806bf4ce Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Fri, 15 Jan 2016 10:48:05 +0300 Subject: imports: replace foreach with range-based for Change-Id: I495438c99337b9423b0a589c1c8d8171d20b0cff Reviewed-by: Yoann Lopes --- src/imports/audioengine/qdeclarative_audioengine_p.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/imports/audioengine/qdeclarative_audioengine_p.cpp') diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.cpp b/src/imports/audioengine/qdeclarative_audioengine_p.cpp index dd80c698d..78e759be2 100644 --- a/src/imports/audioengine/qdeclarative_audioengine_p.cpp +++ b/src/imports/audioengine/qdeclarative_audioengine_p.cpp @@ -247,7 +247,8 @@ void QDeclarativeAudioEngine::initSound(QDeclarativeSound *sound) } sound->setAttenuationModelObject(attenuationModel); - foreach (QDeclarativePlayVariation *playVariation, sound->playlist()) { + const auto playList = sound->playlist(); + for (QDeclarativePlayVariation *playVariation : playList) { if (m_samples.contains(playVariation->sample())) { playVariation->setSampleObject( qobject_cast( @@ -454,7 +455,8 @@ void QDeclarativeAudioEngine::componentComplete() #ifdef DEBUG_AUDIOENGINE qDebug() << "init samples" << m_samples.keys().count(); #endif - foreach (const QString& key, m_samples.keys()) { + const auto samplesKeys = m_samples.keys(); + for (const QString& key : samplesKeys) { QDeclarativeAudioSample *sample = qobject_cast( qvariant_cast(m_samples[key])); if (!sample) { @@ -468,7 +470,8 @@ void QDeclarativeAudioEngine::componentComplete() #ifdef DEBUG_AUDIOENGINE qDebug() << "init sounds" << m_sounds.keys().count(); #endif - foreach (const QString& key, m_sounds.keys()) { + const auto soundsKeys = m_sounds.keys(); + for (const QString& key : soundsKeys) { QDeclarativeSound *sound = qobject_cast( qvariant_cast(m_sounds[key])); @@ -504,7 +507,7 @@ void QDeclarativeAudioEngine::updateSoundInstances() } QVector3D listenerPosition = this->listener()->position(); - foreach (QSoundInstance *instance, m_activeSoundInstances) { + for (QSoundInstance *instance : qAsConst(m_activeSoundInstances)) { if (instance->state() == QSoundInstance::PlayingState && instance->attenuationEnabled()) { instance->update3DVolume(listenerPosition); -- cgit v1.2.3