Merge "Updated test suite following platform abstraction change" into tizen

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

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp
index 8c37842..30e95d0 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp
@@ -391,16 +391,6 @@ void ScrollView::SetRulerY(RulerPtr ruler)
   GetImpl(*this).SetRulerY(ruler);
 }
 
-void ScrollView::SetRulerScaleX(RulerPtr ruler)
-{
-  DALI_LOG_ERROR( "Deprecated" );
-}
-
-void ScrollView::SetRulerScaleY(RulerPtr ruler)
-{
-  DALI_LOG_ERROR( "Deprecated" );
-}
-
 void ScrollView::SetScrollSensitive(bool sensitive)
 {
   GetImpl(*this).SetScrollSensitive(sensitive);
@@ -436,16 +426,6 @@ void ScrollView::SetWrapMode(bool enable)
   GetImpl(*this).SetWrapMode(enable);
 }
 
-int ScrollView::GetRefreshInterval() const
-{
-  return GetImpl(*this).GetRefreshInterval();
-}
-
-void ScrollView::SetRefreshInterval(int milliseconds)
-{
-  GetImpl(*this).SetRefreshInterval(milliseconds);
-}
-
 int ScrollView::GetScrollUpdateDistance() const
 {
   return GetImpl(*this).GetScrollUpdateDistance();
@@ -546,31 +526,11 @@ void ScrollView::SetScrollPosition(const Vector3& position)
   GetImpl(*this).SetScrollPosition(position);
 }
 
-Vector3 ScrollView::GetCurrentScrollScale() const
-{
-  DALI_LOG_ERROR( "Deprecated" );
-  return Vector3::ONE;
-}
-
 unsigned int ScrollView::GetCurrentPage() const
 {
   return GetImpl(*this).GetCurrentPage();
 }
 
-void ScrollView::TransformTo(const Vector3& position, const Vector3& scale, float rotation)
-{
-  DALI_LOG_ERROR( "Deprecated" );
-
-  GetImpl(*this).TransformTo(position);
-}
-
-void ScrollView::TransformTo(const Vector3& position, const Vector3& scale, float rotation, float duration)
-{
-  DALI_LOG_ERROR( "Deprecated" );
-
-  GetImpl(*this).TransformTo(position, duration);
-}
-
 void ScrollView::ScrollTo(const Vector3 &position)
 {
   GetImpl(*this).ScrollTo(position);
@@ -617,16 +577,6 @@ bool ScrollView::ScrollToSnapPoint()
   return GetImpl(*this).ScrollToSnapPoint();
 }
 
-void ScrollView::ScaleTo(const Vector3 &scale)
-{
-  DALI_LOG_ERROR( "Deprecated" );
-}
-
-void ScrollView::ScaleTo(const Vector3 &scale, float duration)
-{
-  DALI_LOG_ERROR( "Deprecated" );
-}
-
 void ScrollView::ApplyConstraintToChildren(Constraint constraint)
 {
   GetImpl(*this).ApplyConstraintToChildren(constraint);