From 6fb313cc435374f5d102836177daac812349bd6f Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Wed, 12 Mar 2014 13:03:59 -0700
Subject: [PATCH] Allow streaming uints.

---
 libraries/metavoxels/src/AttributeRegistry.h |  2 +-
 libraries/metavoxels/src/Bitstream.cpp       | 12 ++++++++++++
 libraries/metavoxels/src/Bitstream.h         |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/libraries/metavoxels/src/AttributeRegistry.h b/libraries/metavoxels/src/AttributeRegistry.h
index 16968da1b2..b6a415bef7 100644
--- a/libraries/metavoxels/src/AttributeRegistry.h
+++ b/libraries/metavoxels/src/AttributeRegistry.h
@@ -265,7 +265,7 @@ template<class T, int bits> inline bool SimpleInlineAttribute<T, bits>::merge(vo
 /// Provides appropriate averaging for RGBA values.
 class QRgbAttribute : public InlineAttribute<QRgb> {
     Q_OBJECT
-    Q_PROPERTY(unsigned int defaultValue MEMBER _defaultValue)
+    Q_PROPERTY(uint defaultValue MEMBER _defaultValue)
 
 public:
     
diff --git a/libraries/metavoxels/src/Bitstream.cpp b/libraries/metavoxels/src/Bitstream.cpp
index 0af44eaae6..f80ef3aa28 100644
--- a/libraries/metavoxels/src/Bitstream.cpp
+++ b/libraries/metavoxels/src/Bitstream.cpp
@@ -23,6 +23,7 @@
 
 REGISTER_SIMPLE_TYPE_STREAMER(bool)
 REGISTER_SIMPLE_TYPE_STREAMER(int)
+REGISTER_SIMPLE_TYPE_STREAMER(uint)
 REGISTER_SIMPLE_TYPE_STREAMER(float)
 REGISTER_SIMPLE_TYPE_STREAMER(QByteArray)
 REGISTER_SIMPLE_TYPE_STREAMER(QColor)
@@ -238,6 +239,17 @@ Bitstream& Bitstream::operator>>(int& value) {
     return *this;
 }
 
+Bitstream& Bitstream::operator<<(uint value) {
+    return write(&value, 32);
+}
+
+Bitstream& Bitstream::operator>>(uint& value) {
+    quint32 sizedValue;
+    read(&sizedValue, 32);
+    value = sizedValue;
+    return *this;
+}
+
 Bitstream& Bitstream::operator<<(float value) {
     return write(&value, 32);
 }
diff --git a/libraries/metavoxels/src/Bitstream.h b/libraries/metavoxels/src/Bitstream.h
index 297d265d97..ca26509d60 100644
--- a/libraries/metavoxels/src/Bitstream.h
+++ b/libraries/metavoxels/src/Bitstream.h
@@ -254,6 +254,9 @@ public:
     Bitstream& operator<<(int value);
     Bitstream& operator>>(int& value);
     
+    Bitstream& operator<<(uint value);
+    Bitstream& operator>>(uint& value);
+    
     Bitstream& operator<<(float value);
     Bitstream& operator>>(float& value);