DALi signals refactor to remove V2 naming

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

diff --git a/base/dali-toolkit/public-api/controls/popup/popup.h b/base/dali-toolkit/public-api/controls/popup/popup.h
index 4806137..0c876a2 100644 (file)
--- a/base/dali-toolkit/public-api/controls/popup/popup.h
+++ b/base/dali-toolkit/public-api/controls/popup/popup.h
@@ -22,7 +22,7 @@
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -63,7 +63,7 @@ class Button;
  * A popup can use various custom transition effects, e.g.
  * Alpha fade, Scaling transition, position/rotation, shader effects.
  */
-class Popup : public Control
+class DALI_IMPORT_API Popup : public Control
 {
 
 public:
@@ -82,18 +82,18 @@ public:
     POPUP_SHOW,               ///< Shown (visible in default size)
   };
 
-  typedef SignalV2< void () > TouchedOutsideSignalV2; ///< Touched outside signal type.
-  typedef SignalV2< void () > HiddenSignalV2;         ///< Hidden signal type.
+  typedef Signal< void () > TouchedOutsideSignalType; ///< Touched outside signal type.
+  typedef Signal< void () > HiddenSignalType;         ///< Hidden signal type.
 
   /**
    * @brief Signal emitted when user has touched outside of the Dialog.
    */
-  TouchedOutsideSignalV2& OutsideTouchedSignal();
+  TouchedOutsideSignalType& OutsideTouchedSignal();
 
   /**
    * @brief Signal emitted when popup has been hidden.
    */
-  HiddenSignalV2& HiddenSignal();
+  HiddenSignalType& HiddenSignal();
 
 public:
 
@@ -257,14 +257,14 @@ public: // Not intended for application developers
    *
    * @param[in]  implementation  The Control implementation.
    */
-  Popup(Internal::Popup& implementation);
+  DALI_INTERNAL Popup(Internal::Popup& implementation);
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  Popup( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL Popup( Dali::Internal::CustomActor* internal );
 };
 
 } // namespace Toolkit