Merge "Changes after TouchedSignal changes" into devel/master

[platform/core/uifw/dali-toolkit.git] / docs / content / programming-guide / event-system.h

diff --git a/docs/content/programming-guide/event-system.h b/docs/content/programming-guide/event-system.h
index 1498ed0..6e46e01 100644 (file)
--- a/docs/content/programming-guide/event-system.h
+++ b/docs/content/programming-guide/event-system.h
@@ -8,14 +8,14 @@ An application can be notified when a user interacts with the touch screen on th
 This signal will be emitted by DALi whenever the touch occurs within the connected actor's bounds.
 
 Each point on the screen that is currently being touched or where touch has stopped is represented by a point.
-Dali::TouchData stores information about the state of each point (down, up, motion etc.) and the co-ordinates of the touch.
+Dali::TouchEvent stores information about the state of each point (down, up, motion etc.) and the co-ordinates of the touch.
 
 When a multi-touch event occurs, each point represents the points that are currently being touched or the points where touch has stopped.
 
 The following example shows how a connection to a touch event signal can be established:
 
 @code
-bool OnTouch( Dali::Actor actor, const Dali::TouchData& touch )
+bool OnTouch( Dali::Actor actor, const Dali::TouchEvent& touch )
 {
   bool handled = false;
 
@@ -42,7 +42,7 @@ bool OnTouch( Dali::Actor actor, const Dali::TouchData& touch )
 
 // Elsewhere
 Dali::Actor actor = Actor::New();
-actor.TouchSignal().Connect( &OnTouch );
+actor.TouchedSignal().Connect( &OnTouch );
 @endcode
 
 The primary touch point is the first point that the user touches.
@@ -51,7 +51,7 @@ The touch signal is first emitted to the actor which is hit by the primary touch
 If this hit actor does not handle (consume) the event, then the event is offered to the hit actor's parent.
 Again, if the parent does not handle this event, it is then offered to its parent and so on until the stage is reached or the event is consumed.
 
-If the TouchSignal of both a parent and child are connected to, then the touch event is first offered to the child's listener.
+If the TouchedSignal of both a parent and child are connected to, then the touch event is first offered to the child's listener.
 If it is consumed by the child's listener, then the parent will not be informed.
 
 <h2 class="pg">Gestures</h2>