X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fobject%2Fproperty-value.h;h=4cb607e34e1e9c9811a72eaa09e9972e853b5199;hb=01c39de261f6eb4e759c7a249e5d67dfef83bca2;hp=cb8d9a6f76e7739b026ae581487d7d9e9c388feb;hpb=d3ed481ebd4bc82474cb1b954c090da84bebfe2c;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/public-api/object/property-value.h b/dali/public-api/object/property-value.h
old mode 100644
new mode 100755
index cb8d9a6..4cb607e
--- a/dali/public-api/object/property-value.h
+++ b/dali/public-api/object/property-value.h
@@ -2,7 +2,7 @@
 #define __DALI_PROPERTY_VALUE_H__
 
 /*
- * Copyright (c) 2016 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.
@@ -25,8 +25,6 @@
 #include <dali/public-api/object/property.h>
 #include <dali/public-api/math/rect.h>
 
-#include <type_traits>
-
 namespace Dali
 {
 /**
@@ -47,7 +45,7 @@ struct Extents;
  * @brief A value-type representing a property value.
  * @SINCE_1_0.0
  */
-class DALI_IMPORT_API Property::Value
+class DALI_CORE_API Property::Value
 {
 public:
 
@@ -188,15 +186,6 @@ public:
   Value( const Extents& extentsValue );
 
   /**
-   * @brief Creates an enumeration property value.
-   *
-   * @SINCE_1_2.62
-   * @param[in] extentsValue A collection of 4 uint16_t values
-   */
-  template <typename T, typename std::enable_if<std::is_enum<typename std::remove_reference<typename std::remove_cv<T>::type>::type>::value>::type* = nullptr>
-  Value(T t) : Value(static_cast<int>(t)) { }
-
-  /**
    * @brief Explicitly sets a type and initialize it.
    *
    * @SINCE_1_0.0
@@ -240,7 +229,7 @@ public:
   /**
    * @brief Retrieves a specific value.
    *
-   * Works on a best-effort approach; if value type is different returns a default value of the type.
+   * Works on a best-effort approach; if value type is not convertible returns a default value of the type.
    *
    * @SINCE_1_0.0
    * @return A value of type T
@@ -254,22 +243,6 @@ public:
   }
 
   /**
-   * @brief Retrieves an enumeration value.
-   *
-   * @SINCE_1_0.0
-   * @param[out] boolValue On return, an enumeration value
-   * @return @c true if the value is successfully retrieved, @c false if the type is different
-   * @pre GetType() is a type convertible to bool.
-   */
-  template <typename T, typename std::enable_if<std::is_enum<typename std::remove_reference<typename std::remove_cv<T>::type>::type>::value>::type* = nullptr>
-  bool Get(T &t) const
-  {
-    int temp = 0;
-    if (!Get(temp)) return false;
-    t = static_cast<T>(temp);
-    return true;
-  }
-  /**
    * @brief Retrieves a boolean value.
    *
    * @SINCE_1_0.0
@@ -439,7 +412,7 @@ public:
    * @brief Output to stream.
    * @SINCE_1_0.0
    */
-  friend std::ostream& operator<<( std::ostream& ouputStream, const Property::Value& value );
+  friend DALI_CORE_API std::ostream& operator<<( std::ostream& ouputStream, const Property::Value& value );
 
 private:
 
@@ -456,7 +429,7 @@ private:
  * @param[in] value The value to insert
  * @return The output stream operator
  */
-DALI_IMPORT_API std::ostream& operator<<( std::ostream& ouputStream, const Property::Value& value );
+DALI_CORE_API std::ostream& operator<<( std::ostream& ouputStream, const Property::Value& value );
 
 /**
  * @}