From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Tue, 12 May 2015 12:49:58 +0000 (+0100)
Subject: Remove dependency to std::vector and property::value from property notification API
X-Git-Tag: accepted/tizen/common/20150529.134100~43
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=5ff76a127dce1541de4f27d29db5e019d80363e0;hp=-c

Remove dependency to std::vector and property::value from property notification API

Change-Id: I606e7860fcc8c8ea1cc1cc38db2961b56a12870d
---

5ff76a127dce1541de4f27d29db5e019d80363e0
diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
index 2bcca2f..10b4820 100755
--- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
@@ -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)
   {
diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
index f6e85dd..31780eb 100755
--- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
+++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
@@ -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()
diff --git a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp
index 0ca355d..e738495 100755
--- a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp
+++ b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp
@@ -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);
 }
diff --git a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
index 6adfd17..0a5fe64 100755
--- a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
+++ b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
@@ -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.