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=7c81ee521e33d47e386d60eb7ccf07b98073542c;hp=b28f305d7b6bbd264d85a786971d16d39dd7d483;hpb=37aa8e50d140ee95be5f03fadbc269a0a239adde;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 b28f305..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 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); @@ -75,7 +75,7 @@ public: void Hide(); FocusChangeSignalType& FocusChangeSignal(); KeyEventSignalType& KeyEventSignal(); - TouchSignalType& TouchSignal(); + TouchEventSignalType& TouchedSignal(); public: explicit Window( Internal::Adaptor::Window* window );