X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fslider%2Fslider.cpp;h=ba60716445c3bf421e10e3d60adc5f3ce818fd90;hb=2e42ad28cef7d57f759a489710d1f46016fbe3da;hp=4e128734965f200e5d89c14d86463196858a6924;hpb=f4d559ea999cbbc44b1ecd489c4ca3711d37feca;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/slider/slider.cpp b/dali-toolkit/public-api/controls/slider/slider.cpp index 4e12873..ba60716 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,50 +15,37 @@ * */ +// CLASS HEADER #include + +// INTERNAL INCLUDES #include using namespace Dali; 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) { } -Slider::Slider( Dali::Internal::CustomActor* internal ) -: Control( internal ) +Slider::Slider(Dali::Internal::CustomActor* internal) +: Control(internal) { VerifyCustomActorPointer(internal); } @@ -74,26 +61,24 @@ Slider::~Slider() Slider::ValueChangedSignalType& Slider::ValueChangedSignal() { - return GetImpl( *this ).ValueChangedSignal(); + return GetImpl(*this).ValueChangedSignal(); } Slider::ValueChangedSignalType& Slider::SlidingFinishedSignal() { - return GetImpl( *this ).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 ) +Slider Slider::DownCast(BaseHandle handle) { return Control::DownCast(handle); } - - } // namespace Toolkit } // namespace Dali