[dali_1.9.23] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / image-view / image-view.h

diff --git a/dali-toolkit/public-api/controls/image-view/image-view.h b/dali-toolkit/public-api/controls/image-view/image-view.h
index 76c6f54..b2fc518 100644 (file)
--- a/dali-toolkit/public-api/controls/image-view/image-view.h
+++ b/dali-toolkit/public-api/controls/image-view/image-view.h
@@ -104,13 +104,11 @@ public:
     {
       // Event side properties
 
-      RESERVED_PROPERTY_01 = PROPERTY_START_INDEX, ///< Reserved index for a removed property.
-
       /**
        * @brief name "image", type string if it is a url, map otherwise.
        * @SINCE_1_0.0
        */
-      IMAGE,
+      IMAGE = PROPERTY_START_INDEX,
 
       /**
        * @brief name "preMultipliedAlpha", type Boolean.
@@ -196,6 +194,14 @@ public:
   ImageView( const ImageView& imageView );
 
   /**
+   * @brief Move constructor
+   * @SINCE_1_9.23
+   *
+   * @param[in] rhs A reference to the moved handle
+   */
+  ImageView( ImageView&& rhs );
+
+  /**
    * @brief Assignment operator.
    *
    * @SINCE_1_0.0
@@ -205,6 +211,15 @@ public:
   ImageView& operator=( const ImageView& imageView );
 
   /**
+   * @brief Move assignment
+   * @SINCE_1_9.23
+   *
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  ImageView& operator=( ImageView&& rhs );
+
+  /**
    * @brief Downcasts a handle to ImageView handle.
    *
    * If handle points to a ImageView, the downcast produces valid handle.