[dali_1.9.23] Merge branch 'devel/master'

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

diff --git a/dali-toolkit/public-api/controls/text-controls/text-label.h b/dali-toolkit/public-api/controls/text-controls/text-label.h
index c0010f4..4fe6447 100644 (file)
--- a/dali-toolkit/public-api/controls/text-controls/text-label.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-label.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_TEXT_LABEL_H__
-#define __DALI_TOOLKIT_TEXT_LABEL_H__
+#ifndef DALI_TOOLKIT_TEXT_LABEL_H
+#define DALI_TOOLKIT_TEXT_LABEL_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.
@@ -44,7 +44,6 @@ class TextLabel;
  * @section TextLabelProperties Properties
  * |%Property enum                    |String name          |Type            |Writable|Animatable|
  * |----------------------------------|---------------------|----------------|--------|----------|
- * | Property::RENDERING_BACKEND      | renderingBackend    |  INTEGER       | O      | X        |
  * | Property::TEXT                   | text                |  STRING        | O      | X        |
  * | Property::FONT_FAMILY            | fontFamily          |  STRING        | O      | X        |
  * | Property::FONT_STYLE             | fontStyle           |  STRING or MAP | O      | X        |
@@ -97,19 +96,11 @@ public:
       ///////////////////////////////////////////////////////////////////////////////
 
       /**
-       * @DEPRECATED_1_2.53 No longer be supported and will be ignored.
-       * @brief The type of rendering e.g. bitmap-based.
-       * @details Name "renderingBackend", type Property::INT.
-       * @SINCE_1_0.0
-       */
-      RENDERING_BACKEND = PROPERTY_START_INDEX,
-
-      /**
        * @brief The text to display in UTF-8 format.
        * @details Name "text", type Property::STRING.
        * @SINCE_1_0.0
        */
-      TEXT,
+      TEXT = PROPERTY_START_INDEX,
 
       /**
        * @brief The requested font family to use.
@@ -161,14 +152,6 @@ public:
       VERTICAL_ALIGNMENT,
 
       /**
-       * @DEPRECATED_1_2.60 Use the new enum value of TEXT_COLOR instead.
-       * @brief The color of the text.
-       * @details Name "unusedPropertyTextColor", type Property::VECTOR4.
-       * @SINCE_1_0.0
-       */
-      UNUSED_PROPERTY_TEXT_COLOR,
-
-      /**
        * @brief Whether the mark-up processing is enabled.
        * @details Name "enableMarkup", type Property::BOOLEAN.
        * @SINCE_1_0.0
@@ -416,6 +399,14 @@ public:
   TextLabel( const TextLabel& handle );
 
   /**
+   * @brief Move constructor
+   * @SINCE_1_9.23
+   *
+   * @param[in] rhs A reference to the moved handle
+   */
+  TextLabel( TextLabel&& rhs );
+
+  /**
    * @brief Assignment operator.
    *
    * @SINCE_1_0.0
@@ -425,6 +416,15 @@ public:
   TextLabel& operator=( const TextLabel& handle );
 
   /**
+   * @brief Move assignment
+   * @SINCE_1_9.23
+   *
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this
+   */
+  TextLabel& operator=( TextLabel&& rhs );
+
+  /**
    * @brief Destructor.
    *
    * This is non-virtual since derived Handle types must not contain data or virtual methods.
@@ -472,4 +472,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_TEXT_LABEL_H__
+#endif // DALI_TOOLKIT_TEXT_LABEL_H