Fix remaining -Wclazy-range-loop warnings using a local const var

1 files changed, 21 insertions, 12 deletions

diff --git a/src/soundio/soundmanagerconfig.cpp b/src/soundio/soundmanagerconfig.cpp
index ea24987c90..6e77113c21 100644
--- a/src/soundio/soundmanagerconfig.cpp
+++ b/src/soundio/soundmanagerconfig.cpp
@@ -224,7 +224,8 @@ bool SoundManagerConfig::writeToDisk() const {
     docElement.setAttribute(xmlAttributeDeckCount, m_deckCount);
     doc.appendChild(docElement);
 
-    for (const auto& deviceId: getDevices()) {
+    const QSet<SoundDeviceId> deviceIds = getDevices();
+    for (const auto& deviceId : deviceIds) {
         QDomElement devElement(doc.createElement(xmlElementSoundDevice));
         devElement.setAttribute(xmlAttributeDeviceName, deviceId.name);
         devElement.setAttribute(xmlAttributePortAudioIndex, deviceId.portAudioIndex);
@@ -336,21 +337,29 @@ void SoundManagerConfig::setDeckCount(unsigned int deckCount) {
 void SoundManagerConfig::setCorrectDeckCount(int configuredDeckCount) {
     int minimum_deck_count = 0;
 
-    for (const auto& device: getDevices()) {
-        foreach (AudioInput in, m_inputs.values(device)) {
-            if ((in.getType() == AudioInput::DECK ||
-                 in.getType() == AudioInput::VINYLCONTROL ||
-                 in.getType() == AudioInput::AUXILIARY) &&
-                in.getIndex() + 1 > minimum_deck_count) {
+    const QSet<SoundDeviceId> deviceIds = getDevices();
+    for (const auto& deviceId : deviceIds) {
+        for (auto it = m_inputs.constFind(deviceId);
+                it != m_inputs.constEnd() && it.key() == deviceId;
+                ++it) {
+            const int index = it.value().getIndex();
+            const AudioPathType type = it.value().getType();
+            if ((type == AudioInput::DECK ||
+                        type == AudioInput::VINYLCONTROL ||
+                        type == AudioInput::AUXILIARY) &&
+                    index + 1 > minimum_deck_count) {
                 qDebug() << "Found an input connection above current deck count";
-                minimum_deck_count = in.getIndex() + 1;
+                minimum_deck_count = index + 1;
             }
         }
-        foreach (AudioOutput out, m_outputs.values(device)) {
-            if (out.getType() == AudioOutput::DECK &&
-                    out.getIndex() + 1 > minimum_deck_count) {
+        for (auto it = m_outputs.constFind(deviceId);
+                it != m_outputs.constEnd() && it.key() == deviceId;
+                ++it) {
+            const int index = it.value().getIndex();
+            const AudioPathType type = it.value().getType();
+            if (type == AudioOutput::DECK && index + 1 > minimum_deck_count) {
                 qDebug() << "Found an output connection above current deck count";
-                minimum_deck_count = out.getIndex() + 1;
+                minimum_deck_count = index + 1;
             }
         }
     }