DALi signals refactor to remove V2 naming

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

diff --git a/base/dali-toolkit/public-api/controls/buttons/push-button.h b/base/dali-toolkit/public-api/controls/buttons/push-button.h
index 658dbae..f5c5251 100644 (file)
--- a/base/dali-toolkit/public-api/controls/buttons/push-button.h
+++ b/base/dali-toolkit/public-api/controls/buttons/push-button.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include "button.h"
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -75,7 +75,7 @@ class PushButton;
  *
  * Is not mandatory set all images. A button could be defined only by setting its \e background image or by setting its \e background and \e pressed images.
  */
-class PushButton : public Button
+class DALI_IMPORT_API PushButton : public Button
 {
 public:
 
@@ -333,20 +333,20 @@ public:
 public: //Signals
 
   /// @brief PushButton Pressed signal type.
-  typedef SignalV2< bool ( Button ) > PressedSignalV2;
+  typedef Signal< bool ( Button ) > PressedSignalType;
 
   /// @brief PushButton Released signal type.
-  typedef SignalV2< bool ( Button ) > ReleasedSignalV2;
+  typedef Signal< bool ( Button ) > ReleasedSignalType;
 
   /**
    * @brief Signal emitted when the button is touched.
    */
-  PressedSignalV2& PressedSignal();
+  PressedSignalType& PressedSignal();
 
   /**
    * @brief Signal emitted when the button is touched and the touch point leaves the boundary of the button.
    */
-  ReleasedSignalV2& ReleasedSignal();
+  ReleasedSignalType& ReleasedSignal();
 
 public: // Not intended for application developers
 
@@ -355,14 +355,14 @@ public: // Not intended for application developers
    *
    * @param[in]  implementation  The Control implementation.
    */
-  PushButton( Internal::PushButton& implementation );
+  DALI_INTERNAL PushButton( Internal::PushButton& implementation );
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  PushButton( Dali::Internal::CustomActor* internal );
+  DALI_INTERNAL PushButton( Dali::Internal::CustomActor* internal );
 };
 
 } // namespace Toolkit