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-Slider.cpp;h=4025514e05393c992d25bcb1c349314569a6405c;hp=0b0463f553bff0e2e9bf4a92a755f4690b54792e;hb=4d39084f8e8479ee521dcaae09aa94e76d965d98;hpb=214fe01378440e2ae1f953c61d68e2793184cc16 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp index 0b0463f..4025514 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp @@ -20,7 +20,7 @@ #include #include #include - +#include using namespace Dali; using namespace Dali::Toolkit; @@ -125,7 +125,7 @@ int UtcDaliSliderSignals(void) Stage::GetCurrent().Add( slider ); slider.SetParentOrigin(ParentOrigin::TOP_LEFT); slider.SetAnchorPoint(ParentOrigin::TOP_LEFT); - slider.SetSize( Stage::GetCurrent().GetSize().x, 20.0f ); + slider.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) ); slider.SetPosition( 0.0f, 0.0f ); const float MIN_BOUND = 0.0f; @@ -134,10 +134,10 @@ int UtcDaliSliderSignals(void) Property::Array marks; for( int i = 0; i < NUM_MARKS; ++i ) { - marks.push_back( MIN_BOUND + ( static_cast(i) / ( NUM_MARKS - 1) ) * ( MAX_BOUND - MIN_BOUND ) ); + marks.PushBack( MIN_BOUND + ( static_cast(i) / ( NUM_MARKS - 1) ) * ( MAX_BOUND - MIN_BOUND ) ); } - slider.SetProperty( Slider::MARKS_PROPERTY, marks ); - slider.SetProperty( Slider::MARK_TOLERANCE_PROPERTY, 0.1f ); + slider.SetProperty( Slider::Property::MARKS, marks ); + slider.SetProperty( Slider::Property::MARK_TOLERANCE, 0.1f ); slider.ValueChangedSignal().Connect( &OnSliderValueChanged ); slider.MarkSignal().Connect( &OnSliderMark );