X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-window.h;h=2291139756a26f4082c7055c040f4afdb2210e43;hb=e9075a50279076fa8d070e8ee53b7922779a8b66;hp=000923acb52d2357cedc126edfe98949df245833;hpb=e25442b0c940c46d7ae4ae2e7fb48688665d69e8;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
index 000923a..2291139 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
@@ -31,9 +31,9 @@ namespace Dali
 class Actor;
 class Layer;
 class RenderSurfaceInterface;
-struct KeyEvent;
-class TouchData;
-struct WheelEvent;
+class KeyEvent;
+class TouchEvent;
+class WheelEvent;
 
 typedef Dali::Rect<int> PositionSize;
 
@@ -52,7 +52,7 @@ class Window : public BaseHandle
 {
 public:
   using KeyEventSignalType = Signal< void (const KeyEvent&) >;
-  using TouchSignalType = Signal< void (const TouchData&) >;
+  using TouchEventSignalType = Signal< void (const TouchEvent&) >;
 
   static Window New(PositionSize windowPosition, const std::string& name, bool isTransparent = false);
   static Window New(PositionSize windowPosition, const std::string& name, const std::string& className, bool isTransparent = false);
@@ -61,6 +61,8 @@ public:
   ~Window();
   Window(const Window& handle);
   Window& operator=(const Window& rhs);
+  Window( Window&& rhs );
+  Window& operator=( Window&& rhs );
 
   Integration::Scene GetScene();
   Dali::RenderSurfaceInterface& GetRenderSurface();
@@ -73,7 +75,7 @@ public:
   void Hide();
   FocusChangeSignalType& FocusChangeSignal();
   KeyEventSignalType& KeyEventSignal();
-  TouchSignalType& TouchSignal();
+  TouchEventSignalType& TouchedSignal();
 
 public:
   explicit Window( Internal::Adaptor::Window* window );