Use modern construct 'using' instead of typedef.

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

diff --git a/dali/public-api/actors/layer.h b/dali/public-api/actors/layer.h
index 49cc2af..5ae894b 100644 (file)
--- a/dali/public-api/actors/layer.h
+++ b/dali/public-api/actors/layer.h
@@ -26,7 +26,6 @@
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/math/vector3.h>
-#include <dali/public-api/images/frame-buffer-image.h>
 
 namespace Dali
 {
@@ -46,14 +45,14 @@ class Layer;
  * @SINCE_1_0.0
  * @see Dali::Layer::SetClippingBox()
  */
-typedef Rect<int32_t> ClippingBox;
+using ClippingBox = Rect<int32_t>;
 
 /**
  * @brief Layers provide a mechanism for overlaying groups of actors on top of each other.
  *
- * When added to the stage, a layer can be ordered relative to other
- * layers. The bottom layer is at depth zero. The stage provides a default
- * layer for it's children (see Stage::GetRootLayer()).
+ * When added to a scene, a layer can be ordered relative to other
+ * layers. The bottom layer is at depth zero. A scene provides a default
+ * layer for its children.
  *
  * Layered actors inherit position etc. as normal, but are drawn in an order
  * determined by the layers. In case of LAYER_3D, the depth buffer is cleared
@@ -214,23 +213,12 @@ public:
   };
 
   /**
-   * @DEPRECATED_1_2.26. Not intended for application use.
-   *
-   * @brief Enumeration for TREE_DEPTH_MULTIPLIER is used by the rendering sorting algorithm to decide which actors to render first.
-   * @SINCE_1_0.0
-   */
-  enum TreeDepthMultiplier
-  {
-    TREE_DEPTH_MULTIPLIER = 10000,
-  };
-
-  /**
    * @brief The sort function type.
    *
    * @SINCE_1_0.0
    * @param[in] position This is the actor translation from camera
    */
-  typedef float (*SortFunctionType)( const Vector3& position );
+  using SortFunctionType = float ( * )( const Vector3& );
 
   /**
    * @brief Creates an empty Layer handle.
@@ -285,6 +273,23 @@ public:
   Layer& operator=(const Layer& rhs);
 
   /**
+   * @brief Move constructor.
+   *
+   * @SINCE_1_9.22
+   * @param[in] rhs The layer to move
+   */
+  Layer( Layer&& rhs );
+
+  /**
+   * @brief Move assignment operator.
+   *
+   * @SINCE_1_9.22
+   * @param[in] rhs The layer to move
+   * @return A reference to this
+   */
+  Layer& operator=( Layer&& rhs );
+
+  /**
    * @brief Increments the depth of the layer.
    *
    * @SINCE_1_0.0