[dali_2.3.24] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / slider / slider.h

diff --git a/dali-toolkit/public-api/controls/slider/slider.h b/dali-toolkit/public-api/controls/slider/slider.h
index 83e2b5c..729c79d 100644 (file)
--- 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) 2016 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;
@@ -47,10 +45,9 @@ class Slider;
  * | slidingFinished   | @ref SlidingFinishedSignal()  |
  * @SINCE_1_1.39
  */
-class DALI_IMPORT_API Slider : public Control
+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) noexcept;
 
   /**
    * @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) noexcept;
 
   /**
    * @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<bool(Slider, float)> ValueChangedSignalType;
 
   /**
    * @brief Mark reached signal type.
    * @SINCE_1_1.39
    */
-  typedef Signal< bool ( Slider, int ) > MarkReachedSignalType;
+  typedef Signal<bool(Slider, int)> 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