From 6f85cfdb2f153302948d53dbe4d826a9d118d57f Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Sat, 15 Mar 2014 23:00:03 -0700
Subject: [PATCH] more warnings fixes

---
 assignment-client/src/octree/OctreeQueryNode.h    | 6 +++---
 assignment-client/src/octree/OctreeSendThread.cpp | 2 +-
 libraries/octree/src/OctreePacketData.h           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assignment-client/src/octree/OctreeQueryNode.h b/assignment-client/src/octree/OctreeQueryNode.h
index 6d4dee300a..29fdea0da2 100644
--- a/assignment-client/src/octree/OctreeQueryNode.h
+++ b/assignment-client/src/octree/OctreeQueryNode.h
@@ -34,13 +34,13 @@ public:
     void writeToPacket(const unsigned char* buffer, int bytes); // writes to end of packet
 
     const unsigned char* getPacket() const { return _octreePacket; }
-    int getPacketLength() const { return (MAX_PACKET_SIZE - _octreePacketAvailableBytes); }
+    unsigned int getPacketLength() const { return (MAX_PACKET_SIZE - _octreePacketAvailableBytes); }
     bool isPacketWaiting() const { return _octreePacketWaiting; }
 
     bool packetIsDuplicate() const;
     bool shouldSuppressDuplicatePacket();
 
-    int getAvailable() const { return _octreePacketAvailableBytes; }
+    unsigned int getAvailable() const { return _octreePacketAvailableBytes; }
     int getMaxSearchLevel() const { return _maxSearchLevel; }
     void resetMaxSearchLevel() { _maxSearchLevel = 1; }
     void incrementMaxSearchLevel() { _maxSearchLevel++; }
@@ -92,7 +92,7 @@ private:
     bool _viewSent;
     unsigned char* _octreePacket;
     unsigned char* _octreePacketAt;
-    int _octreePacketAvailableBytes;
+    unsigned int _octreePacketAvailableBytes;
     bool _octreePacketWaiting;
 
     unsigned char* _lastOctreePacket;
diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp
index 09ebb99298..35e9869910 100644
--- a/assignment-client/src/octree/OctreeSendThread.cpp
+++ b/assignment-client/src/octree/OctreeSendThread.cpp
@@ -506,7 +506,7 @@ int OctreeSendThread::packetDistributor(const SharedNodePointer& node, OctreeQue
                     }
 
                     if (forceDebugging || (_myServer->wantsDebugSending() && _myServer->wantsVerboseDebug())) {
-                        qDebug(">>>>>> calling writeToPacket() available=%d compressedSize=%d uncompressedSize=%d target=%d",
+                        qDebug(">>>>>> calling writeToPacket() available=%d compressedSize=%d uncompressedSize=%d target=%lu",
                                 nodeData->getAvailable(), _packetData.getFinalizedSize(),
                                 _packetData.getUncompressedSize(), _packetData.getTargetSize());
                     }
diff --git a/libraries/octree/src/OctreePacketData.h b/libraries/octree/src/OctreePacketData.h
index 526cb7c65e..245f0668cd 100644
--- a/libraries/octree/src/OctreePacketData.h
+++ b/libraries/octree/src/OctreePacketData.h
@@ -168,7 +168,7 @@ public:
     bool isCompressed() const { return _enableCompression; }
     
     /// returns the target uncompressed size
-    int getTargetSize() const { return _targetSize; }
+    size_t getTargetSize() const { return _targetSize; }
 
     /// displays contents for debugging
     void debugContent();