Apply deprecate macro and LOG

[platform/core/uifw/dali-core.git] / dali / public-api / actors / actor.h

diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h
index 4e9731b..b36b899 100644 (file)
--- a/dali/public-api/actors/actor.h
+++ b/dali/public-api/actors/actor.h
@@ -248,6 +248,10 @@ public:
    */
   struct Property
   {
+    /**
+     * @brief An enumeration of properties belonging to the Actor class.
+     * @SINCE_1_0.0
+     */
     enum
     {
       PARENT_ORIGIN = DEFAULT_ACTOR_PROPERTY_START_INDEX, ///< name "parentOrigin",          type Vector3     (constraint-input) @SINCE_1_0.0
@@ -303,7 +307,7 @@ public:
       MINIMUM_SIZE,                                       ///< name "minimumSize",           type Vector2     @SINCE_1_0.0
       MAXIMUM_SIZE,                                       ///< name "maximumSize",           type Vector2     @SINCE_1_0.0
       INHERIT_POSITION,                                   ///< name "inheritPosition",       type bool        @SINCE_1_1.24
-      CLIPPING_MODE,                                      ///< name "clippingMode",          type String      @SINCE_1_2.5
+      CLIPPING_MODE,                                      ///< name "clippingMode",          type String      @SINCE_1_2_5
     };
   };
 
@@ -767,7 +771,7 @@ public:
    * @pre The Actor has been initialized.
    * @see PositionInheritanceMode
    */
-  void SetPositionInheritanceMode( PositionInheritanceMode mode );
+  void SetPositionInheritanceMode( PositionInheritanceMode mode ) DALI_DEPRECATED_API;
 
   /**
    * @brief Set whether a child actor inherits it's parent's position.
@@ -791,7 +795,7 @@ public:
    * @return Return the position inheritance mode.
    * @pre The Actor has been initialized.
    */
-  PositionInheritanceMode GetPositionInheritanceMode() const;
+  PositionInheritanceMode GetPositionInheritanceMode() const DALI_DEPRECATED_API;
 
   /**
    * @brief Returns whether the actor inherits its parent's position.
@@ -1444,7 +1448,7 @@ public: // Signals
    * @return The signal to connect to.
    * @pre The Actor has been initialized.
    */
-  TouchSignalType& TouchedSignal();
+  TouchSignalType& TouchedSignal() DALI_DEPRECATED_API;
 
   /**
    * @brief This signal is emitted when touch input is received.