Remove dependency to std::vector and property::value from property notification API 85/39285/1
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Tue, 12 May 2015 12:49:58 +0000 (13:49 +0100)
committerKimmo Hoikka <kimmo.hoikka@samsung.com>
Tue, 12 May 2015 12:49:58 +0000 (13:49 +0100)
Change-Id: I606e7860fcc8c8ea1cc1cc38db2961b56a12870d

dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp
dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h

index 2bcca2f..10b4820 100755 (executable)
@@ -219,7 +219,7 @@ void ScrollBar::ApplyConstraints()
   }
 }
 
-void ScrollBar::SetPositionNotifications( const std::vector<float>& positions )
+void ScrollBar::SetPositionNotifications( const Dali::Vector<float>& positions )
 {
   if(mScrollPositionObject)
   {
index f6e85dd..31780eb 100755 (executable)
@@ -90,7 +90,7 @@ public:
   /**
    * @copydoc Toolkit::ScrollBar::SetPositionNotifications()
    */
-  void SetPositionNotifications( const std::vector<float>& positions );
+  void SetPositionNotifications( const Dali::Vector<float>& positions );
 
   /**
    * @copydoc Toolkit::ScrollBar::SetIndicatorHeightPolicy()
index 0ca355d..e738495 100755 (executable)
@@ -80,7 +80,7 @@ Actor ScrollBar::GetScrollIndicator()
   return GetImpl(*this).GetScrollIndicator();
 }
 
-void ScrollBar::SetPositionNotifications( const std::vector<float>& positions )
+void ScrollBar::SetPositionNotifications( const Dali::Vector<float>& positions )
 {
   GetImpl(*this).SetPositionNotifications(positions);
 }
index 6adfd17..0a5fe64 100755 (executable)
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/common/dali-vector.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component.h>
@@ -158,7 +158,7 @@ public:
    *
    * @param[in] positions List of values to receive notifications for when the current scroll position crosses them
    */
-  void SetPositionNotifications( const std::vector<float>& positions );
+  void SetPositionNotifications( const Dali::Vector<float>& positions );
 
   /**
    * @brief Sets the height policy of scroll indicator to have either variable or fixed height.