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

[platform/core/uifw/dali-adaptor.git] / dali / devel-api / adaptor-framework / color-controller.h

diff --git a/dali/devel-api/adaptor-framework/color-controller.h b/dali/devel-api/adaptor-framework/color-controller.h
index 8508880..1a12cc6 100644 (file)
--- a/dali/devel-api/adaptor-framework/color-controller.h
+++ b/dali/devel-api/adaptor-framework/color-controller.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_COLOR_CONTROLLER_H__
-#define __DALI_COLOR_CONTROLLER_H__
+#ifndef DALI_COLOR_CONTROLLER_H
+#define DALI_COLOR_CONTROLLER_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -19,30 +19,32 @@
  */
 
 // EXTERNAL INCLUDES
-#include <string>
-#include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/math/vector4.h>
+#include <dali/public-api/object/base-handle.h>
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali/public-api/dali-adaptor-common.h>
 
 namespace Dali
 {
-
 namespace Internal DALI_INTERNAL
 {
 namespace Adaptor
 {
 class ColorController;
 }
-}
+
+} // namespace DALI_INTERNAL
 
 /**
  * Color controller currently caches the changeable color table which updates with the theme change
  *
  * It provides the functionality of retrieving a RGBA color by passing in the color code string.
  */
-class DALI_IMPORT_API ColorController : public BaseHandle
+class DALI_ADAPTOR_API ColorController : public BaseHandle
 {
 public:
-
   /**
    * @brief Create an uninitialized ColorController handle.
    */
@@ -54,7 +56,7 @@ public:
    * The copy will point to the same implementation as the original.
    * @param[in]  colorController  The Color Controller to copy from.
    */
-  ColorController( const ColorController& colorController);
+  ColorController(const ColorController& colorController);
 
   /**
    * @brief This assignment operator is required for (smart) pointer semantics.
@@ -65,6 +67,22 @@ public:
   ColorController& operator=(const ColorController& rhs);
 
   /**
+   * @brief Creates a move of the handle.
+   *
+   * The move will point to the same implementation as the original.
+   * @param[in]  colorController  The Color Controller to move from.
+   */
+  ColorController(ColorController&& colorController);
+
+  /**
+   * @brief This move assignment operator is required for (smart) pointer semantics.
+   *
+   * @param [in] rhs  A reference to the moved handle
+   * @return A reference to this
+   */
+  ColorController& operator=(ColorController&& rhs);
+
+  /**
    * @brief Retrieve the initialized instance of the ColorController.
    *
    * @return Handle to ColorController.
@@ -79,16 +97,16 @@ public:
   ~ColorController();
 
   /**
-   * @brief Retrieve the RGB value by given the color code.
+   * @brief Retrieve the RGBA value by given the color code.
    *
    * @param[in] colorCode The color code string.
    * @param[out] colorValue The RGBA color
    * @return true if the color code exists, otherwise false
    */
-  bool RetrieveColor( const std::string& colorCode, Vector4& colorValue );
+  bool RetrieveColor(const std::string& colorCode, Vector4& colorValue);
 
   /**
-    * @brief Retrieve the RGB values by given the color code.
+    * @brief Retrieve the RGBA values by given the color code.
     *
     * @param[in] colorCode The color code string.
     * @param[out] textColor The text color.
@@ -96,8 +114,7 @@ public:
     * @param[out] textShadowColor The text shadow color.
     * @return true if the color code exists, otherwise false
     */
-  bool RetrieveColor( const std::string& colorCode , Vector4& textColor, Vector4& textOutlineColor, Vector4& textShadowColor);
-
+  bool RetrieveColor(const std::string& colorCode, Vector4& textColor, Vector4& textOutlineColor, Vector4& textShadowColor);
 
 public: // Not intended for application developers
   /**
@@ -107,7 +124,6 @@ public: // Not intended for application developers
   explicit DALI_INTERNAL ColorController(Internal::Adaptor::ColorController* colorController);
 };
 
-
 } //namespace Dali
 
-#endif /* __DALI_COLOR_CONTROLLER_H__ */
+#endif // DALI_COLOR_CONTROLLER_H