DALi Version 1.3.30

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

diff --git a/dali/public-api/object/property-types.h b/dali/public-api/object/property-types.h
index 35d6541..29b52a0 100644 (file)
--- a/dali/public-api/object/property-types.h
+++ b/dali/public-api/object/property-types.h
@@ -2,7 +2,7 @@
 #define __DALI_PROPERTY_TYPES_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -20,6 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/constants.h>
+#include <dali/public-api/common/extents.h>
 #include <dali/public-api/math/angle-axis.h>
 #include <dali/public-api/math/degree.h>
 #include <dali/public-api/math/quaternion.h>
@@ -33,26 +34,33 @@
 
 namespace Dali
 {
+/**
+ * @addtogroup dali_core_object
+ * @{
+ */
 
 /**
  * @brief Template function instances for property getters.
+ * @SINCE_1_0.0
  */
 namespace PropertyTypes
 {
 
 /**
- * @brief Retrieve the name of a property type.
+ * @brief Retrieves the name of a property type.
  *
- * @param [in] type The property type.
- * @return The name of this type.
+ * @SINCE_1_0.0
+ * @param[in] type The property type
+ * @return The name of this type
  */
-DALI_IMPORT_API const char* const GetName(Property::Type type);
+DALI_CORE_API const char* GetName(Property::Type type);
 
 /**
- * @brief Retrieve an enumerated property type.
+ * @brief Retrieves an enumerated property type.
  *
  * New versions of this templated function must be defined for future types.
- * @return The property type.
+ * @SINCE_1_0.0
+ * @return The property type
  */
 template <typename T>
 inline Property::Type Get()                   { return Property::NONE;  }
@@ -63,8 +71,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;  }
@@ -86,10 +92,15 @@ template <>
 inline Property::Type Get<Property::Map>()    { return Property::MAP; }
 template <>
 inline Property::Type Get<Property::Array>()  { return Property::ARRAY; }
+template <>
+inline Property::Type Get<Extents>()          { return Property::EXTENTS; }
 
 
 }; // namespace PropertyTypes
 
+/**
+ * @}
+ */
 } // namespace Dali
 
 #endif // __DALI_PROPERTY_TYPES_H__