Revert "KeyEvent class pimpling"

[platform/core/uifw/dali-adaptor.git] / dali / public-api / adaptor-framework / window.h

diff --git a/dali/public-api/adaptor-framework/window.h b/dali/public-api/adaptor-framework/window.h
index 05a86de..06ec8eb 100644 (file)
--- a/dali/public-api/adaptor-framework/window.h
+++ b/dali/public-api/adaptor-framework/window.h
@@ -56,7 +56,7 @@ class Orientation;
 class Actor;
 class Layer;
 class RenderTaskList;
-class TouchData;
+class TouchEvent;
 struct KeyEvent;
 
 /**
@@ -73,11 +73,10 @@ public:
   using WindowSize = Uint16Pair ;     ///< Window size type @SINCE_1_2.60
   using WindowPosition = Uint16Pair;  ///< Window position type @SINCE_1_2.60
 
-  using ResizedSignalType = Signal< void (WindowSize) >;       ///< @DEPRECATED_1_4.35 @brief Window resized signal type @SINCE_1_2.60
   using FocusChangeSignalType = Signal< void (Window,bool) >;  ///< Window focus signal type @SINCE_1_4.35
   using ResizeSignalType = Signal< void (Window,WindowSize) >; ///< Window resized signal type @SINCE_1_4.35
   using KeyEventSignalType = Signal< void (const KeyEvent&) >; ///< Key event signal type
-  using TouchSignalType = Signal< void (const TouchData&) >;   ///< Touch signal type
+  using TouchSignalType = Signal< void (const TouchEvent&) >;   ///< Touch signal type
 
 public:
 
@@ -210,6 +209,23 @@ public:
   Window& operator=(const Window& rhs);
 
   /**
+   * @brief Move constructor.
+   *
+   * @SINCE_1_9.24
+   * @param[in] rhs A reference to the moved handle
+   */
+  Window( Window&& rhs );
+
+  /**
+   * @brief Move assignment operator.
+   *
+   * @SINCE_1_9.24
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this handle
+   */
+  Window& operator=( Window&& rhs );
+
+  /**
    * @brief Adds a child Actor to the Window.
    *
    * The child will be referenced.
@@ -601,20 +617,6 @@ public:
 public: // Signals
 
   /**
-   * @brief This signal is emitted when the window is resized.
-   *
-   * A callback of the following type may be connected:
-   * @code
-   *   void YourCallbackName( int width, int height );
-   * @endcode
-   * The parameters are the resized width and height.
-   *
-   * @SINCE_1_2.60
-   * @return The signal to connect to
-   */
-  ResizedSignalType& ResizedSignal() DALI_DEPRECATED_API;
-
-  /**
    * @brief The user should connect to this signal to get a timing when window gains focus or loses focus.
    *
    * A callback of the following type may be connected:
@@ -666,7 +668,7 @@ public: // Signals
    * An interrupted event will also be emitted (if it occurs).
    * A callback of the following type may be connected:
    * @code
-   *   void YourCallbackName(const TouchData& event);
+   *   void YourCallbackName(const TouchEvent& event);
    * @endcode
    *
    * @SINCE_1_9.21