[dali_2.3.29] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / devel-api / animation / path-constrainer.h

diff --git a/dali/devel-api/animation/path-constrainer.h b/dali/devel-api/animation/path-constrainer.h
index 6790a25..3115626 100644 (file)
--- a/dali/devel-api/animation/path-constrainer.h
+++ b/dali/devel-api/animation/path-constrainer.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PATH_CONSTRAINER_H__
-#define __DALI_PATH_CONSTRAINER_H__
+#ifndef DALI_PATH_CONSTRAINER_H
+#define DALI_PATH_CONSTRAINER_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -28,10 +28,9 @@
 
 namespace Dali
 {
-
 namespace Internal DALI_INTERNAL
 {
-  class PathConstrainer;
+class PathConstrainer;
 }
 /**
  * @brief
@@ -41,10 +40,9 @@ namespace Internal DALI_INTERNAL
  * the tangent of the path given a forward vector in object's local space.
  *
  */
-class DALI_IMPORT_API PathConstrainer : public Handle
+class DALI_CORE_API PathConstrainer : public Handle
 {
 public:
-
   /**
    * @brief An enumeration of properties belonging to the PathConstrainer class.
    */
@@ -52,9 +50,9 @@ public:
   {
     enum
     {
-      FORWARD   =  DEFAULT_OBJECT_PROPERTY_START_INDEX, ///< name "forward" type Vector3
-      POINTS,                                           ///< name "points" type Array of Vector3
-      CONTROL_POINTS                                    ///< name "control-points" type Array of Vector3
+      FORWARD = DEFAULT_OBJECT_PROPERTY_START_INDEX, ///< name "forward" type Vector3
+      POINTS,                                        ///< name "points" type Array of Vector3
+      CONTROL_POINTS                                 ///< name "controlPoints" type Array of Vector3
     };
   };
 
@@ -73,7 +71,7 @@ public:
    * @param[in] handle to An object
    * @return handle to a PathConstrainer object or an uninitialized handle
    */
-  static PathConstrainer DownCast( BaseHandle handle );
+  static PathConstrainer DownCast(BaseHandle handle);
 
   /**
    * @brief Create an uninitialized PathConstrainer handle.
@@ -113,14 +111,14 @@ public:
    * @param[in] range The range of values in the source property which will be mapped to [0,1]
    * @param[in] wrap Wrapping domain. Source property will be wrapped in the domain [wrap.x,wrap.y] before mapping to [0,1]
    */
-  void Apply( Dali::Property target, Dali::Property source, const Vector2& range, const Vector2& wrap = Vector2(-FLT_MAX, FLT_MAX) );
+  void Apply(Dali::Property target, Dali::Property source, const Vector2& range, const Vector2& wrap = Vector2(-FLT_MAX, FLT_MAX));
 
   /**
    * @brief Removes the path constraint in the target object
    *
    * @param[in] target A handle to an object constrained by the PathConstrainer
    */
-  void Remove( Dali::Handle& target );
+  void Remove(Dali::Handle& target);
 
 public: // Not intended for application developers
   /**
@@ -133,4 +131,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_PATH_CONSTRAINER_H__
+#endif // DALI_PATH_CONSTRAINER_H