[4.0] Add Property::EXTENTS type

[platform/core/uifw/dali-core.git] / dali / public-api / object / property-types.cpp

diff --git a/dali/public-api/object/property-types.cpp b/dali/public-api/object/property-types.cpp
index 09ce79b..7f6e398 100644 (file)
--- a/dali/public-api/object/property-types.cpp
+++ b/dali/public-api/object/property-types.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,19 +18,17 @@
 // CLASS HEADER
 #include <dali/public-api/object/property-types.h>
 
-namespace Dali DALI_EXPORT_API
+namespace Dali
 {
 
-namespace PropertyTypes
+namespace
 {
-
-static const char* PROPERTY_TYPE_NAMES[Property::TYPE_COUNT] =
+const char* const PROPERTY_TYPE_NAMES[] =
 {
   "NONE",
   "BOOLEAN",
   "FLOAT",
   "INTEGER",
-  "UNSIGNED_INTEGER",
   "VECTOR2",
   "VECTOR3",
   "VECTOR4",
@@ -41,11 +39,17 @@ static const char* PROPERTY_TYPE_NAMES[Property::TYPE_COUNT] =
   "STRING",
   "ARRAY",
   "MAP",
+  "EXTENTS",
 };
+const unsigned int PROPERTY_TYPE_NAMES_COUNT = sizeof( PROPERTY_TYPE_NAMES ) / sizeof( const char* );
+}
+
+namespace PropertyTypes
+{
 
-const char* GetName(Property::Type type)
+DALI_EXPORT_API const char* GetName(Property::Type type)
 {
-  if (type < Property::TYPE_COUNT)
+  if (type < PROPERTY_TYPE_NAMES_COUNT )
   {
     return PROPERTY_TYPE_NAMES[type];
   }
@@ -53,24 +57,6 @@ const char* GetName(Property::Type type)
   return PROPERTY_TYPE_NAMES[Property::NONE];
 }
 
-template <typename T> Property::Type Get()             { return Property::NONE;  }
-template <>           Property::Type Get<bool>()       { return Property::BOOLEAN;  }
-template <>           Property::Type Get<float>()      { return Property::FLOAT;    }
-template <>           Property::Type Get<int>()        { return Property::INTEGER;  }
-template <>           Property::Type Get<unsigned int>(){ return Property::UNSIGNED_INTEGER;  }
-template <>           Property::Type Get<Vector2>()    { return Property::VECTOR2;  }
-template <>           Property::Type Get<Vector3>()    { return Property::VECTOR3;  }
-template <>           Property::Type Get<Vector4>()    { return Property::VECTOR4;  }
-template <>           Property::Type Get<Matrix3>()    { return Property::MATRIX3;  }
-template <>           Property::Type Get<Matrix>()     { return Property::MATRIX;  }
-template <>           Property::Type Get<AngleAxis>()  { return Property::ROTATION; } // Rotation has two representations
-template <>           Property::Type Get<Quaternion>() { return Property::ROTATION; } // Rotation has two representations
-template <>           Property::Type Get<std::string>(){ return Property::STRING; }
-template <>           Property::Type Get<Dali::Rect<int> >(){ return Property::RECTANGLE; }
-template <>           Property::Type Get<Property::Map>() { return Property::MAP; }
-template <>           Property::Type Get<Property::Array>() { return Property::ARRAY; }
-
-
 }; // namespace PropertyTypes
 
 } // namespace Dali