X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fslider%2Fslider.cpp;h=ed7cda9d408cd08b786a217fd5e4321ffad476df;hp=4e128734965f200e5d89c14d86463196858a6924;hb=d886d0a7b8637b2ad52844096091b63991157ff3;hpb=57869973578f6a0b0f836d396c7232ddb8302c6b diff --git a/dali-toolkit/public-api/controls/slider/slider.cpp b/dali-toolkit/public-api/controls/slider/slider.cpp index 4e12873..ed7cda9 100644 --- a/dali-toolkit/public-api/controls/slider/slider.cpp +++ b/dali-toolkit/public-api/controls/slider/slider.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -15,7 +15,10 @@ * */ +// CLASS HEADER #include + +// INTERNAL INCLUDES #include using namespace Dali; @@ -26,31 +29,17 @@ namespace Dali namespace Toolkit { -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Slider -/////////////////////////////////////////////////////////////////////////////////////////////////// - -// Signals -const char* const Slider::SIGNAL_VALUE_CHANGED = "value-changed"; -const char* const Slider::SIGNAL_MARK = "mark"; - Slider::Slider() { } -Slider::Slider( const Slider& handle ) -: Control( handle ) -{ -} +Slider::Slider( const Slider& handle ) = default; -Slider& Slider::operator=( const Slider& handle ) -{ - if( &handle != this ) - { - Control::operator=( handle ); - } - return *this; -} +Slider::Slider( Slider&& rhs ) = default; + +Slider& Slider::operator=( const Slider& handle ) = default; + +Slider& Slider::operator=( Slider&& rhs ) = default; Slider::Slider(Internal::Slider& implementation) : Control(implementation) @@ -82,9 +71,9 @@ Slider::ValueChangedSignalType& Slider::SlidingFinishedSignal() return GetImpl( *this ).SlidingFinishedSignal(); } -Slider::MarkSignalType& Slider::MarkSignal() +Slider::MarkReachedSignalType& Slider::MarkReachedSignal() { - return GetImpl( *this ).MarkSignal(); + return GetImpl( *this ).MarkReachedSignal(); } Slider Slider::DownCast( BaseHandle handle )