From 07b30da2ace1112a3e30cb9b801b824ba70e4252 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 8 Jan 2015 13:44:51 -0800
Subject: [PATCH] Fix miscellaneous types and casts

---
 assignment-client/src/audio/AudioMixer.cpp | 2 +-
 libraries/audio/src/AudioConstants.h       | 4 ++--
 libraries/metavoxels/src/Spanner.cpp       | 6 +++---
 tests/octree/src/OctreeTests.cpp           | 2 +-
 tools/scribe/src/TextTemplate.cpp          | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 0311f8562b..6b646c1dad 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -60,7 +60,7 @@
 #include "AudioMixer.h"
 
 const float LOUDNESS_TO_DISTANCE_RATIO = 0.00001f;
-const float DEFAULT_ATTENUATION_PER_DOUBLING_IN_DISTANCE = 0.18;
+const float DEFAULT_ATTENUATION_PER_DOUBLING_IN_DISTANCE = 0.18f;
 const float DEFAULT_NOISE_MUTING_THRESHOLD = 0.003f;
 const QString AUDIO_MIXER_LOGGING_TARGET_NAME = "audio-mixer";
 const QString AUDIO_ENV_GROUP_KEY = "audio_env";
diff --git a/libraries/audio/src/AudioConstants.h b/libraries/audio/src/AudioConstants.h
index 91d6db38f7..1c6cac71b6 100644
--- a/libraries/audio/src/AudioConstants.h
+++ b/libraries/audio/src/AudioConstants.h
@@ -26,8 +26,8 @@ namespace AudioConstants {
     const int NETWORK_FRAME_BYTES_PER_CHANNEL = 512;
     const int NETWORK_FRAME_SAMPLES_PER_CHANNEL = NETWORK_FRAME_BYTES_PER_CHANNEL / sizeof(AudioSample);
     const float NETWORK_FRAME_MSECS = (AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL
-        / (float) AudioConstants::SAMPLE_RATE) * 1000.0;
-    const unsigned int NETWORK_FRAME_USECS = floorf(NETWORK_FRAME_MSECS * 1000.0);
+        / (float)AudioConstants::SAMPLE_RATE) * 1000.0f;
+    const unsigned int NETWORK_FRAME_USECS = (int)floorf(NETWORK_FRAME_MSECS * 1000.0f);
     const int MIN_SAMPLE_VALUE = std::numeric_limits<AudioSample>::min();
     const int MAX_SAMPLE_VALUE = std::numeric_limits<AudioSample>::max();
 }
diff --git a/libraries/metavoxels/src/Spanner.cpp b/libraries/metavoxels/src/Spanner.cpp
index 956dc45729..044c742347 100644
--- a/libraries/metavoxels/src/Spanner.cpp
+++ b/libraries/metavoxels/src/Spanner.cpp
@@ -1529,7 +1529,7 @@ HeightfieldNode* HeightfieldNode::paintMaterial(const glm::vec3& position, const
         colorContents = _color->getContents();
         
     } else {
-        colorContents = QByteArray(baseWidth * baseHeight * DataBlock::COLOR_BYTES, 0xFF); 
+        colorContents = QByteArray(baseWidth * baseHeight * DataBlock::COLOR_BYTES, 0xFFu); 
     }
     
     int materialWidth = baseWidth, materialHeight = baseHeight;
@@ -1885,7 +1885,7 @@ HeightfieldNode* HeightfieldNode::clearAndFetchHeight(const glm::vec3& translati
         spanner->setHeight(HeightfieldHeightPointer(new HeightfieldHeight(spannerHeightWidth,
             QVector<quint16>(spannerHeightWidth * spannerHeightHeight))));
         spanner->setColor(HeightfieldColorPointer(new HeightfieldColor(spannerColorWidth,
-            QByteArray(spannerColorWidth * spannerColorHeight * DataBlock::COLOR_BYTES, 0xFF))));
+            QByteArray(spannerColorWidth * spannerColorHeight * DataBlock::COLOR_BYTES, 0xFFu))));
         spanner->setMaterial(HeightfieldMaterialPointer(new HeightfieldMaterial(spannerMaterialWidth,
             QByteArray(spannerMaterialWidth * spannerMaterialHeight, 0), QVector<SharedObjectPointer>())));
     }
@@ -2358,7 +2358,7 @@ void HeightfieldNode::mergeChildren(bool height, bool colorMaterial) {
         return;
     }
     if (colorWidth > 0) {
-        QByteArray colorContents(colorWidth * colorHeight * DataBlock::COLOR_BYTES, 0xFF);
+        QByteArray colorContents(colorWidth * colorHeight * DataBlock::COLOR_BYTES, 0xFFu);
         for (int i = 0; i < CHILD_COUNT; i++) {
             HeightfieldColorPointer childColor = _children[i]->getColor();
             if (!childColor) {
diff --git a/tests/octree/src/OctreeTests.cpp b/tests/octree/src/OctreeTests.cpp
index 05d6cb593d..4380ea13f6 100644
--- a/tests/octree/src/OctreeTests.cpp
+++ b/tests/octree/src/OctreeTests.cpp
@@ -802,7 +802,7 @@ void OctreeTests::propertyFlagsTests(bool verbose) {
             qDebug() << "fill encoded byte array with extra garbage (as if it was bitstream with more content)";
         }
         QByteArray extraContent;
-        extraContent.fill(0xba, 10);
+        extraContent.fill(0xbau, 10);
         encoded.append(extraContent);
 
         if (verbose) {
diff --git a/tools/scribe/src/TextTemplate.cpp b/tools/scribe/src/TextTemplate.cpp
index 5d10e55e3f..752d4a37d8 100755
--- a/tools/scribe/src/TextTemplate.cpp
+++ b/tools/scribe/src/TextTemplate.cpp
@@ -837,7 +837,7 @@ int TextTemplate::evalBlockGeneration(std::ostream& dst, const BlockPointer& blo
             if (block->command.arguments.size()) {
                 // THe actual value of the var defined sneeds to be evaluated:
                 String val;
-                for (int t = 1; t < block->command.arguments.size(); t++) {
+                for (unsigned int t = 1; t < block->command.arguments.size(); t++) {
                     // detect if a param is a var
                     int len = block->command.arguments[t].length();
                     if ((block->command.arguments[t][0] == Tag::VAR)