From 45b4777e6056c9893fc66349128dd02abebfcda8 Mon Sep 17 00:00:00 2001
From: wangyix <wangyix@gmail.com>
Date: Mon, 28 Jul 2014 09:47:40 -0700
Subject: [PATCH] cleaned up QHash iterator code again

---
 assignment-client/src/audio/AudioMixer.cpp           | 4 ++--
 assignment-client/src/audio/AudioMixerClientData.cpp | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index f6b3e5118a..ee823e4310 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -279,8 +279,8 @@ void AudioMixer::prepareMixForListeningNode(Node* node) {
             // enumerate the ARBs attached to the otherNode and add all that should be added to mix
 
             const QHash<QUuid, PositionalAudioRingBuffer*>& otherNodeRingBuffers = otherNodeClientData->getRingBuffers();
-            QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i, end = otherNodeRingBuffers.constEnd();
-            for (i = otherNodeRingBuffers.begin(); i != end; i++) {
+            QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i;
+            for (i = otherNodeRingBuffers.begin(); i != otherNodeRingBuffers.constEnd(); i++) {
                 PositionalAudioRingBuffer* otherNodeBuffer = i.value();
 
                 if ((*otherNode != *node || otherNodeBuffer->shouldLoopbackForNode())
diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp
index 220246b078..d6ff7c6f34 100644
--- a/assignment-client/src/audio/AudioMixerClientData.cpp
+++ b/assignment-client/src/audio/AudioMixerClientData.cpp
@@ -28,8 +28,7 @@ AudioMixerClientData::AudioMixerClientData() :
 
 AudioMixerClientData::~AudioMixerClientData() {
     QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i;
-    QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator end = _ringBuffers.constEnd();
-    for (i = _ringBuffers.constBegin(); i != end; i++) {
+    for (i = _ringBuffers.constBegin(); i != _ringBuffers.constEnd(); i++) {
         // delete this attached InboundAudioStream
         delete i.value();
     }
@@ -101,8 +100,7 @@ int AudioMixerClientData::parseData(const QByteArray& packet) {
 
 void AudioMixerClientData::audioStreamsPopFrameForMixing() {
     QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i;
-    QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator end = _ringBuffers.constEnd();
-    for (i = _ringBuffers.constBegin(); i != end; i++) {
+    for (i = _ringBuffers.constBegin(); i != _ringBuffers.constEnd(); i++) {
         i.value()->popFrames(1);
     }
 }
@@ -227,8 +225,7 @@ QString AudioMixerClientData::getAudioStreamStatsString() const {
     }
     
     QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator i;
-    QHash<QUuid, PositionalAudioRingBuffer*>::ConstIterator end = _ringBuffers.constEnd();
-    for (i = _ringBuffers.constBegin(); i != end; i++) {
+    for (i = _ringBuffers.constBegin(); i != _ringBuffers.constEnd; i++) {
         if (i.value()->getType() == PositionalAudioRingBuffer::Injector) {
             AudioStreamStats streamStats = i.value()->getAudioStreamStats();
             result += " UPSTREAM.inj.desired:" + QString::number(streamStats._ringBufferDesiredJitterBufferFrames)