From 3f3632564254fc5c1a164cfe04eb02a74aed739d Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Tue, 17 Jun 2014 11:59:37 -0700
Subject: [PATCH] remove warnings about signed/unsigned comparison

---
 assignment-client/src/audio/AudioMixer.cpp           |  2 +-
 assignment-client/src/audio/AudioMixerClientData.cpp | 10 +++++-----
 domain-server/src/DomainServer.cpp                   |  2 +-
 libraries/audio/src/Sound.cpp                        |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index b3909660e2..d96fce450a 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -335,7 +335,7 @@ void AudioMixer::prepareMixForListeningNode(Node* node) {
             AudioMixerClientData* otherNodeClientData = (AudioMixerClientData*) otherNode->getLinkedData();
 
             // enumerate the ARBs attached to the otherNode and add all that should be added to mix
-            for (unsigned int i = 0; i < otherNodeClientData->getRingBuffers().size(); i++) {
+            for (int i = 0; i < otherNodeClientData->getRingBuffers().size(); i++) {
                 PositionalAudioRingBuffer* otherNodeBuffer = otherNodeClientData->getRingBuffers()[i];
 
                 if ((*otherNode != *node
diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp
index 7fb2a7dcab..9494e927a9 100644
--- a/assignment-client/src/audio/AudioMixerClientData.cpp
+++ b/assignment-client/src/audio/AudioMixerClientData.cpp
@@ -25,14 +25,14 @@ AudioMixerClientData::AudioMixerClientData() :
 }
 
 AudioMixerClientData::~AudioMixerClientData() {
-    for (unsigned int i = 0; i < _ringBuffers.size(); i++) {
+    for (int i = 0; i < _ringBuffers.size(); i++) {
         // delete this attached PositionalAudioRingBuffer
         delete _ringBuffers[i];
     }
 }
 
 AvatarAudioRingBuffer* AudioMixerClientData::getAvatarAudioRingBuffer() const {
-    for (unsigned int i = 0; i < _ringBuffers.size(); i++) {
+    for (int i = 0; i < _ringBuffers.size(); i++) {
         if (_ringBuffers[i]->getType() == PositionalAudioRingBuffer::Microphone) {
             return (AvatarAudioRingBuffer*) _ringBuffers[i];
         }
@@ -79,7 +79,7 @@ int AudioMixerClientData::parseData(const QByteArray& packet) {
 
         InjectedAudioRingBuffer* matchingInjectedRingBuffer = NULL;
 
-        for (unsigned int i = 0; i < _ringBuffers.size(); i++) {
+        for (int i = 0; i < _ringBuffers.size(); i++) {
             if (_ringBuffers[i]->getType() == PositionalAudioRingBuffer::Injector
                 && ((InjectedAudioRingBuffer*) _ringBuffers[i])->getStreamIdentifier() == streamIdentifier) {
                 matchingInjectedRingBuffer = (InjectedAudioRingBuffer*) _ringBuffers[i];
@@ -99,7 +99,7 @@ int AudioMixerClientData::parseData(const QByteArray& packet) {
 }
 
 void AudioMixerClientData::checkBuffersBeforeFrameSend(int jitterBufferLengthSamples) {
-    for (unsigned int i = 0; i < _ringBuffers.size(); i++) {
+    for (int i = 0; i < _ringBuffers.size(); i++) {
         if (_ringBuffers[i]->shouldBeAddedToMix(jitterBufferLengthSamples)) {
             // this is a ring buffer that is ready to go
             // set its flag so we know to push its buffer when all is said and done
@@ -113,7 +113,7 @@ void AudioMixerClientData::checkBuffersBeforeFrameSend(int jitterBufferLengthSam
 }
 
 void AudioMixerClientData::pushBuffersAfterFrameSend() {
-    for (unsigned int i = 0; i < _ringBuffers.size(); i++) {
+    for (int i = 0; i < _ringBuffers.size(); i++) {
         // this was a used buffer, push the output pointer forwards
         PositionalAudioRingBuffer* audioBuffer = _ringBuffers[i];
 
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index f7185063a9..d55a9b52ca 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -659,7 +659,7 @@ void DomainServer::readAvailableDatagrams() {
                 wasNoisyTimerStarted = true;
             }
 
-            const quint64 NOISY_MESSAGE_INTERVAL_MSECS = 5 * 1000;
+            const qint64 NOISY_MESSAGE_INTERVAL_MSECS = 5 * 1000;
 
             if (requestAssignment.getType() != Assignment::AgentType
                 || noisyMessageTimer.elapsed() > NOISY_MESSAGE_INTERVAL_MSECS) {
diff --git a/libraries/audio/src/Sound.cpp b/libraries/audio/src/Sound.cpp
index 9bc78f2303..7ef3afdf29 100644
--- a/libraries/audio/src/Sound.cpp
+++ b/libraries/audio/src/Sound.cpp
@@ -258,7 +258,7 @@ void Sound::interpretAsWav(const QByteArray& inputAudioByteArray, QByteArray& ou
         // Now pull out the data
         quint32 outputAudioByteArraySize = qFromLittleEndian<quint32>(dataHeader.descriptor.size);
         outputAudioByteArray.resize(outputAudioByteArraySize);
-        if (waveStream.readRawData(outputAudioByteArray.data(), outputAudioByteArraySize) != outputAudioByteArraySize) {
+        if (waveStream.readRawData(outputAudioByteArray.data(), outputAudioByteArraySize) != (int)outputAudioByteArraySize) {
             qDebug() << "Error reading WAV file";
         }