X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fslider%2Fslider.h;h=f5be0d71ec325c269e60b5abdaa888754dfb9809;hb=79f571c4268280bc8384dae746193742f713e745;hp=e2c529e7ed6fbec4f20c0820ef59f9b67aa592b7;hpb=9eecb41468197eb2fc03e55c151011ea387e1bed;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/slider/slider.h b/dali-toolkit/public-api/controls/slider/slider.h index e2c529e..f5be0d7 100644 --- a/dali-toolkit/public-api/controls/slider/slider.h +++ b/dali-toolkit/public-api/controls/slider/slider.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SLIDER_H__ -#define __DALI_TOOLKIT_SLIDER_H__ +#ifndef DALI_TOOLKIT_SLIDER_H +#define DALI_TOOLKIT_SLIDER_H /* - * Copyright (c) 2018 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. @@ -23,10 +23,8 @@ namespace Dali { - namespace Toolkit { - namespace Internal DALI_INTERNAL { class Slider; @@ -50,7 +48,6 @@ class Slider; class DALI_TOOLKIT_API Slider : public Control { public: - // Properties /** @@ -60,7 +57,7 @@ public: enum PropertyRange { PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1, ///< @SINCE_1_1.39 - PROPERTY_END_INDEX = PROPERTY_START_INDEX + 1000 ///< Reserve property indices @SINCE_1_1.39 + PROPERTY_END_INDEX = PROPERTY_START_INDEX + 1000 ///< Reserve property indices @SINCE_1_1.39 }; /** @@ -169,7 +166,6 @@ public: }; public: - /** * @brief Creates the Slider control. * @SINCE_1_1.39 @@ -190,7 +186,15 @@ public: * @SINCE_1_1.39 * @param[in] handle Handle to an object */ - Slider( const Slider& handle ); + Slider(const Slider& handle); + + /** + * @brief Move constructor + * @SINCE_1_9.23 + * + * @param[in] rhs A reference to the moved handle + */ + Slider(Slider&& rhs); /** * @brief Assignment operator. @@ -200,7 +204,16 @@ public: * @param[in] handle Handle to an object * @return A reference to this */ - Slider& operator=( const Slider& handle ); + Slider& operator=(const Slider& handle); + + /** + * @brief Move assignment + * @SINCE_1_9.23 + * + * @param[in] rhs A reference to the moved handle + * @return A reference to this + */ + Slider& operator=(Slider&& rhs); /** * @brief Destructor. @@ -219,21 +232,20 @@ public: * @param[in] handle Handle to an object * @return handle to a Slider or an uninitialized handle */ - static Slider DownCast( BaseHandle handle ); - -public: // Signals + static Slider DownCast(BaseHandle handle); +public: // Signals /** * @brief Value changed signal type. * @SINCE_1_1.39 */ - typedef Signal< bool ( Slider, float ) > ValueChangedSignalType; + typedef Signal ValueChangedSignalType; /** * @brief Mark reached signal type. * @SINCE_1_1.39 */ - typedef Signal< bool ( Slider, int ) > MarkReachedSignalType; + typedef Signal MarkReachedSignalType; /** * @brief Signal emitted when the slider value changes. @@ -272,7 +284,6 @@ public: // Signals MarkReachedSignalType& MarkReachedSignal(); public: // Not intended for application developers - /// @cond internal /** * @brief Creates a handle using the Toolkit::Internal implementation. @@ -288,7 +299,7 @@ public: // Not intended for application developers * @SINCE_1_1.39 * @param[in] internal A pointer to the internal CustomActor */ - explicit DALI_INTERNAL Slider( Dali::Internal::CustomActor* internal ); + explicit DALI_INTERNAL Slider(Dali::Internal::CustomActor* internal); /// @endcond }; @@ -299,4 +310,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_SLIDER_H__ +#endif // DALI_TOOLKIT_SLIDER_H