Changed all property & signal names to lowerCamelCase

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / buttons / push-button.h

diff --git a/dali-toolkit/public-api/controls/buttons/push-button.h b/dali-toolkit/public-api/controls/buttons/push-button.h
index 31684b3..48ad719 100644 (file)
--- a/dali-toolkit/public-api/controls/buttons/push-button.h
+++ b/dali-toolkit/public-api/controls/buttons/push-button.h
@@ -68,11 +68,11 @@ public:
   {
     enum
     {
-      UNSELECTED_ICON = PROPERTY_START_INDEX, ///< Property, name "unselected-icon", type std::string
-      SELECTED_ICON,                          ///< Property, name "selected-icon",   type std::string
-      ICON_ALIGNMENT,                         ///< Property, name "icon-alignment",  type std::string
-      LABEL_PADDING,                          ///< Property, name "label-padding",   type Vector4
-      ICON_PADDING,                           ///< Property, name "icon-padding",    type Vector4
+      UNSELECTED_ICON = PROPERTY_START_INDEX, ///< Property, name "unselectedIcon",  type std::string
+      SELECTED_ICON,                          ///< Property, name "selectedIcon",    type std::string
+      ICON_ALIGNMENT,                         ///< Property, name "iconAlignment",   type std::string
+      LABEL_PADDING,                          ///< Property, name "labelPadding",    type Vector4
+      ICON_PADDING,                           ///< Property, name "iconPadding",     type Vector4
     };
   };
 
@@ -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 );