From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Wed, 8 Jul 2015 14:24:06 +0000 (+0100)
Subject: Remove UNSIGNED_INTEGER property type as it does not fully work and causes headache
X-Git-Tag: dali_1.0.49~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bec8065d4ef872e117e78bdb4eecaec89df4601c;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Remove UNSIGNED_INTEGER property type as it does not fully work and causes headache

Change-Id: I76a5607ed0a16d29029dd968e684f29189bf4ea5
---

diff --git a/automated-tests/src/dali-devel/utc-Dali-Geometry.cpp b/automated-tests/src/dali-devel/utc-Dali-Geometry.cpp
index 4574a29..5bb2278 100644
--- a/automated-tests/src/dali-devel/utc-Dali-Geometry.cpp
+++ b/automated-tests/src/dali-devel/utc-Dali-Geometry.cpp
@@ -67,7 +67,7 @@ PropertyBuffer CreateIndexBuffer()
 {
   unsigned short indexData[6] = { 0, 3, 1, 0, 2, 3 };
   Property::Map indexFormat;
-  indexFormat["indices"] = Property::UNSIGNED_INTEGER; // Should be Unsigned Short
+  indexFormat["indices"] = Property::INTEGER;
   PropertyBuffer indices = PropertyBuffer::New( indexFormat, 3 );
   indices.SetData(indexData);
 
diff --git a/automated-tests/src/dali-devel/utc-Dali-PropertyBuffer.cpp b/automated-tests/src/dali-devel/utc-Dali-PropertyBuffer.cpp
index 9a326c7..d1cdd6c 100644
--- a/automated-tests/src/dali-devel/utc-Dali-PropertyBuffer.cpp
+++ b/automated-tests/src/dali-devel/utc-Dali-PropertyBuffer.cpp
@@ -473,14 +473,14 @@ int UtcDaliPropertyBufferSetGetSize02(void)
   texturedQuadVertexFormat["aPosition"] = Property::VECTOR2;
   texturedQuadVertexFormat["aVertexCoord"] = Property::VECTOR2;
 
-  unsigned int size = 5u;
+  int size = 5u;
   PropertyBuffer propertyBuffer = PropertyBuffer::New( texturedQuadVertexFormat, size );
-  DALI_TEST_EQUALS( propertyBuffer.GetProperty<unsigned int>(PropertyBuffer::Property::SIZE), size, TEST_LOCATION );
+  DALI_TEST_EQUALS( propertyBuffer.GetProperty<int>(PropertyBuffer::Property::SIZE), size, TEST_LOCATION );
   DALI_TEST_EQUALS( propertyBuffer.GetSize(), size, TEST_LOCATION );
 
   size += 3u;
   propertyBuffer.SetSize( size );
-  DALI_TEST_EQUALS( propertyBuffer.GetProperty<unsigned int>(PropertyBuffer::Property::SIZE), size, TEST_LOCATION );
+  DALI_TEST_EQUALS( propertyBuffer.GetProperty<int>(PropertyBuffer::Property::SIZE), size, TEST_LOCATION );
   DALI_TEST_EQUALS( propertyBuffer.GetSize(), size, TEST_LOCATION );
 
   size += 2u;
diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp
index 77d63a0..5a65c6d 100644
--- a/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp
+++ b/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp
@@ -76,7 +76,7 @@ Geometry CreateGeometry()
   // Create indices
   unsigned int indexData[6] = { 0, 3, 1, 0, 2, 3 };
   Property::Map indexFormat;
-  indexFormat["indices"] = Property::UNSIGNED_INTEGER;
+  indexFormat["indices"] = Property::INTEGER;
   PropertyBuffer indices = PropertyBuffer::New( indexFormat, sizeof(indexData)/sizeof(indexData[0]) );
   indices.SetData(indexData);
 
diff --git a/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.cpp b/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.cpp
index facb98e..3fdae8a 100644
--- a/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.cpp
+++ b/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.cpp
@@ -74,7 +74,7 @@ Geometry CreateQuadGeometryFromBuffer( PropertyBuffer vertexData )
 
   unsigned int indexData[6] = { 0, 3, 1, 0, 2, 3 };
   Property::Map indexFormat;
-  indexFormat["indices"] = Property::UNSIGNED_INTEGER;
+  indexFormat["indices"] = Property::INTEGER;
   PropertyBuffer indices = PropertyBuffer::New( indexFormat, sizeof(indexData)/sizeof(indexData[0]) );
   indices.SetData(indexData);
 
diff --git a/automated-tests/src/dali/utc-Dali-Animation.cpp b/automated-tests/src/dali/utc-Dali-Animation.cpp
index 7397d92..25f5235 100644
--- a/automated-tests/src/dali/utc-Dali-Animation.cpp
+++ b/automated-tests/src/dali/utc-Dali-Animation.cpp
@@ -8882,21 +8882,21 @@ int UtcDaliAnimationExtendDurationP(void)
   END_TEST;
 }
 
-int UtcDaliAnimationCustomUnsignedIntProperty(void)
+int UtcDaliAnimationCustomIntProperty(void)
 {
   TestApplication application;
 
   Actor actor = Actor::New();
   Stage::GetCurrent().Add(actor);
-  unsigned int startValue(0u);
+  int startValue(0u);
 
   Property::Index index = actor.RegisterProperty("an-index", startValue);
-  DALI_TEST_EQUALS( actor.GetProperty<unsigned int>(index), startValue, TEST_LOCATION );
+  DALI_TEST_EQUALS( actor.GetProperty<int>(index), startValue, TEST_LOCATION );
 
   // Build the animation
   float durationSeconds(1.0f);
   Animation animation = Animation::New(durationSeconds);
-  animation.AnimateTo( Property(actor, index), 20u );
+  animation.AnimateTo( Property(actor, index), 20 );
 
   // Start the animation
   animation.Play();
@@ -8911,7 +8911,7 @@ int UtcDaliAnimationCustomUnsignedIntProperty(void)
   // We didn't expect the animation to finish yet
   application.SendNotification();
   finishCheck.CheckSignalNotReceived();
-  DALI_TEST_EQUALS( actor.GetProperty<unsigned int>(index), 10u, TEST_LOCATION );
+  DALI_TEST_EQUALS( actor.GetProperty<int>(index), 10, TEST_LOCATION );
 
   application.SendNotification();
   application.Render(static_cast<unsigned int>(durationSeconds*500.0f) + 1u/*just beyond the animation duration*/);
@@ -8919,7 +8919,7 @@ int UtcDaliAnimationCustomUnsignedIntProperty(void)
   // We did expect the animation to finish
   application.SendNotification();
   finishCheck.CheckSignalReceived();
-  DALI_TEST_EQUALS( actor.GetProperty<unsigned int>(index), 20u, TEST_LOCATION );
+  DALI_TEST_EQUALS( actor.GetProperty<int>(index), 20, TEST_LOCATION );
   END_TEST;
 }
 
diff --git a/automated-tests/src/dali/utc-Dali-Constraint.cpp b/automated-tests/src/dali/utc-Dali-Constraint.cpp
index 02818eb..84af54d 100644
--- a/automated-tests/src/dali/utc-Dali-Constraint.cpp
+++ b/automated-tests/src/dali/utc-Dali-Constraint.cpp
@@ -1202,22 +1202,5 @@ int UtcDaliConstraintTestPropertyTypesP(void)
   END_TEST;
 }
 
-int UtcDaliConstraintTestPropertyTypesN(void)
-{
-  // unsigned int not supported so we should assert
-
-  try
-  {
-    TestPropertyTypes::Execute< unsigned int >( 0u );
-    DALI_TEST_CHECK( false ); // Should not come here
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( true );
-  }
-
-
-  END_TEST;
-}
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/automated-tests/src/dali/utc-Dali-Constraints.cpp b/automated-tests/src/dali/utc-Dali-Constraints.cpp
index a3f9bb2..06c8a2e 100644
--- a/automated-tests/src/dali/utc-Dali-Constraints.cpp
+++ b/automated-tests/src/dali/utc-Dali-Constraints.cpp
@@ -47,7 +47,6 @@ public:
   static const bool BOOLEAN_VALUE;
   static const float FLOAT_VALUE;
   static const int INTEGER_VALUE;
-  static const unsigned int UNSIGNED_INTEGER_VALUE;
   static const Vector2 VECTOR2_VALUE;
   static const Vector3 VECTOR3_VALUE;
   static const Vector4 VECTOR4_VALUE;
@@ -66,7 +65,6 @@ public:
   virtual const bool& GetBoolean() const                 { return BOOLEAN_VALUE;          }
   virtual const float& GetFloat() const                  { return FLOAT_VALUE;            }
   virtual const int& GetInteger() const                  { return INTEGER_VALUE;          }
-  virtual const unsigned int& GetUnsignedInteger() const { return UNSIGNED_INTEGER_VALUE; }
   virtual const Vector2& GetVector2() const              { return VECTOR2_VALUE;          }
   virtual const Vector3& GetVector3() const              { return VECTOR3_VALUE;          }
   virtual const Vector4& GetVector4() const              { return VECTOR4_VALUE;          }
@@ -81,7 +79,6 @@ public:
 const bool PropertyInputImpl::BOOLEAN_VALUE                  = true;
 const float PropertyInputImpl::FLOAT_VALUE                   = 123.0f;
 const int PropertyInputImpl::INTEGER_VALUE                   = 456;
-const unsigned int PropertyInputImpl::UNSIGNED_INTEGER_VALUE = 789u;
 const Vector2 PropertyInputImpl::VECTOR2_VALUE               = Vector2( 10.0f, 20.0f );
 const Vector3 PropertyInputImpl::VECTOR3_VALUE               = Vector3( 30.0f, 40.0f, 50.0f );
 const Vector4 PropertyInputImpl::VECTOR4_VALUE               = Vector4( 60.0f, 70.0f, 80.0f, 90.0f );
diff --git a/automated-tests/src/dali/utc-Dali-Handle.cpp b/automated-tests/src/dali/utc-Dali-Handle.cpp
index 6727ae1..b0cd8cf 100644
--- a/automated-tests/src/dali/utc-Dali-Handle.cpp
+++ b/automated-tests/src/dali/utc-Dali-Handle.cpp
@@ -343,7 +343,6 @@ int UtcDaliHandleGetPropertyType(void)
 {
   tet_infoline("Positive Test Dali::Handle::GetPropertyType()");
   TestApplication application;
-  unsigned int unsingedIntTest = 33;
 
   Actor actor = Actor::New();
   DALI_TEST_CHECK( Property::VECTOR3  == actor.GetPropertyType( Actor::Property::PARENT_ORIGIN ) );
@@ -359,7 +358,6 @@ int UtcDaliHandleGetPropertyType(void)
   Property::Index boolIndex     = actor.RegisterProperty( "bool-property",     bool(true) );
   Property::Index floatIndex    = actor.RegisterProperty( "float-property",    float(123.0f) );
   Property::Index intIndex      = actor.RegisterProperty( "int-property",      123 );
-  Property::Index unsignedIntIndex = actor.RegisterProperty( "unsigned-int-property", 456u );
   Property::Index vector2Index  = actor.RegisterProperty( "vector2-property",  Vector2(1.0f, 2.0f) );
   Property::Index vector3Index  = actor.RegisterProperty( "vector3-property",  Vector3(1.0f, 2.0f, 3.0f) );
   Property::Index vector4Index  = actor.RegisterProperty( "vector4-property",  Vector4(1.0f, 2.0f, 3.0f, 4.0f) );
@@ -368,7 +366,6 @@ int UtcDaliHandleGetPropertyType(void)
   DALI_TEST_CHECK( Property::BOOLEAN  == actor.GetPropertyType( boolIndex ) );
   DALI_TEST_CHECK( Property::FLOAT    == actor.GetPropertyType( floatIndex ) );
   DALI_TEST_CHECK( Property::INTEGER  == actor.GetPropertyType( intIndex ) );
-  DALI_TEST_CHECK( Property::UNSIGNED_INTEGER  == actor.GetPropertyType( unsignedIntIndex ) );
   DALI_TEST_CHECK( Property::VECTOR2  == actor.GetPropertyType( vector2Index ) );
   DALI_TEST_CHECK( Property::VECTOR3  == actor.GetPropertyType( vector3Index ) );
   DALI_TEST_CHECK( Property::VECTOR4  == actor.GetPropertyType( vector4Index ) );
@@ -382,7 +379,6 @@ int UtcDaliHandleGetPropertyType(void)
   Property::Index nonAnimBooleanIndex = actor.RegisterProperty( "bool", true, Property::READ_WRITE);
   Property::Index nonAnimFloatIndex = actor.RegisterProperty( "float", 0.f, Property::READ_WRITE);
   Property::Index nonAnimIntegerIndex = actor.RegisterProperty( "int", 0, Property::READ_WRITE);
-  Property::Index nonAnimUnsignedIntIndex = actor.RegisterProperty( "unsinged-int", unsingedIntTest, Property::READ_WRITE);
 
   DALI_TEST_CHECK( nonAnimStringIndex  != Property::INVALID_INDEX );
   DALI_TEST_CHECK( nonAnimV2Index      != Property::INVALID_INDEX );
@@ -391,7 +387,6 @@ int UtcDaliHandleGetPropertyType(void)
   DALI_TEST_CHECK( nonAnimBooleanIndex != Property::INVALID_INDEX );
   DALI_TEST_CHECK( nonAnimFloatIndex   != Property::INVALID_INDEX );
   DALI_TEST_CHECK( nonAnimIntegerIndex != Property::INVALID_INDEX );
-  DALI_TEST_CHECK( nonAnimUnsignedIntIndex != Property::INVALID_INDEX );
 
   DALI_TEST_CHECK( Property::STRING   == actor.GetPropertyType( nonAnimStringIndex ) );
   DALI_TEST_CHECK( Property::VECTOR2  == actor.GetPropertyType( nonAnimV2Index ) );
@@ -400,7 +395,6 @@ int UtcDaliHandleGetPropertyType(void)
   DALI_TEST_CHECK( Property::BOOLEAN  == actor.GetPropertyType( nonAnimBooleanIndex ) );
   DALI_TEST_CHECK( Property::FLOAT    == actor.GetPropertyType( nonAnimFloatIndex ) );
   DALI_TEST_CHECK( Property::INTEGER  == actor.GetPropertyType( nonAnimIntegerIndex ) );
-  DALI_TEST_CHECK( Property::UNSIGNED_INTEGER == actor.GetPropertyType( nonAnimUnsignedIntIndex ) );
 
   DALI_TEST_CHECK( !actor.IsPropertyAnimatable( nonAnimStringIndex ) );
   DALI_TEST_CHECK( !actor.IsPropertyAnimatable( nonAnimV2Index ) );
@@ -409,7 +403,6 @@ int UtcDaliHandleGetPropertyType(void)
   DALI_TEST_CHECK( !actor.IsPropertyAnimatable( nonAnimBooleanIndex ) );
   DALI_TEST_CHECK( !actor.IsPropertyAnimatable( nonAnimFloatIndex ) );
   DALI_TEST_CHECK( !actor.IsPropertyAnimatable( nonAnimIntegerIndex ) );
-  DALI_TEST_CHECK( !actor.IsPropertyAnimatable( nonAnimUnsignedIntIndex ) );
 
   DALI_TEST_EQUALS( "yes" , actor.GetProperty( nonAnimStringIndex ).Get<std::string>(), TEST_LOCATION );
   DALI_TEST_EQUALS( Vector2(1.f, 2.f) , actor.GetProperty( nonAnimV2Index ).Get<Vector2>(), TEST_LOCATION );
@@ -418,7 +411,6 @@ int UtcDaliHandleGetPropertyType(void)
   DALI_TEST_EQUALS( true, actor.GetProperty( nonAnimBooleanIndex ).Get<bool>(), TEST_LOCATION );
   DALI_TEST_EQUALS( 0.f, actor.GetProperty( nonAnimFloatIndex ).Get<float>(), TEST_LOCATION );
   DALI_TEST_EQUALS( 0, actor.GetProperty( nonAnimIntegerIndex ).Get<int>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( unsingedIntTest, actor.GetProperty( nonAnimUnsignedIntIndex ).Get<unsigned int>(), TEST_LOCATION );
 
   END_TEST;
 }
@@ -698,7 +690,6 @@ int UtcDaliHandleRegisterPropertyTypes(void)
     { "Property::BOOLEAN",          true,              true  },
     { "Property::FLOAT",            1.0f,              true  },
     { "Property::INTEGER",          1,                 true  },
-    { "Property::UNSIGNED_INTEGER", 1u,                true  },
     { "Property::VECTOR2",          Vector2::ONE,      true  },
     { "Property::VECTOR3",          Vector3::ONE,      true  },
     { "Property::VECTOR4",          Vector4::ONE,      true  },
diff --git a/automated-tests/src/dali/utc-Dali-PropertyTypes.cpp b/automated-tests/src/dali/utc-Dali-PropertyTypes.cpp
index 2064909..c5b6252 100644
--- a/automated-tests/src/dali/utc-Dali-PropertyTypes.cpp
+++ b/automated-tests/src/dali/utc-Dali-PropertyTypes.cpp
@@ -31,7 +31,6 @@ int UtcDaliPropertyTypesGetNameP(void)
   DALI_TEST_EQUALS( "BOOLEAN",            Dali::PropertyTypes::GetName(Property::BOOLEAN            ), TEST_LOCATION );
   DALI_TEST_EQUALS( "FLOAT",              Dali::PropertyTypes::GetName(Property::FLOAT              ), TEST_LOCATION );
   DALI_TEST_EQUALS( "INTEGER",            Dali::PropertyTypes::GetName(Property::INTEGER            ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "UNSIGNED_INTEGER",   Dali::PropertyTypes::GetName(Property::UNSIGNED_INTEGER   ), TEST_LOCATION );
   DALI_TEST_EQUALS( "VECTOR2",            Dali::PropertyTypes::GetName(Property::VECTOR2            ), TEST_LOCATION );
   DALI_TEST_EQUALS( "VECTOR3",            Dali::PropertyTypes::GetName(Property::VECTOR3            ), TEST_LOCATION );
   DALI_TEST_EQUALS( "VECTOR4",            Dali::PropertyTypes::GetName(Property::VECTOR4            ), TEST_LOCATION );
@@ -63,12 +62,6 @@ int UtcDaliPropertyTypesGet04P(void)
   END_TEST;
 }
 
-int UtcDaliPropertyTypesGet05P(void)
-{
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<unsigned int>() == Property::UNSIGNED_INTEGER );
-  END_TEST;
-}
-
 int UtcDaliPropertyTypesGet06P(void)
 {
   DALI_TEST_CHECK( Dali::PropertyTypes::Get<Dali::Vector2>() == Property::VECTOR2 );
diff --git a/automated-tests/src/dali/utc-Dali-PropertyValue.cpp b/automated-tests/src/dali/utc-Dali-PropertyValue.cpp
index 31274d9..6b0bba5 100644
--- a/automated-tests/src/dali/utc-Dali-PropertyValue.cpp
+++ b/automated-tests/src/dali/utc-Dali-PropertyValue.cpp
@@ -50,11 +50,6 @@ void CheckTypeName(const Property::Type& type)
       DALI_TEST_CHECK( "INTEGER" == std::string(PropertyTypes::GetName( type ) ) );
       break;
     }
-    case Property::UNSIGNED_INTEGER:
-    {
-      DALI_TEST_CHECK( "UNSIGNED_INTEGER" == std::string(PropertyTypes::GetName( type ) ) );
-      break;
-    }
     case Property::VECTOR2:
     {
       DALI_TEST_CHECK( "VECTOR2" == std::string(PropertyTypes::GetName( type ) ) );
@@ -210,26 +205,6 @@ int UtcDaliPropertyValueConstructorsIntTypeP(void)
   END_TEST;
 }
 
-int UtcDaliPropertyValueConstructorsUnsignedIntP(void)
-{
-  Property::Value value(1u);
-
-  DALI_TEST_CHECK( value.GetType() == Property::UNSIGNED_INTEGER );
-  DALI_TEST_CHECK( value.Get<unsigned int>() == 1u );
-
-  END_TEST;
-}
-
-int UtcDaliPropertyValueConstructorsUnsignedIntTypeP(void)
-{
-  Property::Value value( Property::UNSIGNED_INTEGER );
-
-  DALI_TEST_CHECK( value.GetType() == Property::UNSIGNED_INTEGER );
-  DALI_TEST_CHECK( value.Get<unsigned int>() == 0u );
-
-  END_TEST;
-}
-
 int UtcDaliPropertyValueConstructorsVector2P(void)
 {
   Vector2 v(1,1);
@@ -508,12 +483,6 @@ int UtcDaliPropertyValueCopyConstructorIntP(void)
   END_TEST;
 }
 
-int UtcDaliPropertyValueCopyConstructorUnsignedIntP(void)
-{
-  CheckCopyCtorP<unsigned int> check(1u);
-  END_TEST;
-}
-
 int UtcDaliPropertyValueCopyConstructoVector2P(void)
 {
   CheckCopyCtorP<Vector2> check( Vector2(2,1) );
@@ -639,17 +608,6 @@ int UtcDaliPropertyValueAssignmentOperatorIntP(void)
   END_TEST;
 }
 
-int UtcDaliPropertyValueAssignmentOperatorUnsignedIntP(void)
-{
-  Property::Value value;
-  value = Property::Value(10U); // type mismatch
-  DALI_TEST_CHECK( 10U == value.Get<unsigned int>() );
-  Property::Value copy( 123U);
-  copy = value; // type match
-  DALI_TEST_CHECK( 10U == copy.Get<unsigned int>() );
-  END_TEST;
-}
-
 int UtcDaliPropertyValueAssignmentOperatorFloatP(void)
 {
   Property::Value value;
@@ -882,29 +840,6 @@ int UtcDaliPropertyValueGetIntN(void)
   END_TEST;
 }
 
-int UtcDaliPropertyValueGetUnsignedIntP(void)
-{
-  Property::Value value(123u);
-  unsigned int result( 10u );
-  DALI_TEST_EQUALS( 123u, value.Get<unsigned int>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 123u, result, TEST_LOCATION );
-  END_TEST;
-}
-
-int UtcDaliPropertyValueGetUnsignedIntN(void)
-{
-  Property::Value value;
-  unsigned int result( 10u );
-  DALI_TEST_EQUALS( 0u, value.Get<unsigned int>(), TEST_LOCATION );
-  DALI_TEST_EQUALS( false, value.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 10u, result, TEST_LOCATION );
-  Property::Value value2("");
-  DALI_TEST_EQUALS( false, value2.Get( result ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 10u, result, TEST_LOCATION ); // result is not modified
-  END_TEST;
-}
-
 int UtcDaliPropertyValueGetRectP(void)
 {
   Property::Value value( Rect<int>(1,2,3,4) );
@@ -1231,13 +1166,6 @@ int UtcDaliPropertyValueOutputStream(void)
   }
 
   {
-    value = Property::Value(25U);
-    std::ostringstream stream;
-    stream <<  value;
-    DALI_TEST_CHECK( stream.str() == "25" )
-  }
-
-  {
     value = Property::Value( Vector2(1.f,1.f) );
     std::ostringstream stream;
     stream <<  value;
diff --git a/dali/devel-api/object/property-buffer.h b/dali/devel-api/object/property-buffer.h
index fa4c72a..a29c4b5 100644
--- a/dali/devel-api/object/property-buffer.h
+++ b/dali/devel-api/object/property-buffer.h
@@ -60,7 +60,7 @@ class PropertyBuffer;
  *  // Create indices
  *  unsigned int indexData[6] = { 0, 3, 1, 0, 2, 3 };
  *  Property::Map indexFormat;
- *  indexFormat["indices"] = Property::UNSIGNED_INTEGER;
+ *  indexFormat["indices"] = Property::INTEGER;
  *  PropertyBuffer indices = PropertyBuffer::New( indexFormat, 6 );
  *  indices.SetData(indexData);
  *
@@ -81,7 +81,7 @@ public:
   {
     enum
     {
-      SIZE = DEFAULT_OBJECT_PROPERTY_START_INDEX, ///< name "size",           type UNSIGNED_INT
+      SIZE = DEFAULT_OBJECT_PROPERTY_START_INDEX, ///< name "size",           type INTEGER
       BUFFER_FORMAT,                              ///< name "buffer-format",  type MAP
     };
   };
@@ -152,7 +152,7 @@ public:
    *
    * This function expects a pointer to an array of structures with the same
    * format that was given in the construction, and the number of elements to
-   * be the sane as the size of the buffer.
+   * be the same as the size of the buffer.
    *
    * If the initial structure was: { { "position", VECTOR3}, { "uv", VECTOR2 } }
    * and a size of 10 elements, this function should be called with a pointer equivalent to:
diff --git a/dali/devel-api/rendering/shader.h b/dali/devel-api/rendering/shader.h
index 08bf7f4..05d01f3 100644
--- a/dali/devel-api/rendering/shader.h
+++ b/dali/devel-api/rendering/shader.h
@@ -88,7 +88,7 @@ public:
     enum
     {
       PROGRAM = DEFAULT_OBJECT_PROPERTY_START_INDEX,  ///< name "program",      type MAP; {"vertex-prefix":"","fragment-prefix":"","vertex":"","fragment":""}
-      SHADER_HINTS,                                   ///< name "shader-hints", type UNSIGNED_INTEGER; (bitfield) values from enum Shader::Hints
+      SHADER_HINTS,                                   ///< name "shader-hints", type INTEGER; (bitfield) values from enum Shader::Hints
     };
   };
 
diff --git a/dali/devel-api/scripting/scripting.cpp b/dali/devel-api/scripting/scripting.cpp
index be86108..a9ed598 100644
--- a/dali/devel-api/scripting/scripting.cpp
+++ b/dali/devel-api/scripting/scripting.cpp
@@ -355,7 +355,7 @@ Image NewImage( const Property::Value& property )
 
     // Width and height can be set individually. Dali derives the unspecified
     // dimension from the aspect ratio of the raw image.
-    unsigned int width = 0, height = 0;
+    int width = 0, height = 0;
 
     value = map->Find( "width" );
     if( value )
@@ -375,7 +375,7 @@ Image NewImage( const Property::Value& property )
     {
       if( value->GetType() == Property::FLOAT )
       {
-        height = static_cast<unsigned int>( value->Get<float>() );
+        height = static_cast<int>( value->Get<float>() );
       }
       else
       {
diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp
index 2dd7f01..63eb572 100644
--- a/dali/internal/event/actors/actor-impl.cpp
+++ b/dali/internal/event/actors/actor-impl.cpp
@@ -3026,17 +3026,6 @@ void Actor::SetSceneGraphProperty( Property::Index index, const PropertyMetadata
       break;
     }
 
-    case Property::UNSIGNED_INTEGER:
-    {
-      const AnimatableProperty< unsigned int >* property = dynamic_cast< const AnimatableProperty< unsigned int >* >( entry.GetSceneGraphProperty() );
-      DALI_ASSERT_DEBUG( NULL != property );
-
-      // property is being used in a separate thread; queue a message to set the property
-      SceneGraph::NodePropertyMessage<unsigned int>::Send( GetEventThreadServices(), mNode, property, &AnimatableProperty<unsigned int>::Bake, value.Get<unsigned int>() );
-
-      break;
-    }
-
     case Property::FLOAT:
     {
       const AnimatableProperty< float >* property = dynamic_cast< const AnimatableProperty< float >* >( entry.GetSceneGraphProperty() );
diff --git a/dali/internal/event/animation/animation-impl.cpp b/dali/internal/event/animation/animation-impl.cpp
index 10ee3da..0c92623 100644
--- a/dali/internal/event/animation/animation-impl.cpp
+++ b/dali/internal/event/animation/animation-impl.cpp
@@ -340,17 +340,6 @@ void Animation::AnimateBy(Property& target, Property::Value& relativeValue, Alph
       break;
     }
 
-    case Property::UNSIGNED_INTEGER:
-    {
-      AddAnimatorConnector( AnimatorConnector<unsigned int>::New( object,
-                                                         target.propertyIndex,
-                                                         target.componentIndex,
-                                                         new AnimateByUnsignedInteger(relativeValue.Get<unsigned int>()),
-                                                         alpha,
-                                                         period ) );
-      break;
-    }
-
     case Property::FLOAT:
     {
       AddAnimatorConnector( AnimatorConnector<float>::New( object,
@@ -476,17 +465,6 @@ void Animation::AnimateTo(Object& targetObject, Property::Index targetPropertyIn
       break;
     }
 
-    case Property::UNSIGNED_INTEGER:
-    {
-      AddAnimatorConnector( AnimatorConnector<unsigned int>::New( targetObject,
-                                                                  targetPropertyIndex,
-                                                                  componentIndex,
-                                                                  new AnimateToUnsignedInteger( destinationValue.Get<unsigned int>() ),
-                                                                  alpha,
-                                                                  period ) );
-      break;
-    }
-
     case Property::FLOAT:
     {
       if ( ( Dali::Actor::Property::SIZE_WIDTH == targetPropertyIndex )||
@@ -641,20 +619,6 @@ void Animation::AnimateBetween(Property target, const KeyFrames& keyFrames, Alph
       break;
     }
 
-    case Dali::Property::UNSIGNED_INTEGER:
-    {
-      const KeyFrameUnsignedInteger* kf;
-      GetSpecialization(keyFrames, kf);
-      KeyFrameUnsignedIntegerPtr kfCopy = KeyFrameUnsignedInteger::Clone(*kf);
-      AddAnimatorConnector( AnimatorConnector<int>::New( object,
-                                                         target.propertyIndex,
-                                                         target.componentIndex,
-                                                         new KeyFrameUnsignedIntegerFunctor(kfCopy,interpolation),
-                                                         alpha,
-                                                         period ) );
-      break;
-    }
-
     case Dali::Property::FLOAT:
     {
       const KeyFrameNumber* kf;
diff --git a/dali/internal/event/animation/key-frames-impl.cpp b/dali/internal/event/animation/key-frames-impl.cpp
index 48bdaef..4e0c3ed 100644
--- a/dali/internal/event/animation/key-frames-impl.cpp
+++ b/dali/internal/event/animation/key-frames-impl.cpp
@@ -46,32 +46,45 @@ void KeyFrames::CreateKeyFramesSpec(Property::Type type)
   switch(type)
   {
     case Property::BOOLEAN:
+    {
       mKeyFrames = Internal::KeyFrameBoolean::New();
       break;
+    }
     case Property::INTEGER:
+    {
       mKeyFrames = Internal::KeyFrameInteger::New();
       break;
-    case Property::UNSIGNED_INTEGER:
-      mKeyFrames = Internal::KeyFrameUnsignedInteger::New();
-      break;
+    }
     case Property::FLOAT:
+    {
       mKeyFrames = Internal::KeyFrameNumber::New();
       break;
+    }
     case Property::VECTOR2:
+    {
       mKeyFrames = Internal::KeyFrameVector2::New();
       break;
+    }
     case Property::VECTOR3:
+    {
       mKeyFrames = Internal::KeyFrameVector3::New();
       break;
+    }
     case Property::VECTOR4:
+    {
       mKeyFrames = Internal::KeyFrameVector4::New();
       break;
+    }
     case Property::ROTATION:
+    {
       mKeyFrames = Internal::KeyFrameQuaternion::New();
       break;
+    }
     default:
+    {
       DALI_ASSERT_DEBUG(!"Type not supported");
       break;
+    }
   }
 }
 
@@ -106,12 +119,6 @@ void KeyFrames::Add(float time, Property::Value value, AlphaFunction alpha)
       kf->AddKeyFrame(time, value.Get<int>(), alpha);
       break;
     }
-    case Property::UNSIGNED_INTEGER:
-    {
-      Internal::KeyFrameUnsignedInteger* kf = static_cast<Internal::KeyFrameUnsignedInteger*>(mKeyFrames.Get());
-      kf->AddKeyFrame(time, value.Get<unsigned int>(), alpha);
-      break;
-    }
     case Property::FLOAT:
     {
       Internal::KeyFrameNumber* kf = static_cast<Internal::KeyFrameNumber*>(mKeyFrames.Get());
diff --git a/dali/internal/event/animation/key-frames-impl.h b/dali/internal/event/animation/key-frames-impl.h
index 0a48c94..cfd0be5 100644
--- a/dali/internal/event/animation/key-frames-impl.h
+++ b/dali/internal/event/animation/key-frames-impl.h
@@ -241,7 +241,6 @@ public:
 typedef KeyFrameBaseSpec<float>          KeyFrameNumber;
 typedef KeyFrameBaseSpec<bool>           KeyFrameBoolean;
 typedef KeyFrameBaseSpec<int>            KeyFrameInteger;
-typedef KeyFrameBaseSpec<unsigned int>   KeyFrameUnsignedInteger;
 typedef KeyFrameBaseSpec<Vector2>        KeyFrameVector2;
 typedef KeyFrameBaseSpec<Vector3>        KeyFrameVector3;
 typedef KeyFrameBaseSpec<Vector4>        KeyFrameVector4;
@@ -250,7 +249,6 @@ typedef KeyFrameBaseSpec<Quaternion>     KeyFrameQuaternion;
 typedef IntrusivePtr<KeyFrameBoolean>         KeyFrameBooleanPtr;
 typedef IntrusivePtr<KeyFrameNumber>          KeyFrameNumberPtr;
 typedef IntrusivePtr<KeyFrameInteger>         KeyFrameIntegerPtr;
-typedef IntrusivePtr<KeyFrameUnsignedInteger> KeyFrameUnsignedIntegerPtr;
 typedef IntrusivePtr<KeyFrameVector2>         KeyFrameVector2Ptr;
 typedef IntrusivePtr<KeyFrameVector3>         KeyFrameVector3Ptr;
 typedef IntrusivePtr<KeyFrameVector4>         KeyFrameVector4Ptr;
@@ -287,16 +285,6 @@ inline void GetSpecialization(const Internal::KeyFrames& keyFrames, const Intern
   keyFrameSpec = static_cast<const Internal::KeyFrameInteger*>(keyFrames.GetKeyFramesBase());
 }
 
-inline void GetSpecialization(Internal::KeyFrames& keyFrames, Internal::KeyFrameUnsignedInteger*& keyFrameSpec)
-{
-  keyFrameSpec = static_cast<Internal::KeyFrameUnsignedInteger*>(keyFrames.GetKeyFramesBase());
-}
-
-inline void GetSpecialization(const Internal::KeyFrames& keyFrames, const Internal::KeyFrameUnsignedInteger*& keyFrameSpec)
-{
-  keyFrameSpec = static_cast<const Internal::KeyFrameUnsignedInteger*>(keyFrames.GetKeyFramesBase());
-}
-
 inline void GetSpecialization(Internal::KeyFrames& keyFrames, Internal::KeyFrameVector2*& keyFrameSpec)
 {
   keyFrameSpec = static_cast<Internal::KeyFrameVector2*>(keyFrames.GetKeyFramesBase());
diff --git a/dali/internal/event/animation/progress-value.h b/dali/internal/event/animation/progress-value.h
index d993d6e..7de8d3c 100644
--- a/dali/internal/event/animation/progress-value.h
+++ b/dali/internal/event/animation/progress-value.h
@@ -74,9 +74,6 @@ typedef std::vector<ProgressBoolean>                    ProgressBooleanContainer
 typedef ProgressValue<int>                              ProgressInteger;
 typedef std::vector<ProgressInteger>                    ProgressIntegerContainer;
 
-typedef ProgressValue<unsigned int>                     ProgressUnsignedInteger;
-typedef std::vector<ProgressUnsignedInteger>            ProgressUnsignedIntegerContainer;
-
 typedef ProgressValue<float>                            ProgressNumber;
 typedef std::vector<ProgressNumber>                     ProgressNumberContainer;
 
diff --git a/dali/internal/event/animation/property-input-accessor.h b/dali/internal/event/animation/property-input-accessor.h
index e84f725..9c203a1 100644
--- a/dali/internal/event/animation/property-input-accessor.h
+++ b/dali/internal/event/animation/property-input-accessor.h
@@ -113,16 +113,6 @@ public:
   }
 
   /**
-   * @copydoc Dali::Internal::PropertyInputImpl::GetConstraintInputUnsignedInteger() const
-   */
-  const unsigned int& GetConstraintInputUnsignedInteger( BufferIndex updateBufferIndex ) const
-  {
-    DALI_ASSERT_DEBUG( mComponentIndex < 0 && "Did not expect valid component index" );
-
-    return mInput->GetConstraintInputUnsignedInteger( updateBufferIndex );
-  }
-
-  /**
    * @copydoc Dali::Internal::PropertyInputImpl::GetConstraintInputFloat()
    */
   const float& GetConstraintInputFloat( BufferIndex updateBufferIndex ) const
diff --git a/dali/internal/event/animation/property-input-indexer.h b/dali/internal/event/animation/property-input-indexer.h
index 295adf1..c19bf14 100644
--- a/dali/internal/event/animation/property-input-indexer.h
+++ b/dali/internal/event/animation/property-input-indexer.h
@@ -99,14 +99,6 @@ public:
   }
 
   /**
-   * @copydoc Dali::Internal::PropertyInput::GetUnsignedInteger()
-   */
-  virtual const unsigned int& GetUnsignedInteger() const
-  {
-    return mInput->GetConstraintInputUnsignedInteger( mBufferIndex );
-  }
-
-  /**
    * @copydoc Dali::Internal::PropertyInput::GetFloat()
    */
   virtual const float& GetFloat() const
diff --git a/dali/internal/event/common/object-impl.cpp b/dali/internal/event/common/object-impl.cpp
index be21c3c..f50fb07 100644
--- a/dali/internal/event/common/object-impl.cpp
+++ b/dali/internal/event/common/object-impl.cpp
@@ -537,12 +537,6 @@ Property::Index Object::RegisterSceneGraphProperty(const std::string& name, Prop
       break;
     }
 
-    case Property::UNSIGNED_INTEGER:
-    {
-      newProperty = new AnimatableProperty<unsigned int>( propertyValue.Get<unsigned int>() );
-      break;
-    }
-
     case Property::FLOAT:
     {
       newProperty = new AnimatableProperty<float>( propertyValue.Get<float>() );
@@ -845,15 +839,6 @@ Property::Value Object::GetPropertyValue( const PropertyMetadata* entry ) const
         break;
       }
 
-      case Property::UNSIGNED_INTEGER:
-      {
-        const AnimatableProperty<unsigned int>* property = dynamic_cast< const AnimatableProperty<unsigned int>* >( entry->GetSceneGraphProperty() );
-        DALI_ASSERT_DEBUG( NULL != property );
-
-        value = (*property)[ bufferIndex ];
-        break;
-      }
-
       case Property::FLOAT:
       {
         const AnimatableProperty<float>* property = dynamic_cast< const AnimatableProperty<float>* >( entry->GetSceneGraphProperty() );
@@ -997,16 +982,6 @@ void Object::SetSceneGraphProperty( Property::Index index, const PropertyMetadat
       break;
     }
 
-    case Property::UNSIGNED_INTEGER:
-    {
-      const AnimatableProperty<unsigned int>* property = dynamic_cast< const AnimatableProperty<unsigned int>* >( entry.GetSceneGraphProperty() );
-      DALI_ASSERT_DEBUG( NULL != property );
-
-      // property is being used in a separate thread; queue a message to set the property
-      BakeMessage<unsigned int>( GetEventThreadServices(), *property, value.Get<unsigned int>() );
-      break;
-    }
-
     case Property::FLOAT:
     {
       const AnimatableProperty<float>* property = dynamic_cast< const AnimatableProperty<float>* >( entry.GetSceneGraphProperty() );
diff --git a/dali/internal/event/common/property-buffer-impl.cpp b/dali/internal/event/common/property-buffer-impl.cpp
index 7a3c828..7fa13f7 100644
--- a/dali/internal/event/common/property-buffer-impl.cpp
+++ b/dali/internal/event/common/property-buffer-impl.cpp
@@ -45,8 +45,8 @@ namespace
  *            |name    |type             |writable|animatable|constraint-input|enum for index-checking|
  */
 DALI_PROPERTY_TABLE_BEGIN
-DALI_PROPERTY( "size",          UNSIGNED_INTEGER, true, false,  true,   Dali::PropertyBuffer::Property::SIZE )
-DALI_PROPERTY( "buffer-format", MAP,              false, false, false,  Dali::PropertyBuffer::Property::BUFFER_FORMAT )
+DALI_PROPERTY( "size",          INTEGER, true,  false, true,   Dali::PropertyBuffer::Property::SIZE )
+DALI_PROPERTY( "buffer-format", MAP,     false, false, false,  Dali::PropertyBuffer::Property::BUFFER_FORMAT )
 DALI_PROPERTY_TABLE_END( DEFAULT_ACTOR_PROPERTY_START_INDEX )
 
 const ObjectImplHelper<DEFAULT_PROPERTY_COUNT> PROPERTY_BUFFER_IMPL = { DEFAULT_PROPERTY_DETAILS };
@@ -101,11 +101,6 @@ unsigned int GetPropertyImplementationAlignment( Property::Type& propertyType )
       alignment = PropertyImplementationTypeAlignment< Property::INTEGER >::VALUE;
       break;
     }
-    case Property::UNSIGNED_INTEGER:
-    {
-      alignment = PropertyImplementationTypeAlignment< Property::UNSIGNED_INTEGER >::VALUE;
-      break;
-    }
     case Property::FLOAT:
     {
       alignment = PropertyImplementationTypeAlignment< Property::FLOAT >::VALUE;
@@ -254,7 +249,7 @@ void PropertyBuffer::SetDefaultProperty( Property::Index index,
   {
     case Dali::PropertyBuffer::Property::SIZE:
     {
-      SetSize( propertyValue.Get<unsigned int>() );
+      SetSize( propertyValue.Get<int>() );
       break;
     }
     case Dali::PropertyBuffer::Property::BUFFER_FORMAT:
@@ -280,7 +275,7 @@ Property::Value PropertyBuffer::GetDefaultProperty( Property::Index index ) cons
   {
     case Dali::PropertyBuffer::Property::SIZE:
     {
-      value = static_cast<unsigned int>( GetSize() ); // @todo MESH_REWORK Add a size_t type to PropertyValue
+      value = static_cast<int>( GetSize() );
       break;
     }
     case Dali::PropertyBuffer::Property::BUFFER_FORMAT:
@@ -506,11 +501,6 @@ unsigned int GetPropertyImplementationSize( Property::Type& propertyType )
       size = sizeof( PropertyImplementationType< Property::INTEGER >::Type );
       break;
     }
-    case Property::UNSIGNED_INTEGER:
-    {
-      size = sizeof( PropertyImplementationType< Property::UNSIGNED_INTEGER >::Type );
-      break;
-    }
     case Property::FLOAT:
     {
       size = sizeof( PropertyImplementationType< Property::FLOAT >::Type );
diff --git a/dali/internal/event/common/property-buffer-impl.h b/dali/internal/event/common/property-buffer-impl.h
index 122ae7d..3c08271 100644
--- a/dali/internal/event/common/property-buffer-impl.h
+++ b/dali/internal/event/common/property-buffer-impl.h
@@ -247,7 +247,6 @@ template<Property::Type type> struct PropertyImplementationType
 template<> struct PropertyImplementationType< Property::BOOLEAN > { typedef bool Type; };
 template<> struct PropertyImplementationType< Property::FLOAT > { typedef float Type; };
 template<> struct PropertyImplementationType< Property::INTEGER > { typedef int Type; };
-template<> struct PropertyImplementationType< Property::UNSIGNED_INTEGER > { typedef unsigned int Type; };
 template<> struct PropertyImplementationType< Property::VECTOR2 > { typedef Vector2 Type; };
 template<> struct PropertyImplementationType< Property::VECTOR3 > { typedef Vector3 Type; };
 template<> struct PropertyImplementationType< Property::VECTOR4 > { typedef Vector4 Type; };
diff --git a/dali/internal/event/common/property-input-impl.h b/dali/internal/event/common/property-input-impl.h
index c8fa3ad..1778b54 100644
--- a/dali/internal/event/common/property-input-impl.h
+++ b/dali/internal/event/common/property-input-impl.h
@@ -43,7 +43,6 @@ namespace Internal
 static const bool DUMMY_BOOLEAN_VALUE( false );
 static const float DUMMY_FLOAT_VALUE( 0.0f );
 static const int DUMMY_INTEGER_VALUE( 0 );
-static const unsigned int DUMMY_UNSIGNED_INTEGER_VALUE( 0u );
 static const Vector2 DUMMY_VECTOR2_VALUE( 0.0f, 0.0f );
 static const Vector3 DUMMY_VECTOR3_VALUE( 0.0f, 0.0f, 0.0f );
 static const Vector4 DUMMY_VECTOR4_VALUE( 0.0f, 0.0f, 0.0f, 0.0f );
@@ -109,18 +108,6 @@ public:
   }
 
   /**
-   * Retrieve an integer value.
-   * @pre GetType() returns Property::UNSIGNED_INTEGER.
-   * @param[in] bufferIndex The buffer to read from.
-   * @return The integer value.
-   */
-  virtual const unsigned int& GetUnsignedInteger( BufferIndex bufferIndex ) const
-  {
-    DALI_ASSERT_ALWAYS( false && "Property type mismatch" );
-    return DUMMY_UNSIGNED_INTEGER_VALUE;
-  }
-
-  /**
    * Retrieve a float value.
    * @pre GetType() returns Property::FLOAT.
    * @param[in] bufferIndex The buffer to read from.
@@ -233,19 +220,6 @@ public:
   }
 
   /**
-   * Retrieve an unsigned integer input for a constraint function.
-   * @note For inherited properties, this method should be overriden to return the value
-   * from the previous frame i.e. not from the current update buffer.
-   * @pre GetType() returns Property::UNSIGNED_INTEGER.
-   * @param[in] updateBufferIndex The current update buffer index.
-   * @return The integer value.
-   */
-  virtual const unsigned int& GetConstraintInputUnsignedInteger( BufferIndex updateBufferIndex ) const
-  {
-    return GetUnsignedInteger( updateBufferIndex );
-  }
-
-  /**
    * Retrieve a float input for a constraint function.
    * @note For inherited properties, this method should be overriden to return the value
    * from the previous frame i.e. not from the current update buffer.
@@ -358,12 +332,6 @@ public:
         break;
       }
 
-      case Property::UNSIGNED_INTEGER:
-      {
-        debugStream << GetUnsignedInteger( bufferIndex );
-        break;
-      }
-
       case Property::FLOAT:
       {
         debugStream << GetFloat( bufferIndex );
diff --git a/dali/internal/event/rendering/shader-impl.cpp b/dali/internal/event/rendering/shader-impl.cpp
index 0d25764..4760d5f 100644
--- a/dali/internal/event/rendering/shader-impl.cpp
+++ b/dali/internal/event/rendering/shader-impl.cpp
@@ -39,11 +39,11 @@ namespace
 {
 
 /**
- *            |name            |type             |writable|animatable|constraint-input|enum for index-checking|
+ *            |name             |type    |writable|animatable|constraint-input|enum for index-checking|
  */
 DALI_PROPERTY_TABLE_BEGIN
-DALI_PROPERTY( "program",       MAP,              true, false,  false,  Dali::Shader::Property::PROGRAM )
-DALI_PROPERTY( "shader-hints",  UNSIGNED_INTEGER, true, false,  true,   Dali::Shader::Property::SHADER_HINTS )
+DALI_PROPERTY( "program",       MAP,     true,     false,     false,  Dali::Shader::Property::PROGRAM )
+DALI_PROPERTY( "shader-hints",  INTEGER, true,     false,     true,   Dali::Shader::Property::SHADER_HINTS )
 DALI_PROPERTY_TABLE_END( DEFAULT_ACTOR_PROPERTY_START_INDEX )
 
 const ObjectImplHelper<DEFAULT_PROPERTY_COUNT> SHADER_IMPL = { DEFAULT_PROPERTY_DETAILS };
diff --git a/dali/internal/render/renderers/render-renderer-property-buffer.cpp b/dali/internal/render/renderers/render-renderer-property-buffer.cpp
index eccdc50..0727a6b 100644
--- a/dali/internal/render/renderers/render-renderer-property-buffer.cpp
+++ b/dali/internal/render/renderers/render-renderer-property-buffer.cpp
@@ -51,7 +51,6 @@ Dali::GLenum GetPropertyImplementationGlType( Property::Type& propertyType )
       break;
     }
     case Property::INTEGER:
-    case Property::UNSIGNED_INTEGER:
     {
       type = GL_SHORT;
       break;
@@ -93,7 +92,6 @@ size_t GetPropertyImplementationGlSize( Property::Type& propertyType )
       break;
     }
     case Property::INTEGER:
-    case Property::UNSIGNED_INTEGER:
     {
       size = 2u;
       break;
diff --git a/dali/internal/render/shaders/scene-graph-shader.cpp b/dali/internal/render/shaders/scene-graph-shader.cpp
index 3d7021b..74f78a4 100644
--- a/dali/internal/render/shaders/scene-graph-shader.cpp
+++ b/dali/internal/render/shaders/scene-graph-shader.cpp
@@ -285,11 +285,6 @@ void Shader::SetUniforms( Context& context,
             program.SetUniform1i( loc, property.GetInteger( bufferIndex ) );
             break;
           }
-          case Property::UNSIGNED_INTEGER :
-          {
-            program.SetUniform1i( loc, property.GetUnsignedInteger( bufferIndex ) );
-            break;
-          }
           case Property::FLOAT :
           {
             program.SetUniform1f( loc, property.GetFloat( bufferIndex ) );
diff --git a/dali/internal/update/animation/scene-graph-animator.h b/dali/internal/update/animation/scene-graph-animator.h
index 6e46ebf..8b30afd 100644
--- a/dali/internal/update/animation/scene-graph-animator.h
+++ b/dali/internal/update/animation/scene-graph-animator.h
@@ -595,36 +595,6 @@ struct AnimateToInteger : public AnimatorFunctionBase
   int mTarget;
 };
 
-struct AnimateByUnsignedInteger : public AnimatorFunctionBase
-{
-  AnimateByUnsignedInteger(const unsigned int& relativeValue)
-  : mRelative(relativeValue)
-  {
-  }
-
-  float operator()(float alpha, const unsigned int& property)
-  {
-    return static_cast<unsigned int>(property + mRelative * alpha + 0.5f );
-  }
-
-  unsigned int mRelative;
-};
-
-struct AnimateToUnsignedInteger : public AnimatorFunctionBase
-{
-  AnimateToUnsignedInteger(const unsigned int& targetValue)
-  : mTarget(targetValue)
-  {
-  }
-
-  float operator()(float alpha, const unsigned int& property)
-  {
-    return static_cast<unsigned int>(property + ((mTarget - property) * alpha) + 0.5f);
-  }
-
-  unsigned int mTarget;
-};
-
 struct AnimateByFloat : public AnimatorFunctionBase
 {
   AnimateByFloat(const float& relativeValue)
@@ -890,26 +860,6 @@ struct KeyFrameIntegerFunctor : public AnimatorFunctionBase
   Interpolation mInterpolation;
 };
 
-struct KeyFrameUnsignedIntegerFunctor : public AnimatorFunctionBase
-{
-  KeyFrameUnsignedIntegerFunctor(KeyFrameUnsignedIntegerPtr keyFrames, Interpolation interpolation)
-  : mKeyFrames(keyFrames),mInterpolation(interpolation)
-  {
-  }
-
-  float operator()(float progress, const unsigned int& property)
-  {
-    if(mKeyFrames->IsActive(progress))
-    {
-      return mKeyFrames->GetValue(progress, mInterpolation);
-    }
-    return property;
-  }
-
-  KeyFrameUnsignedIntegerPtr mKeyFrames;
-  Interpolation mInterpolation;
-};
-
 struct KeyFrameNumberFunctor : public AnimatorFunctionBase
 {
   KeyFrameNumberFunctor(KeyFrameNumberPtr keyFrames, Interpolation interpolation)
diff --git a/dali/internal/update/common/animatable-property.h b/dali/internal/update/common/animatable-property.h
index 3415f83..a05d545 100644
--- a/dali/internal/update/common/animatable-property.h
+++ b/dali/internal/update/common/animatable-property.h
@@ -474,185 +474,6 @@ private:
 };
 
 /**
- * An unsigned integer animatable property of a scene-graph object.
- */
-template <>
-class AnimatableProperty<unsigned int> : public AnimatablePropertyBase
-{
-public:
-
-  /**
-   * Create an animatable property.
-   * @param [in] initialValue The initial value of the property.
-   */
-  AnimatableProperty( unsigned int initialValue )
-  : mValue( initialValue ),
-    mBaseValue( initialValue )
-  {
-  }
-
-  /**
-   * Virtual destructor.
-   */
-  virtual ~AnimatableProperty()
-  {
-  }
-
-  /**
-   * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
-   */
-  virtual Dali::Property::Type GetType() const
-  {
-    return Dali::PropertyTypes::Get<unsigned int>();
-  }
-
-  /**
-   * @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
-   */
-  virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
-  {
-    if (CLEAN_FLAG != mDirtyFlags)
-    {
-      mValue[updateBufferIndex] = mBaseValue;
-
-      mDirtyFlags = ( mDirtyFlags >> 1 );
-    }
-  }
-
-  /**
-   * @copydoc Dali::Internal::PropertyInputImpl::GetUnsignedInteger()
-   */
-  virtual const unsigned int& GetUnsignedInteger( BufferIndex bufferIndex ) const
-  {
-    return mValue[ bufferIndex ];
-  }
-
-  /**
-   * Set the property value. This will only persist for the current frame; the property
-   * will be reset with the base value, at the beginning of the next frame.
-   * @param[in] bufferIndex The buffer to write.
-   * @param[in] value The new property value.
-   */
-  void Set(BufferIndex bufferIndex, unsigned int value)
-  {
-    mValue[bufferIndex] = value;
-
-    OnSet();
-  }
-
-  /**
-   * Change the property value by a relative amount.
-   * @param[in] bufferIndex The buffer to write.
-   * @param[in] delta The property will change by this amount.
-   */
-  void SetRelative(BufferIndex bufferIndex, unsigned int delta)
-  {
-    mValue[bufferIndex] = mValue[bufferIndex] + delta;
-
-    OnSet();
-  }
-
-  /**
-   * @copydoc Dali::SceneGraph::AnimatableProperty::Get()
-   */
-  unsigned int& Get(size_t bufferIndex)
-  {
-    return mValue[bufferIndex];
-  }
-
-  /**
-   * @copydoc Dali::SceneGraph::AnimatableProperty::Get()
-   */
-  const unsigned int& Get(size_t bufferIndex) const
-  {
-    return mValue[bufferIndex];
-  }
-
-  /**
-   * Retrieve the property value.
-   * @param[in] bufferIndex The buffer to read.
-   * @return The property value.
-   */
-  unsigned int& operator[](size_t bufferIndex)
-  {
-    return mValue[bufferIndex];
-  }
-
-  /**
-   * Retrieve the property value.
-   * @param[in] bufferIndex The buffer to read.
-   * @return The property value.
-   */
-  const unsigned int& operator[](size_t bufferIndex) const
-  {
-    return mValue[bufferIndex];
-  }
-
-  /**
-   * Set both the property value & base value.
-   * @param[in] bufferIndex The buffer to write for the property value.
-   * @param[in] value The new property value.
-   */
-  void Bake(BufferIndex bufferIndex, unsigned int value)
-  {
-    mValue[bufferIndex] = value;
-    mBaseValue = mValue[bufferIndex];
-
-    OnBake();
-  }
-
-  /**
-   * Change the property value & base value by a relative amount.
-   * @param[in] bufferIndex The buffer to write for the local property value.
-   * @param[in] delta The property will change by this amount.
-   */
-  void BakeRelative(BufferIndex bufferIndex, unsigned int delta)
-  {
-    mValue[bufferIndex] = mValue[bufferIndex] + delta;
-    mBaseValue = mValue[bufferIndex];
-
-    OnBake();
-  }
-
-  /**
-   * Sets both double-buffered values & the base value.
-   * This should only be used when the owning object has not been connected to the scene-graph.
-   * @param[in] value The new property value.
-   */
-  void SetInitial(const unsigned int& value)
-  {
-    mValue[0]  = value;
-    mValue[1]  = mValue[0];
-    mBaseValue = mValue[0];
-  }
-
-  /**
-   * Change both double-buffered values & the base value by a relative amount.
-   * This should only be used when the owning object has not been connected to the scene-graph.
-   * @param[in] delta The property will change by this amount.
-   */
-  void SetInitialRelative(const unsigned int& delta)
-  {
-    mValue[0] = mValue[0] + delta;
-    mValue[1] = mValue[0];
-    mBaseValue = mValue[0];
-  }
-
-private:
-
-  // Undefined
-  AnimatableProperty(const AnimatableProperty& property);
-
-  // Undefined
-  AnimatableProperty& operator=(const AnimatableProperty& rhs);
-
-private:
-  DoubleBuffered<unsigned int> mValue; ///< The double-buffered property value
-  unsigned int mBaseValue;             ///< Reset to this base value at the beginning of each frame
-};
-
-
-/**
  * An float animatable property of a scene-graph object.
  */
 template <>
diff --git a/dali/internal/update/common/double-buffered-property.h b/dali/internal/update/common/double-buffered-property.h
index 857a0db..0b23260 100644
--- a/dali/internal/update/common/double-buffered-property.h
+++ b/dali/internal/update/common/double-buffered-property.h
@@ -242,24 +242,6 @@ public:
 };
 
 template<>
-class DoubleBufferedProperty<unsigned int> : public DoubleBufferedPropertyImpl<unsigned int>
-{
-public:
-  /**
-   * Constructor
-   */
-  DoubleBufferedProperty( unsigned int value ) : DoubleBufferedPropertyImpl( value ) {};
-
-  /**
-   * copydoc PropertyInputImpl::GetUnsignedInteger
-   */
-  virtual const unsigned int& GetUnsignedInteger( BufferIndex bufferIndex ) const
-  {
-    return mValue[bufferIndex];
-  }
-};
-
-template<>
 class DoubleBufferedProperty<float> : public DoubleBufferedPropertyImpl<float>
 {
 public:
diff --git a/dali/internal/update/common/property-condition-functions.cpp b/dali/internal/update/common/property-condition-functions.cpp
index bca0dec..9422c88 100644
--- a/dali/internal/update/common/property-condition-functions.cpp
+++ b/dali/internal/update/common/property-condition-functions.cpp
@@ -49,11 +49,6 @@ ConditionFunction LessThan::GetFunction(Property::Type valueType)
       function = LessThan::EvalInteger;
       break;
     }
-    case Property::UNSIGNED_INTEGER:
-    {
-      function = LessThan::EvalUnsignedInteger;
-      break;
-    }
     case Property::FLOAT:
     {
       function = LessThan::EvalFloat;
@@ -96,12 +91,6 @@ bool LessThan::EvalInteger( const Dali::PropertyInput& value, PropertyNotificati
   return (value.GetInteger() < arg0);
 }
 
-bool LessThan::EvalUnsignedInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg )
-{
-  const unsigned int arg0 = arg[0];
-  return (value.GetUnsignedInteger() < arg0);
-}
-
 bool LessThan::EvalFloat( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg )
 {
   const float arg0 = arg[0];
@@ -149,11 +138,6 @@ ConditionFunction GreaterThan::GetFunction(Property::Type valueType)
       function = GreaterThan::EvalInteger;
       break;
     }
-    case Property::UNSIGNED_INTEGER:
-    {
-      function = GreaterThan::EvalUnsignedInteger;
-      break;
-    }
     case Property::FLOAT:
     {
       function = GreaterThan::EvalFloat;
@@ -196,12 +180,6 @@ bool GreaterThan::EvalInteger( const Dali::PropertyInput& value, PropertyNotific
   return (value.GetInteger() > arg0);
 }
 
-bool GreaterThan::EvalUnsignedInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg )
-{
-  const unsigned int arg0 = arg[0];
-  return (value.GetUnsignedInteger() > arg0);
-}
-
 bool GreaterThan::EvalFloat( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg )
 {
   const float arg0 = arg[0];
@@ -249,11 +227,6 @@ ConditionFunction Inside::GetFunction(Property::Type valueType)
       function = Inside::EvalInteger;
       break;
     }
-    case Property::UNSIGNED_INTEGER:
-    {
-      function = Inside::EvalUnsignedInteger;
-      break;
-    }
     case Property::FLOAT:
     {
       function = Inside::EvalFloat;
@@ -296,12 +269,6 @@ bool Inside::EvalInteger( const Dali::PropertyInput& value, PropertyNotification
   return ( (valueInteger > arg[0]) && (valueInteger < arg[1]) );
 }
 
-bool Inside::EvalUnsignedInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg )
-{
-  const unsigned int valueUInt = value.GetUnsignedInteger();
-  return ( (valueUInt > arg[0]) && (valueUInt < arg[1]) );
-}
-
 bool Inside::EvalFloat( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg )
 {
   const float valueFloat = value.GetFloat();
@@ -349,11 +316,6 @@ ConditionFunction Outside::GetFunction(Property::Type valueType)
       function = Outside::EvalInteger;
       break;
     }
-    case Property::UNSIGNED_INTEGER:
-    {
-      function = Outside::EvalUnsignedInteger;
-      break;
-    }
     case Property::FLOAT:
     {
       function = Outside::EvalFloat;
@@ -396,12 +358,6 @@ bool Outside::EvalInteger( const Dali::PropertyInput& value, PropertyNotificatio
   return ( (valueInteger < arg[0]) || (valueInteger > arg[1]) );
 }
 
-bool Outside::EvalUnsignedInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg )
-{
-  const unsigned int valueUInt = value.GetUnsignedInteger();
-  return ( (valueUInt < arg[0]) || (valueUInt > arg[1]) );
-}
-
 bool Outside::EvalFloat( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg )
 {
   const float valueFloat = value.GetFloat();
diff --git a/dali/internal/update/common/property-condition-functions.h b/dali/internal/update/common/property-condition-functions.h
index 7d1faa0..a45685f 100644
--- a/dali/internal/update/common/property-condition-functions.h
+++ b/dali/internal/update/common/property-condition-functions.h
@@ -81,14 +81,6 @@ private:
   static bool EvalInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg );
 
   /**
-   * Checks if unsigned integer is LessThan
-   * @param[in] value The value being examined.
-   * @param[in] arg The supplied arguments for the condition.
-   * @return Condition result (true if condition met, false if not)
-   */
-  static bool EvalUnsignedInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg );
-
-  /**
    * Checks if float is LessThan
    * @param[in] value The value being examined.
    * @param[in] arg The supplied arguments for the condition.
@@ -173,14 +165,6 @@ private:
   static bool EvalInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg );
 
   /**
-   * Checks if unsigned integer is GreaterThan
-   * @param[in] value The value being examined.
-   * @param[in] arg The supplied arguments for the condition.
-   * @return Condition result (true if condition met, false if not)
-   */
-  static bool EvalUnsignedInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg );
-
-  /**
    * Checks if float is GreaterThan
    * @param[in] value The value being examined.
    * @param[in] arg The supplied arguments for the condition.
@@ -265,14 +249,6 @@ private:
   static bool EvalInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg );
 
   /**
-   * Checks if unsigned integer is Inside
-   * @param[in] value The value being examined.
-   * @param[in] arg The supplied arguments for the condition.
-   * @return Condition result (true if condition met, false if not)
-   */
-  static bool EvalUnsignedInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg );
-
-  /**
    * Checks if float is Inside
    * @param[in] value The value being examined.
    * @param[in] arg The supplied arguments for the condition.
@@ -357,14 +333,6 @@ private:
   static bool EvalInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg );
 
   /**
-   * Checks if unsigned integer is Outside
-   * @param[in] value The value being examined.
-   * @param[in] arg The supplied arguments for the condition.
-   * @return Condition result (true if condition met, false if not)
-   */
-  static bool EvalUnsignedInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg );
-
-  /**
    * Checks if float is Outside
    * @param[in] value The value being examined.
    * @param[in] arg The supplied arguments for the condition.
diff --git a/dali/internal/update/common/property-condition-step-functions.cpp b/dali/internal/update/common/property-condition-step-functions.cpp
index 25547da..a32981d 100644
--- a/dali/internal/update/common/property-condition-step-functions.cpp
+++ b/dali/internal/update/common/property-condition-step-functions.cpp
@@ -51,11 +51,6 @@ ConditionFunction Step::GetFunction(Property::Type valueType)
       function = EvalInteger;
       break;
     }
-    case Property::UNSIGNED_INTEGER:
-    {
-      function = EvalUnsignedInteger;
-      break;
-    }
     case Property::FLOAT:
     {
       function = EvalFloat;
@@ -111,12 +106,6 @@ bool Step::EvalInteger( const Dali::PropertyInput& value, PropertyNotification::
   return Evaluate( propertyValue, arg );
 }
 
-bool Step::EvalUnsignedInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg )
-{
-  const float propertyValue = static_cast<float>( value.GetUnsignedInteger() );
-  return Evaluate( propertyValue, arg );
-}
-
 bool Step::EvalFloat( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg )
 {
   const float propertyValue = value.GetFloat();
diff --git a/dali/internal/update/common/property-condition-step-functions.h b/dali/internal/update/common/property-condition-step-functions.h
index 4a7104c..00a9ee2 100644
--- a/dali/internal/update/common/property-condition-step-functions.h
+++ b/dali/internal/update/common/property-condition-step-functions.h
@@ -68,14 +68,6 @@ private:
   static bool EvalInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg );
 
   /**
-   * Checks if unsigned integer is Outside
-   * @param[in] value The value being examined.
-   * @param[in] arg The supplied arguments for the condition.
-   * @return Condition result (true if condition met, false if not)
-   */
-  static bool EvalUnsignedInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg );
-
-  /**
    * Checks if float is Outside
    * @param[in] value The value being examined.
    * @param[in] arg The supplied arguments for the condition.
diff --git a/dali/internal/update/common/property-condition-variable-step-functions.cpp b/dali/internal/update/common/property-condition-variable-step-functions.cpp
index 3b259dc..60fca7b 100644
--- a/dali/internal/update/common/property-condition-variable-step-functions.cpp
+++ b/dali/internal/update/common/property-condition-variable-step-functions.cpp
@@ -51,11 +51,6 @@ ConditionFunction VariableStep::GetFunction( Property::Type valueType )
       function = EvalInteger;
       break;
     }
-    case Property::UNSIGNED_INTEGER:
-    {
-      function = EvalUnsignedInteger;
-      break;
-    }
     case Property::FLOAT:
     {
       function = EvalFloat;
@@ -159,12 +154,6 @@ bool VariableStep::EvalInteger( const Dali::PropertyInput& value, PropertyNotifi
   return Evaluate( propertyValue, arg );
 }
 
-bool VariableStep::EvalUnsignedInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg )
-{
-  const float propertyValue = static_cast<float>( value.GetUnsignedInteger() );
-  return Evaluate( propertyValue, arg );
-}
-
 bool VariableStep::EvalFloat( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg )
 {
   const float propertyValue = value.GetFloat();
diff --git a/dali/internal/update/common/property-condition-variable-step-functions.h b/dali/internal/update/common/property-condition-variable-step-functions.h
index 672df6b..412f283 100644
--- a/dali/internal/update/common/property-condition-variable-step-functions.h
+++ b/dali/internal/update/common/property-condition-variable-step-functions.h
@@ -73,14 +73,6 @@ private:
   static bool EvalInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg );
 
   /**
-   * Checks if unsigned integer is Outside
-   * @param[in] value The value being examined.
-   * @param[in] arg The supplied arguments for the condition.
-   * @return Condition result (true if condition met, false if not)
-   */
-  static bool EvalUnsignedInteger( const Dali::PropertyInput& value, PropertyNotification::RawArgumentContainer& arg );
-
-  /**
    * Checks if float is Outside
    * @param[in] value The value being examined.
    * @param[in] arg The supplied arguments for the condition.
diff --git a/dali/internal/update/common/scene-graph-property-buffer.h b/dali/internal/update/common/scene-graph-property-buffer.h
index 774ab4d..0f82433 100644
--- a/dali/internal/update/common/scene-graph-property-buffer.h
+++ b/dali/internal/update/common/scene-graph-property-buffer.h
@@ -178,7 +178,7 @@ private:
   DoubleBuffered< OwnerPointer<PropertyBufferDataProvider::BufferType> > mBufferData; ///< Data
   DoubleBuffered< bool > mDataChanged; ///< Flag to know if data has changed in a frame
 
-  DoubleBufferedProperty<unsigned int>  mSize; ///< Number of Elements in the buffer
+  DoubleBufferedProperty<int>  mSize; ///< Number of Elements in the buffer
 };
 
 inline void SetFormatMessage( EventThreadServices& eventThreadServices,
diff --git a/dali/internal/update/rendering/scene-graph-sampler.cpp b/dali/internal/update/rendering/scene-graph-sampler.cpp
index 6904183..4c99c8d 100644
--- a/dali/internal/update/rendering/scene-graph-sampler.cpp
+++ b/dali/internal/update/rendering/scene-graph-sampler.cpp
@@ -34,9 +34,9 @@ Sampler::Sampler( const std::string& textureUnitUniformName )
   mVWrapMode( Dali::Sampler::CLAMP_TO_EDGE ),
   mAffectsTransparency( true ),
   mTextureUnitUniformName( textureUnitUniformName ),
-  mTextureId( 0u ),
   mFullyOpaque(true)
 {
+  mTextureId[ 0 ] = mTextureId[ 1 ] = 0u;
 }
 
 Sampler::~Sampler()
@@ -52,7 +52,7 @@ void Sampler::SetTexture( BufferIndex bufferIndex, Integration::ResourceId textu
 {
   if( mTextureId[bufferIndex] != textureId )
   {
-    mTextureId.Set( bufferIndex, textureId );
+    mTextureId[ bufferIndex ] = textureId;
     mConnectionObservers.ConnectionsChanged(*this);
   }
 }
@@ -132,7 +132,7 @@ void Sampler::RemoveConnectionObserver( ConnectionChangePropagator::Observer& ob
 
 void Sampler::ResetDefaultProperties( BufferIndex bufferIndex )
 {
-  mTextureId.CopyPrevious( bufferIndex );
+  mTextureId[ bufferIndex ] = mTextureId[ 1 - bufferIndex ];
   mMinFilter.CopyPrevious( bufferIndex );
   mMagFilter.CopyPrevious( bufferIndex );
   mUWrapMode.CopyPrevious( bufferIndex );
diff --git a/dali/internal/update/rendering/scene-graph-sampler.h b/dali/internal/update/rendering/scene-graph-sampler.h
index f45bafa..f3d0cd7 100644
--- a/dali/internal/update/rendering/scene-graph-sampler.h
+++ b/dali/internal/update/rendering/scene-graph-sampler.h
@@ -183,7 +183,7 @@ public: // Properties
 
 private:
   std::string mTextureUnitUniformName; ///< The name of the uniform of the texture unit
-  DoubleBufferedProperty<unsigned int> mTextureId;
+  Integration::ResourceId mTextureId[ 2 ]; //< double buffered
   ConnectionChangePropagator mConnectionObservers; ///< Connection observers that will be informed when textures change.
   bool mFullyOpaque; // Update only flag - no need for double buffering
 };
diff --git a/dali/public-api/object/handle.h b/dali/public-api/object/handle.h
index 7421f49..daf7d30 100644
--- a/dali/public-api/object/handle.h
+++ b/dali/public-api/object/handle.h
@@ -213,7 +213,6 @@ public:
    *       - Property::BOOLEAN
    *       - Property::FLOAT
    *       - Property::INTEGER
-   *       - Property::UNSIGNED_INTEGER
    *       - Property::VECTOR2
    *       - Property::VECTOR3
    *       - Property::VECTOR4
@@ -236,7 +235,6 @@ public:
    *       - Property::BOOLEAN
    *       - Property::FLOAT
    *       - Property::INTEGER
-   *       - Property::UNSIGNED_INTEGER
    *       - Property::VECTOR2
    *       - Property::VECTOR3
    *       - Property::VECTOR4
diff --git a/dali/public-api/object/property-input.h b/dali/public-api/object/property-input.h
index 24ac833..97aacb2 100644
--- a/dali/public-api/object/property-input.h
+++ b/dali/public-api/object/property-input.h
@@ -77,14 +77,6 @@ public:
   virtual const int& GetInteger() const = 0;
 
   /**
-   * @brief Retrieve an integer value.
-   *
-   * @pre GetType() returns Property::UNSIGNED_INTEGER.
-   * @return The integer value.
-   */
-  virtual const unsigned int& GetUnsignedInteger() const = 0;
-
-  /**
    * @brief Retrieve a Vector2 value.
    *
    * @pre GetType() returns Property::VECTOR2.
diff --git a/dali/public-api/object/property-types.cpp b/dali/public-api/object/property-types.cpp
index 581acb2..a5e8d81 100644
--- a/dali/public-api/object/property-types.cpp
+++ b/dali/public-api/object/property-types.cpp
@@ -29,7 +29,6 @@ const char* const PROPERTY_TYPE_NAMES[] =
   "BOOLEAN",
   "FLOAT",
   "INTEGER",
-  "UNSIGNED_INTEGER",
   "VECTOR2",
   "VECTOR3",
   "VECTOR4",
@@ -47,8 +46,7 @@ const unsigned int PROPERTY_TYPE_NAMES_COUNT = sizeof( PROPERTY_TYPE_NAMES ) / s
 namespace PropertyTypes
 {
 
-DALI_EXPORT_API
-const char* GetName(Property::Type type)
+DALI_EXPORT_API const char* GetName(Property::Type type)
 {
   if (type < PROPERTY_TYPE_NAMES_COUNT )
   {
diff --git a/dali/public-api/object/property-types.h b/dali/public-api/object/property-types.h
index f6409ee..b149268 100644
--- a/dali/public-api/object/property-types.h
+++ b/dali/public-api/object/property-types.h
@@ -63,8 +63,6 @@ inline Property::Type Get<float>()            { return Property::FLOAT;    }
 template <>
 inline Property::Type Get<int>()              { return Property::INTEGER;  }
 template <>
-inline Property::Type Get<unsigned int>()     { return Property::UNSIGNED_INTEGER;  }
-template <>
 inline Property::Type Get<Vector2>()          { return Property::VECTOR2;  }
 template <>
 inline Property::Type Get<Vector3>()          { return Property::VECTOR3;  }
diff --git a/dali/public-api/object/property-value.cpp b/dali/public-api/object/property-value.cpp
index 0494447..addc11b 100644
--- a/dali/public-api/object/property-value.cpp
+++ b/dali/public-api/object/property-value.cpp
@@ -42,11 +42,11 @@ namespace Dali
 namespace
 {
 /**
- * Helper to check if the property value can be read as int/unsigned int/bool
+ * Helper to check if the property value can be read as int/bool
  */
 inline bool IsIntegerType( Property::Type type )
 {
-  return ( Property::BOOLEAN == type )||( Property::INTEGER == type )||(Property::UNSIGNED_INTEGER == type );
+  return ( Property::BOOLEAN == type )||( Property::INTEGER == type );
 }
 }
 
@@ -72,11 +72,6 @@ struct Property::Value::Impl
     integerValue( integerValue )
   { }
 
-  Impl( unsigned int unsignedIntegerValue )
-  : type( Property::UNSIGNED_INTEGER ),
-    unsignedIntegerValue( unsignedIntegerValue )
-  { }
-
   Impl( const Vector2& vectorValue )
   : type( Property::VECTOR2 ),
     vector2Value( new Vector2( vectorValue ) )
@@ -150,8 +145,7 @@ struct Property::Value::Impl
       case Property::NONE :             // FALLTHROUGH
       case Property::BOOLEAN :          // FALLTHROUGH
       case Property::FLOAT :            // FALLTHROUGH
-      case Property::INTEGER :          // FALLTHROUGH
-      case Property::UNSIGNED_INTEGER :
+      case Property::INTEGER :
       {
         break; // nothing to do
       }
@@ -215,7 +209,6 @@ public: // Data
   {
     int integerValue;
     float floatValue;
-    unsigned int unsignedIntegerValue;
     // must use pointers for any class value pre c++ 11
     Vector2* vector2Value;
     Vector3* vector3Value;
@@ -250,11 +243,6 @@ Property::Value::Value( int integerValue )
 {
 }
 
-Property::Value::Value( unsigned int unsignedIntegerValue )
-: mImpl( new Impl( unsignedIntegerValue ) )
-{
-}
-
 Property::Value::Value( const Vector2& vectorValue )
 : mImpl( new Impl( vectorValue ) )
 {
@@ -342,11 +330,6 @@ Property::Value::Value( Type type )
       mImpl = new Impl( 0 );
       break;
     }
-    case Property::UNSIGNED_INTEGER:
-    {
-      mImpl = new Impl( 0U );
-      break;
-    }
     case Property::VECTOR2:
     {
       mImpl = new Impl( Vector2::ZERO );
@@ -445,11 +428,6 @@ Property::Value& Property::Value::operator=( const Property::Value& value )
         mImpl->integerValue = value.mImpl->integerValue;
         break;
       }
-      case Property::UNSIGNED_INTEGER:
-      {
-        mImpl->unsignedIntegerValue = value.mImpl->unsignedIntegerValue;
-        break;
-      }
       case Property::VECTOR2:
       {
         *mImpl->vector2Value = *value.mImpl->vector2Value; // type cannot change in mImpl so vector is allocated
@@ -526,11 +504,6 @@ Property::Value& Property::Value::operator=( const Property::Value& value )
         newImpl = new Impl( value.mImpl->integerValue );
         break;
       }
-      case Property::UNSIGNED_INTEGER:
-      {
-        newImpl = new Impl( value.mImpl->unsignedIntegerValue );
-        break;
-      }
       case Property::VECTOR2:
       {
         newImpl = new Impl( *value.mImpl->vector2Value ); // type cannot change in mImpl so vector is allocated
@@ -656,17 +629,6 @@ bool Property::Value::Get( int& integerValue ) const
   return converted;
 }
 
-bool Property::Value::Get( unsigned int& unsignedIntegerValue ) const
-{
-  bool converted = false;
-  if( mImpl && IsIntegerType( mImpl->type ) )
-  {
-    unsignedIntegerValue = mImpl->unsignedIntegerValue;
-    converted = true;
-  }
-  return converted;
-}
-
 bool Property::Value::Get( Vector2& vectorValue ) const
 {
   bool converted = false;
@@ -831,11 +793,6 @@ std::ostream& operator<<( std::ostream& stream, const Property::Value& value )
          stream << impl.integerValue;
          break;
       }
-      case Dali::Property::UNSIGNED_INTEGER:
-      {
-        stream << impl.unsignedIntegerValue;
-        break;
-      }
       case Dali::Property::VECTOR2:
       {
         stream << *impl.vector2Value;
diff --git a/dali/public-api/object/property-value.h b/dali/public-api/object/property-value.h
index d9a8187..3e93d2f 100644
--- a/dali/public-api/object/property-value.h
+++ b/dali/public-api/object/property-value.h
@@ -65,13 +65,6 @@ public:
   Value( int integerValue );
 
   /**
-   * @brief Create an unsigned integer property value.
-   *
-   * @param [in] unsignedIntegerValue An unsigned integer value.
-   */
-  Value( unsigned int unsignedIntegerValue );
-
-  /**
    * @brief Create a float property value.
    *
    * @param [in] floatValue A floating-point value.
@@ -241,15 +234,6 @@ public:
   bool Get( int& integerValue ) const;
 
   /**
-   * @brief Retrieve an unsigned integer value.
-   *
-   * @pre GetType() returns Property::UNSIGNED_INTEGER.
-   * @param [out] unsignedIntegerValue On return, an unsigned integer value.
-   * @return true if the value is successfully retrieved, false if the type is not convertible
-   */
-  bool Get( unsigned int& unsignedIntegerValue ) const;
-
-  /**
    * @brief Retrieve an integer rectangle.
    *
    * @pre GetType() returns Property::RECTANGLE.
diff --git a/dali/public-api/object/property.h b/dali/public-api/object/property.h
index 144ee07..e7930cb 100644
--- a/dali/public-api/object/property.h
+++ b/dali/public-api/object/property.h
@@ -72,7 +72,6 @@ struct DALI_IMPORT_API Property
     BOOLEAN,         ///< A boolean type
     FLOAT,           ///< A float type
     INTEGER,         ///< An integer type
-    UNSIGNED_INTEGER,///< An unsigned integer type
     VECTOR2,         ///< a vector array of size=2 with float precision
     VECTOR3,         ///< a vector array of size=3 with float precision
     VECTOR4,         ///< a vector array of size=4 with float precision