3 files changed, 18 insertions, 14 deletions
diff --git a/src/multimedia/audio/qaudiodevicefactory.cpp b/src/multimedia/audio/qaudiodevicefactory.cpp
index 19fa05e6e..bff3d6c37 100644
--- a/src/multimedia/audio/qaudiodevicefactory.cpp
+++ b/src/multimedia/audio/qaudiodevicefactory.cpp
@@ -119,10 +119,12 @@ QList<QAudioDeviceInfo> QAudioDeviceFactory::availableDevices(QAudio::Mode mode)
     QList<QAudioDeviceInfo> devices;
 #if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
     QMediaPluginLoader* l = audioLoader();
-    foreach (const QString& key, l->keys()) {
+    const auto keys = l->keys();
+    for (const QString& key : keys) {
         QAudioSystemFactoryInterface* plugin = qobject_cast<QAudioSystemFactoryInterface*>(l->instance(key));
         if (plugin) {
-            foreach (QByteArray const& handle, plugin->availableDevices(mode))
+            const auto availableDevices = plugin->availableDevices(mode);
+            for (const QByteArray& handle : availableDevices)
                 devices << QAudioDeviceInfo(key, handle, mode);
         }
     }
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp
index 33e198164..8cc32ac9b 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo.cpp
@@ -297,7 +297,7 @@ QAudioFormat QAudioDeviceInfo::nearestFormat(const QAudioFormat &settings) const
     if (sampleSizesAvailable.contains(settings.sampleSize()))
         testSampleSizes.insert(0,settings.sampleSize());
     sampleSizesAvailable.removeAll(settings.sampleSize());
-    foreach (int size, sampleSizesAvailable) {
+    for (int size : qAsConst(sampleSizesAvailable)) {
         int larger  = (size > settings.sampleSize()) ? size : settings.sampleSize();
         int smaller = (size > settings.sampleSize()) ? settings.sampleSize() : size;
         bool isMultiple = ( 0 == (larger % smaller));
@@ -307,7 +307,7 @@ QAudioFormat QAudioDeviceInfo::nearestFormat(const QAudioFormat &settings) const
     if (sampleRatesAvailable.contains(settings.sampleRate()))
         testSampleRates.insert(0,settings.sampleRate());
     sampleRatesAvailable.removeAll(settings.sampleRate());
-    foreach (int sampleRate, sampleRatesAvailable) {
+    for (int sampleRate : qAsConst(sampleRatesAvailable)) {
         int larger  = (sampleRate > settings.sampleRate()) ? sampleRate : settings.sampleRate();
         int smaller = (sampleRate > settings.sampleRate()) ? settings.sampleRate() : sampleRate;
         bool isMultiple = ( 0 == (larger % smaller));
@@ -316,17 +316,17 @@ QAudioFormat QAudioDeviceInfo::nearestFormat(const QAudioFormat &settings) const
     }
 
     // Try to find nearest
-    foreach (QString codec, testCodecs) {
+    for (const QString &codec : qAsConst(testCodecs)) {
         nearest.setCodec(codec);
-        foreach (QAudioFormat::Endian order, testByteOrders) {
+        for (QAudioFormat::Endian order : qAsConst(testByteOrders)) {
             nearest.setByteOrder(order);
-            foreach (QAudioFormat::SampleType sample, testSampleTypes) {
+            for (QAudioFormat::SampleType sample : qAsConst(testSampleTypes)) {
                 nearest.setSampleType(sample);
                 QMapIterator<int, int> sz(testSampleSizes);
                 while (sz.hasNext()) {
                     sz.next();
                     nearest.setSampleSize(sz.value());
-                    foreach (int channel, testChannels) {
+                    for (int channel : qAsConst(testChannels)) {
                         nearest.setChannelCount(channel);
                         QMapIterator<int, int> i(testSampleRates);
                         while (i.hasNext()) {
diff --git a/src/multimedia/audio/qsamplecache_p.cpp b/src/multimedia/audio/qsamplecache_p.cpp
index 8043b770c..23c970405 100644
--- a/src/multimedia/audio/qsamplecache_p.cpp
+++ b/src/multimedia/audio/qsamplecache_p.cpp
@@ -119,11 +119,12 @@ QSampleCache::~QSampleCache()
     // Killing the loading thread means that no samples can be
     // deleted using deleteLater.  And some samples that had deleteLater
     // already called won't have been processed (m_staleSamples)
-    foreach (QSample* sample, m_samples)
-        delete sample;
+    for (auto it = m_samples.cbegin(), end = m_samples.cend(); it != end; ++it)
+        delete it.value();
 
-    foreach (QSample* sample, m_staleSamples)
-        delete sample; // deleting a sample does affect the m_staleSamples list, but foreach copies it
+    const auto copyStaleSamples = m_staleSamples; //deleting a sample does affect the m_staleSamples list, but we create a copy
+    for (QSample* sample : copyStaleSamples)
+        delete sample;
 
     m_networkAccessManager->deleteLater();
 }
@@ -194,8 +195,9 @@ void QSampleCache::setCapacity(qint64 capacity)
             if (sample->m_ref == 0) {
                 unloadSample(sample);
                 it = m_samples.erase(it);
-            } else
-                it++;
+            } else {
+                ++it;
+            }
         }
     }