X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2FTET%2Fdali-test-suite%2Fslider%2Futc-Dali-Slider.cpp;h=9f7611c53b783fa78c5534a5f2b027e6db6603fd;hb=cbed2075b18f7fe2151d9a38e0406a47c834f5db;hp=13cd708d9959da6103a8747c9689648b08e44201;hpb=fa6279fb2830427d5ab569ca14e6ade1557ef2fa;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/TET/dali-test-suite/slider/utc-Dali-Slider.cpp b/automated-tests/TET/dali-test-suite/slider/utc-Dali-Slider.cpp index 13cd708..9f7611c 100644 --- a/automated-tests/TET/dali-test-suite/slider/utc-Dali-Slider.cpp +++ b/automated-tests/TET/dali-test-suite/slider/utc-Dali-Slider.cpp @@ -1,18 +1,19 @@ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ #include @@ -161,8 +162,8 @@ static void UtcDaliSliderSignals() { marks.push_back( MIN_BOUND + ( static_cast(i) / ( NUM_MARKS - 1) ) * ( MAX_BOUND - MIN_BOUND ) ); } - slider.SetProperty( slider.GetPropertyIndex( Slider::MARKS_PROPERTY_NAME ), marks ); - slider.SetProperty( slider.GetPropertyIndex( Slider::MARK_TOLERANCE_PROPERTY_NAME ), 0.1f ); + slider.SetProperty( Slider::MARKS_PROPERTY, marks ); + slider.SetProperty( Slider::MARK_TOLERANCE_PROPERTY, 0.1f ); slider.ValueChangedSignal().Connect( &OnSliderValueChanged ); slider.MarkSignal().Connect( &OnSliderMark );