DALi signals refactor to remove V2 naming

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

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h
index ed8bd32..578756c 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h
@@ -18,10 +18,10 @@
  *
  */
 
-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/constrainable.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -51,7 +51,7 @@ class ScrollConnector;
  * -1 to 1, where -1 shows an attempt the scroll beyond the minimum limit, and 1 shows an attempt the scroll beyond the maximum limit.
  * Zero indicates normal scrolling i.e. when overshoot indicators should be hidden.
  */
-class ScrollConnector : public BaseHandle
+class DALI_IMPORT_API ScrollConnector : public BaseHandle
 {
 public:
 
@@ -63,10 +63,10 @@ public:
 
   // Signals
   static const char* const DOMAIN_CHANGED_SIGNAL_NAME;    ///< "domain-changed" signal name
-  typedef SignalV2< void ( float min, float max, float size ) > DomainChangedSignalType;
+  typedef Signal< void ( float min, float max, float size ) > DomainChangedSignalType;
 
   static const char* const SCROLL_POSITION_CHANGED_SIGNAL_NAME;    ///< "scroll-position-changed" signal name
-  typedef SignalV2< void ( float position ) > ScrollPositionChangedSignalType;
+  typedef Signal< void ( float position ) > ScrollPositionChangedSignalType;
 
   /**
    * Create a ScrollConnector.
@@ -166,7 +166,7 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in] impl The Control implementation.
    */
-  ScrollConnector( Internal::ScrollConnector* impl );
+  explicit DALI_INTERNAL ScrollConnector( Internal::ScrollConnector* impl );
 };
 
 } // namespace Toolkit