Rearrange doxygen tags for recently deprecated or new APIs

Change-Id: Ie4b387e3b4267cd9895a5d0d07b8ec5a638ee7f2

diff --git a/dali-toolkit/public-api/controls/buttons/button.h b/dali-toolkit/public-api/controls/buttons/button.h
index 4c40ac8..abb119f 100644 (file)
--- a/dali-toolkit/public-api/controls/buttons/button.h
+++ b/dali-toolkit/public-api/controls/buttons/button.h
@@ -326,46 +326,46 @@ public:
   // Deprecated API
 
   /**
-   * @brief Sets the label with an actor.
-   *
    * @deprecated DALi 1.0.50
    *
+   * @brief Sets the label with an actor.
+   *
    * @param[in]  label The actor to use as a label
    */
   void SetLabel( Actor label );
 
   /**
-   * @brief Sets the button image.
-   *
    * @deprecated DALi 1.0.50
    *
+   * @brief Sets the button image.
+   *
    * @param[in]  image The button image.
    */
   void SetButtonImage( Image image );
 
   /**
-   * @brief Sets the selected image.
-   *
    * @deprecated DALi 1.0.50
    *
+   * @brief Sets the selected image.
+   *
    * @param[in]  image The selected image.
    */
   void SetSelectedImage( Image image );
 
   /**
-   * @brief Gets the button image.
-   *
    * @deprecated DALi 1.0.50
    *
+   * @brief Gets the button image.
+   *
    * @return     An actor with the button image.
    */
   Actor GetButtonImage() const;
 
   /**
-   * @brief Gets the selected image.
-   *
    * @deprecated DALi 1.0.50
    *
+   * @brief Gets the selected image.
+   *
    * @return     An actor with the selected image.
    */
   Actor GetSelectedImage() const;

diff --git a/dali-toolkit/public-api/controls/buttons/push-button.h b/dali-toolkit/public-api/controls/buttons/push-button.h
index 31684b3..c887574 100644 (file)
--- a/dali-toolkit/public-api/controls/buttons/push-button.h
+++ b/dali-toolkit/public-api/controls/buttons/push-button.h
@@ -126,10 +126,10 @@ public:
   using Button::SetButtonImage;
 
   /**
-   * @brief Sets the unselected image with an Actor.
-   *
    * @deprecated DALi 1.0.50
    *
+   * @brief Sets the unselected image with an Actor.
+   *
    * @param[in] image The Actor to use.
    */
   void SetButtonImage( Actor image );
@@ -137,10 +137,10 @@ public:
   using Button::SetBackgroundImage;
 
   /**
-   * @brief Sets the background image with an Actor.
-   *
    * @deprecated DALi 1.0.50
    *
+   * @brief Sets the background image with an Actor.
+   *
    * @param[in] image The Actor to use.
    */
   void SetBackgroundImage( Actor image );
@@ -148,10 +148,10 @@ public:
   using Button::SetSelectedImage;
 
   /**
-   * @brief Sets the selected image with an Actor.
-   *
    * @deprecated DALi 1.0.50
    *
+   * @brief Sets the selected image with an Actor.
+   *
    * @param[in] image The Actor to use.
    */
   void SetSelectedImage( Actor image );
@@ -159,10 +159,10 @@ public:
   using Button::SetSelectedBackgroundImage;
 
   /**
-   * @brief Sets the selected background image with an Actor.
-   *
    * @deprecated DALi 1.0.50
    *
+   * @brief Sets the selected background image with an Actor.
+   *
    * @param[in] image The Actor to use.
    */
   void SetSelectedBackgroundImage( Actor image );
@@ -170,10 +170,10 @@ public:
   using Button::SetDisabledBackgroundImage;
 
   /**
-   * @brief Sets the disabled background image with an Actor.
-   *
    * @deprecated DALi 1.0.50
    *
+   * @brief Sets the disabled background image with an Actor.
+   *
    * @param[in] image The Actor to use.
    */
   void SetDisabledBackgroundImage( Actor image );
@@ -181,10 +181,10 @@ public:
   using Button::SetDisabledImage;
 
   /**
-   * @brief Sets the disabled image with an Actor.
-   *
    * @deprecated DALi 1.0.50
    *
+   * @brief Sets the disabled image with an Actor.
+   *
    * @param[in] image The Actor to use.
    */
   void SetDisabledImage( Actor image );
@@ -192,10 +192,10 @@ public:
   using Button::SetDisabledSelectedImage;
 
   /**
-   * @brief Sets the disabled selected image with an Actor.
-   *
    * @deprecated DALi 1.0.50
    *
+   * @brief Sets the disabled selected image with an Actor.
+   *
    * @param[in] image The Actor to use.
    */
   void SetDisabledSelectedImage( Actor image );

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 a65f649..4e98ccb 100644 (file)
--- a/dali-toolkit/public-api/controls/image-view/image-view.h
+++ b/dali-toolkit/public-api/controls/image-view/image-view.h
@@ -141,9 +141,9 @@ public:
    *
    * If the handle is empty, ImageView will display nothing
    *
-   * @param[in] url The Image resource to display.
-   *
    * @since DALi 1.1.4
+   *
+   * @param[in] url The Image resource to display.
    */
   void SetImage( const std::string& url );
 

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
index 8099c26..9898791 100644 (file)
--- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
+++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
@@ -36,7 +36,8 @@ class PageTurnView;
 }
 
 /**
- * PageTurnView is a base class of different mode of pageTurnViews ( portrait or landscape )
+ * @brief PageTurnView is a base class of different mode of pageTurnViews ( portrait or landscape )
+ *
  * Page actors are provided from an external PageFactory
  * PanGesture is used to activate the page bending, streching and tuning forward/backward
  *