X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ScrollView.cpp;h=99613a508659d5b5baf3fff63ab7d51657281e5c;hp=109658bfc05e1a64d4ad3fbda561da70b0aa697c;hb=83dd0b674417c4b93d920a9c56c8839d6bef6cc6;hpb=851f310dc14f9a8ea99b458519c84533e57e3e92

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp
index 109658b..99613a5 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp
@@ -21,8 +21,6 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/pan-gesture-event.h>
-#include <dali-toolkit/devel-api/controls/scrollable/scroll-view/scroll-view-devel.h>
-#include <dali-toolkit/devel-api/controls/scrollable/scroll-view/scroll-mode.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -646,7 +644,7 @@ int UtcDaliToolkitScrollModeP1(void)
   rulerMap.Add( ScrollMode::X_AXIS_SNAP_TO_INTERVAL, pageSize.width );
   rulerMap.Add( ScrollMode::X_AXIS_SCROLL_BOUNDARY, pageSize.width*3 );
   rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, false );
-  scrollView.SetProperty( DevelScrollView::Property::SCROLL_MODE, rulerMap);
+  scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
 
   scrollView.SetWrapMode( false );
   scrollView.SetScrollSensitive( true );
@@ -702,7 +700,7 @@ int UtcDaliToolkitScrollModeP2(void)
   rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, true );
   rulerMap.Add( ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, pageSize.height );
   rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_BOUNDARY, pageSize.height*3 );
-  scrollView.SetProperty( DevelScrollView::Property::SCROLL_MODE, rulerMap);
+  scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
 
   scrollView.SetWrapMode( false );
   scrollView.SetScrollSensitive( true );
@@ -758,7 +756,7 @@ int UtcDaliToolkitScrollModeP3(void)
   rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, true );
   rulerMap.Add( ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, pageSize.height );
   rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_BOUNDARY, pageSize.height*3 );
-  scrollView.SetProperty( DevelScrollView::Property::SCROLL_MODE, rulerMap);
+  scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
 
   scrollView.SetWrapMode( false );
   scrollView.SetScrollSensitive( true );
@@ -812,7 +810,7 @@ int UtcDaliToolkitScrollModeP4(void)
   Property::Map rulerMap;
   rulerMap.Add( ScrollMode::X_AXIS_SCROLL_ENABLED, true );
   rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, true );
-  scrollView.SetProperty( DevelScrollView::Property::SCROLL_MODE, rulerMap);
+  scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
 
   scrollView.SetWrapMode( false );
   scrollView.SetScrollSensitive( true );