X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-window.h;h=7c8ec1a2960f5523857b244adb59230507812907;hp=000923acb52d2357cedc126edfe98949df245833;hb=be93fd772a1b1b09425ac0aaec1ea1b64e9a9e60;hpb=e25442b0c940c46d7ae4ae2e7fb48688665d69e8 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..7c8ec1a 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 @@ -32,8 +32,8 @@ class Actor; class Layer; class RenderSurfaceInterface; struct KeyEvent; -class TouchData; -struct WheelEvent; +class TouchEvent; +class WheelEvent; typedef Dali::Rect PositionSize; @@ -52,7 +52,7 @@ class Window : public BaseHandle { public: using KeyEventSignalType = Signal< void (const KeyEvent&) >; - using TouchSignalType = Signal< void (const TouchData&) >; + using TouchSignalType = 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();