Merge "Deleted Move/Copy operators & constructors from Internal::Control" into devel...

[platform/core/uifw/dali-toolkit.git] / docs / content / programming-guide / multi-touch-guide.md

diff --git a/docs/content/programming-guide/multi-touch-guide.md b/docs/content/programming-guide/multi-touch-guide.md
index dd583b7..3bc08c3 100644 (file)
--- a/docs/content/programming-guide/multi-touch-guide.md
+++ b/docs/content/programming-guide/multi-touch-guide.md
@@ -6,16 +6,16 @@ Multi-Touch Events
 
 Touch events are received via signals.
 
-For C++ API see Dali::Actor::TouchSignal() and Dali::Actor::HoveredSignal() for more details.
+For C++ API see Dali::Actor::TouchedSignal() and Dali::Actor::HoveredSignal() for more details.
 
 ### Hit Testing Rules Summary:
 
  - An actor is only hittable if the actor's touch signal has a connection.
  - An actor is only hittable when it is between the camera's near and far planes.
- - If an actor is made insensitive, then the actor and its children are not hittable; see Dali::Actor::IsSensitive()
- - If an actor's visibility flag is unset, then none of its children are hittable either; see Dali::Actor::IsVisible()
+ - If an actor is made insensitive, then the actor and its children are not hittable; see Dali::Actor:.Property::SENSITIVE
+ - If an actor's visibility flag is unset, then none of its children are hittable either; see Dali::Actor::Property::VISIBLE
  - To be hittable, an actor must have a non-zero size.
- - If an actor's world color is fully transparent, then it is not hittable; see GetCurrentWorldColor()
+ - If an actor's world color is fully transparent, then it is not hittable; see Dali::Actor::Property::WORLD_COLOR
 
 ### Hit Test Algorithm:
 
@@ -113,7 +113,7 @@ Hit Priority of above Actor tree (all overlays): 1 - Lowest. 6 - Highest.
     IF ( TOUCH-SIGNAL-NOT-EMPTY )
     {
       // Only do the emission if touch signal of actor has connections.
-        CONSUMED = TOUCH-SIGNAL( TOUCH-DATA )
+        CONSUMED = TOUCH-SIGNAL( TOUCH-EVENT )
     }
 
     IF ( NOT-CONSUMED )