X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fpopup%2Fconfirmation-popup.h;h=4a804cbea3f10546fc5f95b2b5892cc9a5ebb267;hp=621eaeced73c2f85a7ab5cf27f26530447c42f44;hb=HEAD;hpb=8ad943a28e16767f5fe2fc92d18b38f8808bdc99

diff --git a/dali-toolkit/devel-api/controls/popup/confirmation-popup.h b/dali-toolkit/devel-api/controls/popup/confirmation-popup.h
index 621eaec..ebf6a65 100644
--- a/dali-toolkit/devel-api/controls/popup/confirmation-popup.h
+++ b/dali-toolkit/devel-api/controls/popup/confirmation-popup.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_CONFIRMATION_POPUP_H__
-#define __DALI_TOOLKIT_CONFIRMATION_POPUP_H__
+#ifndef DALI_TOOLKIT_CONFIRMATION_POPUP_H
+#define DALI_TOOLKIT_CONFIRMATION_POPUP_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.
@@ -23,10 +23,8 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 // Forward declarations
 namespace Internal DALI_INTERNAL
 {
@@ -43,22 +41,21 @@ class ConfirmationPopup;
  * Please see the programming guide for a detailed description of the ConfirmationPopup including examples.
  *
  * Signals (these are dynamically created upon connect).
- * | %Signal Name          | Actor name to connect to | Property to set signal type (eg clicked) |
- * |-----------------------|--------------------------|------------------------------------------|
- * | control-signal-ok     | control-ok               | connect-signal-ok-selected               |
- * | control-signal-cancel | control-cancel           | connect-signal-cancel-selected           |
+ * | %Signal Name        | Actor name to connect to | Property to set signal type (eg clicked) |
+ * |---------------------|--------------------------|------------------------------------------|
+ * | controlSignalOk     | controlOk                | connectSignalOkSelected                  |
+ * | controlSignalCancel | controlCancel            | connectSignalCancelSelected              |
  */
-class DALI_IMPORT_API ConfirmationPopup : public Popup
+class DALI_TOOLKIT_API ConfirmationPopup : public Popup
 {
 public:
-
   /**
    * @brief The start and end property ranges for this control.
    */
   enum PropertyRange
   {
     PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1 + DEFAULT_PROPERTY_MAX_COUNT_PER_DERIVATION + 1,
-    PROPERTY_END_INDEX =   PROPERTY_START_INDEX + 1000              ///< Reserve property indices
+    PROPERTY_END_INDEX   = PROPERTY_START_INDEX + 1000 ///< Reserve property indices
   };
 
   /**
@@ -68,8 +65,8 @@ public:
   {
     enum
     {
-      CONNECT_SIGNAL_OK_SELECTED = PROPERTY_START_INDEX, ///< name "connect-signal-ok-selected",     type std::string
-      CONNECT_SIGNAL_CANCEL_SELECTED                     ///< name "connect-signal-cancel-selected", type std::string
+      CONNECT_SIGNAL_OK_SELECTED = PROPERTY_START_INDEX, ///< name "connectSignalOkSelected",        type std::string
+      CONNECT_SIGNAL_CANCEL_SELECTED                     ///< name "connectSignalCancelSelected",    type std::string
     };
   };
 
@@ -78,8 +75,8 @@ public:
    */
   enum ControlIndex
   {
-    CONTROL_OK = 0,    ///< Index of control 1
-    CONTROL_CANCEL,    ///< Index of control 2
+    CONTROL_OK = 0, ///< Index of control 1
+    CONTROL_CANCEL, ///< Index of control 2
   };
 
   /**
@@ -91,13 +88,29 @@ public:
 
   /**
    * @brief Copy constructor.
+   * @param[in] confirmationPopup The handle to copy from.
    */
-  ConfirmationPopup( const ConfirmationPopup& confirmationPopup );
+  ConfirmationPopup(const ConfirmationPopup& confirmationPopup);
 
   /**
    * @brief Assignment operator.
+   * @param[in] confirmationPopup The handle to copy from.
+   * @return reference to this
+   */
+  ConfirmationPopup& operator=(const ConfirmationPopup& confirmationPopup);
+
+  /**
+   * @brief Move constructor.
+   * @param[in] confirmationPopup The handle to move from.
    */
-  ConfirmationPopup& operator=( const ConfirmationPopup& confirmationPopup );
+  ConfirmationPopup(ConfirmationPopup&& confirmationPopup);
+
+  /**
+   * @brief Move assignment operator.
+   * @param[in] confirmationPopup The handle to move from.
+   * @return reference to this
+   */
+  ConfirmationPopup& operator=(ConfirmationPopup&& confirmationPopup);
 
   /**
    * @brief Destructor.
@@ -122,27 +135,26 @@ public:
    * @param[in] handle Handle to an object
    * @return handle to a ConfirmationPopup or an uninitialized handle
    */
-  static ConfirmationPopup DownCast( BaseHandle handle );
+  static ConfirmationPopup DownCast(BaseHandle handle);
 
 public: // Not intended for application developers
-
   /**
    * @brief Creates a handle using the Toolkit::Internal implementation.
    *
    * @param[in]  implementation  The Control implementation.
    */
-  DALI_INTERNAL ConfirmationPopup( Internal::ConfirmationPopup& implementation );
+  DALI_INTERNAL ConfirmationPopup(Internal::ConfirmationPopup& implementation);
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  DALI_INTERNAL ConfirmationPopup( Dali::Internal::CustomActor* internal );
+  DALI_INTERNAL ConfirmationPopup(Dali::Internal::CustomActor* internal);
 };
 
 } // namespace Toolkit
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_CONFIRMATION_POPUP_H__
+#endif // DALI_TOOLKIT_CONFIRMATION_POPUP_H