Renamed TouchSignal to TouchedSignal

Change-Id: Iee038875f65be610804e4209c0be22be9914df02

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-touch-event-utils.h b/automated-tests/src/dali/dali-test-suite-utils/test-touch-event-utils.h
index ef8cadc..08bf684 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-touch-event-utils.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-touch-event-utils.h
@@ -21,7 +21,7 @@
 #include <dali/public-api/actors/actor.h>
 
 /**
- * Functor to be connected to an Actor's TouchSignal.
+ * Functor to be connected to an Actor's TouchedSignal.
  * Allows the user to specify whether the functor should return true (consumed) or false.
  */
 struct TouchEventFunctorConsumeSetter

diff --git a/automated-tests/src/dali/utc-Dali-Actor.cpp b/automated-tests/src/dali/utc-Dali-Actor.cpp
index b74132d..01419e2 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Actor.cpp
+++ b/automated-tests/src/dali/utc-Dali-Actor.cpp
@@ -2641,7 +2641,7 @@ int UtcDaliActorTouchedSignal(void)
   application.Render();
 
   // connect to its touch signal
-  actor.TouchSignal().Connect( TestTouchCallback );
+  actor.TouchedSignal().Connect( TestTouchCallback );
 
   // simulate a touch event in the middle of the screen
   Vector2 touchPoint( application.GetScene().GetSize() * 0.5 );
@@ -2882,7 +2882,7 @@ int UtcDaliActorHitTest(void)
     DALI_TEST_CHECK( !gTouchCallBackCalled );
 
     // connect to its touch signal
-    actor.TouchSignal().Connect(TestTouchCallback);
+    actor.TouchedSignal().Connect(TestTouchCallback);
 
     Dali::Integration::Point point;
     point.SetState( PointState::DOWN );
@@ -4855,9 +4855,9 @@ int UtcDaliActorRaiseLower(void)
 
   // connect to actor touch signals, will use touch callbacks to determine which actor is on top.
   // Only top actor will get touched.
-  actorA.TouchSignal().Connect( TestTouchCallback );
-  actorB.TouchSignal().Connect( TestTouchCallback2 );
-  actorC.TouchSignal().Connect( TestTouchCallback3 );
+  actorA.TouchedSignal().Connect( TestTouchCallback );
+  actorB.TouchedSignal().Connect( TestTouchCallback2 );
+  actorC.TouchedSignal().Connect( TestTouchCallback3 );
 
   // Connect ChildOrderChangedSignal
   bool orderChangedSignal( false );
@@ -5034,9 +5034,9 @@ int UtcDaliActorRaiseToTopLowerToBottom(void)
 
   // connect to actor touch signals, will use touch callbacks to determine which actor is on top.
   // Only top actor will get touched.
-  actorA.TouchSignal().Connect( TestTouchCallback );
-  actorB.TouchSignal().Connect( TestTouchCallback2 );
-  actorC.TouchSignal().Connect( TestTouchCallback3 );
+  actorA.TouchedSignal().Connect( TestTouchCallback );
+  actorB.TouchedSignal().Connect( TestTouchCallback2 );
+  actorC.TouchedSignal().Connect( TestTouchCallback3 );
 
   Dali::Integration::Point point;
   point.SetDeviceId( 1 );
@@ -5221,9 +5221,9 @@ int UtcDaliActorRaiseAbove(void)
 
   // connect to actor touch signals, will use touch callbacks to determine which actor is on top.
   // Only top actor will get touched.
-  actorA.TouchSignal().Connect( TestTouchCallback );
-  actorB.TouchSignal().Connect( TestTouchCallback2 );
-  actorC.TouchSignal().Connect( TestTouchCallback3 );
+  actorA.TouchedSignal().Connect( TestTouchCallback );
+  actorB.TouchedSignal().Connect( TestTouchCallback2 );
+  actorC.TouchedSignal().Connect( TestTouchCallback3 );
 
   bool orderChangedSignal( false );
   Actor orderChangedActor;
@@ -5386,9 +5386,9 @@ int UtcDaliActorLowerBelow(void)
 
   // connect to actor touch signals, will use touch callbacks to determine which actor is on top.
   // Only top actor will get touched.
-  actorA.TouchSignal().Connect( TestTouchCallback );
-  actorB.TouchSignal().Connect( TestTouchCallback2 );
-  actorC.TouchSignal().Connect( TestTouchCallback3 );
+  actorA.TouchedSignal().Connect( TestTouchCallback );
+  actorB.TouchedSignal().Connect( TestTouchCallback2 );
+  actorC.TouchedSignal().Connect( TestTouchCallback3 );
 
   Dali::Integration::Point point;
   point.SetDeviceId( 1 );
@@ -5580,9 +5580,9 @@ int UtcDaliActorRaiseAboveDifferentParentsN(void)
 
   // connect to actor touch signals, will use touch callbacks to determine which actor is on top.
   // Only top actor will get touched.
-  actorA.TouchSignal().Connect( TestTouchCallback );
-  actorB.TouchSignal().Connect( TestTouchCallback2 );
-  actorC.TouchSignal().Connect( TestTouchCallback3 );
+  actorA.TouchedSignal().Connect( TestTouchCallback );
+  actorB.TouchedSignal().Connect( TestTouchCallback2 );
+  actorC.TouchedSignal().Connect( TestTouchCallback3 );
 
   Dali::Integration::Point point;
   point.SetDeviceId( 1 );
@@ -5666,9 +5666,9 @@ int UtcDaliActorRaiseLowerWhenUnparentedTargetN(void)
 
   // connect to actor touch signals, will use touch callbacks to determine which actor is on top.
   // Only top actor will get touched.
-  actorA.TouchSignal().Connect( TestTouchCallback );
-  actorB.TouchSignal().Connect( TestTouchCallback2 );
-  actorC.TouchSignal().Connect( TestTouchCallback3 );
+  actorA.TouchedSignal().Connect( TestTouchCallback );
+  actorB.TouchedSignal().Connect( TestTouchCallback2 );
+  actorC.TouchedSignal().Connect( TestTouchCallback3 );
 
   Dali::Integration::Point point;
   point.SetDeviceId( 1 );
@@ -5827,9 +5827,9 @@ int UtcDaliActorTestAllAPIwhenActorNotParented(void)
 
   // connect to actor touch signals, will use touch callbacks to determine which actor is on top.
   // Only top actor will get touched.
-  actorA.TouchSignal().Connect( TestTouchCallback );
-  actorB.TouchSignal().Connect( TestTouchCallback2 );
-  actorC.TouchSignal().Connect( TestTouchCallback3 );
+  actorA.TouchedSignal().Connect( TestTouchCallback );
+  actorB.TouchedSignal().Connect( TestTouchCallback2 );
+  actorC.TouchedSignal().Connect( TestTouchCallback3 );
 
   Dali::Integration::Point point;
   point.SetDeviceId( 1 );
@@ -5984,9 +5984,9 @@ int UtcDaliActorRaiseAboveActorAndTargetTheSameN(void)
 
   // connect to actor touch signals, will use touch callbacks to determine which actor is on top.
   // Only top actor will get touched.
-  actorA.TouchSignal().Connect( TestTouchCallback );
-  actorB.TouchSignal().Connect( TestTouchCallback2 );
-  actorC.TouchSignal().Connect( TestTouchCallback3 );
+  actorA.TouchedSignal().Connect( TestTouchCallback );
+  actorB.TouchedSignal().Connect( TestTouchCallback2 );
+  actorC.TouchedSignal().Connect( TestTouchCallback3 );
 
   ResetTouchCallbacks();
 
@@ -8000,13 +8000,13 @@ int UtcDaliActorAddRendererNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorTouchSignalNegative(void)
+int UtcDaliActorTouchedSignalNegative(void)
 {
   TestApplication application;
   Dali::Actor instance;
   try
   {
-    instance.TouchSignal();
+    instance.TouchedSignal();
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)

diff --git a/automated-tests/src/dali/utc-Dali-BaseHandle.cpp b/automated-tests/src/dali/utc-Dali-BaseHandle.cpp
index 121c7bb..6623b87 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-BaseHandle.cpp
+++ b/automated-tests/src/dali/utc-Dali-BaseHandle.cpp
@@ -475,7 +475,7 @@ int UtcDaliBaseHandleConnectSignal(void)
   DALI_TEST_CHECK( gTouchCallBackCalled == false );
 
   // connect to its touch signal
-  actor.ConnectSignal( &application, "touch", TestCallback() );
+  actor.ConnectSignal( &application, "touched", TestCallback() );
 
   application.SendNotification();
   application.Render(1000);

diff --git a/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp
index 4f58ba8..412e948 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp
+++ b/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp
@@ -206,7 +206,7 @@ int UtcDaliLongPressGestureDetectorNew(void)
   detector.Attach(actor);
 
   TouchEventFunctor touchFunctor;
-  actor.TouchSignal().Connect(&application, touchFunctor);
+  actor.TouchedSignal().Connect(&application, touchFunctor);
 
   Integration::TouchEvent touchEvent(1);
   Integration::Point point;
@@ -1000,7 +1000,7 @@ int UtcDaliLongPressGestureInterruptedWhenTouchConsumed(void)
 
   bool consume = false;
   TouchEventFunctorConsumeSetter touchFunctor(consume);
-  actor.TouchSignal().Connect(&application,touchFunctor);
+  actor.TouchedSignal().Connect(&application,touchFunctor);
 
   // Render and notify
   application.SendNotification();

diff --git a/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp
index 3f7ddc7..46a8e88 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp
+++ b/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp
@@ -2842,7 +2842,7 @@ int UtcDaliPanGestureInterruptedWhenTouchConsumed(void)
 
   bool consume = false;
   TouchEventFunctorConsumeSetter touchFunctor(consume);
-  actor.TouchSignal().Connect(&application,touchFunctor);
+  actor.TouchedSignal().Connect(&application,touchFunctor);
 
   // Render and notify
   application.SendNotification();

diff --git a/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp
index a7fb992..834267d 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp
+++ b/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp
@@ -1121,7 +1121,7 @@ int UtcDaliPinchGestureInterruptedWhenTouchConsumed(void)
 
   bool consume = false;
   TouchEventFunctorConsumeSetter touchFunctor(consume);
-  actor.TouchSignal().Connect(&application,touchFunctor);
+  actor.TouchedSignal().Connect(&application,touchFunctor);
 
   // Render and notify
   application.SendNotification();

diff --git a/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp
index c9648ca..b3fd67a 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp
+++ b/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp
@@ -1110,7 +1110,7 @@ int UtcDaliRotationGestureInterruptedWhenTouchConsumed(void)
 
   bool consume = false;
   TouchEventFunctorConsumeSetter touchFunctor(consume);
-  actor.TouchSignal().Connect(&application,touchFunctor);
+  actor.TouchedSignal().Connect(&application,touchFunctor);
 
   // Render and notify
   application.SendNotification();

diff --git a/automated-tests/src/dali/utc-Dali-Scene.cpp b/automated-tests/src/dali/utc-Dali-Scene.cpp
index e8526ae..f23df12 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Scene.cpp
+++ b/automated-tests/src/dali/utc-Dali-Scene.cpp
@@ -437,7 +437,7 @@ int UtcDaliSceneCreateNewSceneDuringCoreEventProcessing(void)
   TouchedSignalData data;
   data.createNewScene = true;
   TouchFunctor functor( data );
-  scene.TouchSignal().Connect( &application, functor );
+  scene.TouchedSignal().Connect( &application, functor );
 
   // Render and notify.
   application.SendNotification();
@@ -620,14 +620,14 @@ int UtcDaliSceneSignalKeyEventN(void)
   END_TEST;
 }
 
-int UtcDaliSceneTouchSignalP(void)
+int UtcDaliSceneTouchedSignalP(void)
 {
   TestApplication application;
   Dali::Integration::Scene scene = application.GetScene();
 
   TouchedSignalData data;
   TouchFunctor functor( data );
-  scene.TouchSignal().Connect( &application, functor );
+  scene.TouchedSignal().Connect( &application, functor );
 
   // Render and notify.
   application.SendNotification();
@@ -655,7 +655,7 @@ int UtcDaliSceneTouchSignalP(void)
   actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
   actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
   actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  actor.TouchSignal().Connect( &DummyTouchCallback );
+  actor.TouchedSignal().Connect( &DummyTouchCallback );
   scene.Add( actor );
 
   // Render and notify.
@@ -732,14 +732,14 @@ int UtcDaliSceneTouchSignalP(void)
   END_TEST;
 }
 
-int UtcDaliSceneTouchSignalN(void)
+int UtcDaliSceneTouchedSignalN(void)
 {
   TestApplication application;
   Dali::Integration::Scene scene = application.GetScene();
 
   TouchedSignalData data;
   TouchFunctor functor( data );
-  scene.TouchSignal().Connect( &application, functor );
+  scene.TouchedSignal().Connect( &application, functor );
 
   // Render and notify.
   application.SendNotification();
@@ -778,7 +778,7 @@ int UtcDaliSceneTouchSignalN(void)
   actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
   actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
   actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  actor.TouchSignal().Connect( &DummyTouchCallback );
+  actor.TouchedSignal().Connect( &DummyTouchCallback );
   scene.Add( actor );
 
   // Render and notify.

diff --git a/automated-tests/src/dali/utc-Dali-Scripting.cpp b/automated-tests/src/dali/utc-Dali-Scripting.cpp
index f0571f1..2ae4abf 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Scripting.cpp
+++ b/automated-tests/src/dali/utc-Dali-Scripting.cpp
@@ -163,7 +163,7 @@ int UtcDaliScriptingNewActorNegative(void)
     DALI_TEST_CHECK( !handle.WheelEventSignal().GetConnectionCount() );
     DALI_TEST_CHECK( !handle.OffSceneSignal().GetConnectionCount() );
     DALI_TEST_CHECK( !handle.OnSceneSignal().GetConnectionCount() );
-    DALI_TEST_CHECK( !handle.TouchSignal().GetConnectionCount() );
+    DALI_TEST_CHECK( !handle.TouchedSignal().GetConnectionCount() );
   }
   END_TEST;
 }

diff --git a/automated-tests/src/dali/utc-Dali-Stage.cpp b/automated-tests/src/dali/utc-Dali-Stage.cpp
index ca9ea5a..8ca978e 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Stage.cpp
+++ b/automated-tests/src/dali/utc-Dali-Stage.cpp
@@ -141,9 +141,9 @@ struct KeyEventReceivedFunctor
 };
 
 // Stores data that is populated in the touched signal callback and will be read by the TET cases
-struct TouchSignalData
+struct TouchedSignalData
 {
-  TouchSignalData()
+  TouchedSignalData()
   : functorCalled(false)
   {}
 
@@ -161,7 +161,7 @@ struct TouchSignalData
 // Functor that sets the data when touched signal is received
 struct TouchFunctor
 {
-  TouchFunctor( TouchSignalData& data ) : signalData( data ) { }
+  TouchFunctor( TouchedSignalData& data ) : signalData( data ) { }
 
   void operator()( const TouchEvent& touch )
   {
@@ -175,7 +175,7 @@ struct TouchFunctor
     signalData.functorCalled = true;
   }
 
-  TouchSignalData& signalData;
+  TouchedSignalData& signalData;
 };
 
 // Stores data that is populated in the wheel-event callback and will be read by the TET cases
@@ -979,9 +979,9 @@ int UtcDaliStageTouchedSignalP(void)
   TestApplication application;
   Stage stage = Stage::GetCurrent();
 
-  TouchSignalData data;
+  TouchedSignalData data;
   TouchFunctor functor( data );
-  stage.TouchSignal().Connect( &application, functor );
+  stage.TouchedSignal().Connect( &application, functor );
 
   // Render and notify.
   application.SendNotification();
@@ -1010,7 +1010,7 @@ int UtcDaliStageTouchedSignalP(void)
   actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
   actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
   actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  actor.TouchSignal().Connect( &DummyTouchCallback );
+  actor.TouchedSignal().Connect( &DummyTouchCallback );
   stage.Add( actor );
 
   // Render and notify.
@@ -1095,9 +1095,9 @@ int UtcDaliStageTouchedSignalN(void)
   TestApplication application;
   Stage stage = Stage::GetCurrent();
 
-  TouchSignalData data;
+  TouchedSignalData data;
   TouchFunctor functor( data );
-  stage.TouchSignal().Connect( &application, functor );
+  stage.TouchedSignal().Connect( &application, functor );
 
   // Render and notify.
   application.SendNotification();
@@ -1135,7 +1135,7 @@ int UtcDaliStageTouchedSignalN(void)
   actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
   actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
   actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  actor.TouchSignal().Connect( &DummyTouchCallback );
+  actor.TouchedSignal().Connect( &DummyTouchCallback );
   stage.Add( actor );
 
   // Render and notify.
@@ -1178,217 +1178,6 @@ int UtcDaliStageTouchedSignalN(void)
   END_TEST;
 }
 
-
-int UtcDaliStageTouchSignalP(void)
-{
-  TestApplication application;
-  Stage stage = Stage::GetCurrent();
-
-  TouchSignalData data;
-  TouchFunctor functor( data );
-  stage.TouchSignal().Connect( &application, functor );
-
-  // Render and notify.
-  application.SendNotification();
-  application.Render();
-
-  // Basic test: No actors, single touch (down then up).
-  {
-    GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
-    data.Reset();
-
-    GenerateTouch( application, PointState::UP, Vector2( 10.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
-    data.Reset();
-  }
-
-  // Add an actor to the scene.
-  Actor actor = Actor::New();
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
-  actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  actor.TouchSignal().Connect( &DummyTouchCallback );
-  stage.Add( actor );
-
-  // Render and notify.
-  application.SendNotification();
-  application.Render();
-
-  // Actor on scene, single touch, down in actor, motion, then up outside actor.
-  {
-    GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor );
-    data.Reset();
-
-    GenerateTouch( application, PointState::MOTION, Vector2( 150.0f, 10.0f ) ); // Some motion
-
-    DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
-    data.Reset();
-
-    GenerateTouch( application, PointState::UP, Vector2( 150.0f, 10.0f ) ); // Some motion
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
-    data.Reset();
-  }
-
-  // Multiple touch. Should only receive a touch on first down and last up.
-  {
-    Integration::TouchEvent touchEvent;
-    Integration::Point point;
-
-    // 1st point
-    point.SetState( PointState::DOWN );
-    point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
-    touchEvent.points.push_back( point );
-    application.ProcessEvent( touchEvent );
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
-    data.Reset();
-
-    // 2nd point
-    touchEvent.points[0].SetState( PointState::STATIONARY );
-    point.SetDeviceId( 1 );
-    point.SetScreenPosition( Vector2( 50.0f, 50.0f ) );
-    touchEvent.points.push_back( point );
-    application.ProcessEvent( touchEvent );
-    DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
-    data.Reset();
-
-    // Primary point is up
-    touchEvent.points[0].SetState( PointState::UP );
-    touchEvent.points[1].SetState( PointState::STATIONARY );
-    application.ProcessEvent( touchEvent );
-    DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
-    data.Reset();
-
-    // Remove 1st point now, 2nd point is now in motion
-    touchEvent.points.erase( touchEvent.points.begin() );
-    touchEvent.points[0].SetState( PointState::MOTION );
-    touchEvent.points[0].SetScreenPosition( Vector2( 150.0f, 50.0f ) );
-    application.ProcessEvent( touchEvent );
-    DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
-    data.Reset();
-
-    // Final point Up
-    touchEvent.points[0].SetState( PointState::UP );
-    application.ProcessEvent( touchEvent );
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
-    data.Reset();
-  }
-  END_TEST;
-}
-
-int UtcDaliStageTouchSignalN(void)
-{
-  TestApplication application;
-  Stage stage = Stage::GetCurrent();
-
-  TouchSignalData data;
-  TouchFunctor functor( data );
-  stage.TouchSignal().Connect( &application, functor );
-
-  TouchSignalData data2;
-  TouchFunctor functor2( data2 );
-  GetImplementation( stage ).ConnectSignal( &application, "touch", functor2 );
-
-  // Render and notify.
-  application.SendNotification();
-  application.Render();
-
-  // Confirm functor not called before there has been any touch event.
-  DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
-  DALI_TEST_EQUALS( false, data2.functorCalled, TEST_LOCATION );
-
-  // No actors, single touch, down, motion then up.
-  {
-    GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0));
-
-    DALI_TEST_EQUALS( true, data2.functorCalled, TEST_LOCATION );
-
-    data.Reset();
-    data2.Reset();
-
-    // Confirm there is no signal when the touchpoint is only moved.
-    GenerateTouch( application, PointState::MOTION, Vector2( 1200.0f, 10.0f ) ); // Some motion
-
-    DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
-    data.Reset();
-
-    // Confirm a following up event generates a signal.
-    GenerateTouch( application, PointState::UP, Vector2( 1200.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0));
-    data.Reset();
-  }
-
-  // Add an actor to the scene.
-  Actor actor = Actor::New();
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
-  actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-  actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  actor.TouchSignal().Connect( &DummyTouchCallback );
-  stage.Add( actor );
-
-  // Render and notify.
-  application.SendNotification();
-  application.Render();
-
-  // Actor on scene. Interrupted before down and interrupted after down.
-  {
-    GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
-    DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED );
-    data.Reset();
-
-    GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor );
-    DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::DOWN );
-    data.Reset();
-
-    GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) );
-
-    DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
-    DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
-    DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
-    DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED );
-
-    DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
-
-    // Check that getting info about a non-existent point returns an empty handle
-    Actor actor = data.receivedTouchEvent.GetHitActor( 1 );
-    DALI_TEST_CHECK( !actor );
-
-    data.Reset();
-  }
-
-  END_TEST;
-}
-
 int UtcDaliStageSignalWheelEventP(void)
 {
   TestApplication application;

diff --git a/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp
index 8d04551..6421737 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp
+++ b/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp
@@ -190,7 +190,7 @@ int UtcDaliTapGestureDetectorNew(void)
   detector.Attach(actor);
 
   TouchEventFunctor touchFunctor;
-  actor.TouchSignal().Connect( &application, touchFunctor );
+  actor.TouchedSignal().Connect( &application, touchFunctor );
 
   Integration::TouchEvent touchEvent(1);
   Integration::Point point;
@@ -495,7 +495,7 @@ int UtcDaliTapGestureSignalReceptionChildHit(void)
   parent.Add(child);
 
   TouchEventFunctor touchFunctor;
-  child.TouchSignal().Connect(&application, touchFunctor);
+  child.TouchedSignal().Connect(&application, touchFunctor);
 
   // Render and notify
   application.SendNotification();
@@ -919,7 +919,7 @@ int UtcDaliTapGestureInterruptedWhenTouchConsumed(void)
 
   bool consume = false;
   TouchEventFunctorConsumeSetter touchFunctor(consume);
-  actor.TouchSignal().Connect(&application,touchFunctor);
+  actor.TouchedSignal().Connect(&application,touchFunctor);
 
   // Render and notify
   application.SendNotification();

diff --git a/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp
index 9d2f437..eeb635e 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp
+++ b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp
@@ -289,7 +289,7 @@ int UtcDaliTouchEventNormalProcessing01(void)
   // Connect to actor's touch signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   Vector2 screenCoordinates( 10.0f, 10.0f );
   Vector2 localCoordinates;
@@ -353,7 +353,7 @@ int UtcDaliTouchEventNormalProcessing02(void)
   // Connect to actor's touched signal
   HandleData handleData;
   TouchEventHandleFunctor functor( handleData );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   Vector2 screenCoordinates( 10.0f, 10.0f );
   Vector2 localCoordinates;
@@ -387,7 +387,7 @@ int UtcDaliTouchEventAPINegative(void)
   // Connect to actor's touched signal
   OutOfBoundsData data;
   OutOfBoundsFunctor functor( data, true );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   Vector2 screenCoordinates( 10.0f, 10.0f );
   Vector2 localCoordinates;
@@ -438,7 +438,7 @@ int UtcDaliTouchEventOutsideCameraNearFarPlanes(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   Vector2 screenCoordinates( sceneSize.x * 0.5f, sceneSize.y * 0.5f );
 
@@ -527,7 +527,7 @@ int UtcDaliTouchEventInterrupted(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -564,12 +564,12 @@ int UtcDaliTouchEventParentConsumer(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data, false );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Connect to root actor's touched signal
   SignalData rootData;
   TouchEventFunctor rootFunctor( rootData ); // Consumes signal
-  rootActor.TouchSignal().Connect( &application, rootFunctor );
+  rootActor.TouchedSignal().Connect( &application, rootFunctor );
 
   Vector2 screenCoordinates( 10.0f, 10.0f );
   Vector2 actorCoordinates, rootCoordinates;
@@ -664,12 +664,12 @@ int UtcDaliTouchEventInterruptedParentConsumer(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data, false );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Connect to root actor's touched signal
   SignalData rootData;
   TouchEventFunctor rootFunctor( rootData ); // Consumes signal
-  rootActor.TouchSignal().Connect( &application, rootFunctor );
+  rootActor.TouchedSignal().Connect( &application, rootFunctor );
 
   // Emit a down signal
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -743,7 +743,7 @@ int UtcDaliTouchEventLeave(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Set actor to require leave events
   actor.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
@@ -798,12 +798,12 @@ int UtcDaliTouchEventLeaveParentConsumer(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data, false );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Connect to root actor's touched signal
   SignalData rootData;
   TouchEventFunctor rootFunctor( rootData ); // Consumes signal
-  rootActor.TouchSignal().Connect( &application, rootFunctor );
+  rootActor.TouchedSignal().Connect( &application, rootFunctor );
 
   // Set actor to require leave events
   actor.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
@@ -879,7 +879,7 @@ int UtcDaliTouchEventActorBecomesInsensitive(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -915,12 +915,12 @@ int UtcDaliTouchEventActorBecomesInsensitiveParentConsumer(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data, false );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Connect to root actor's touched signal
   SignalData rootData;
   TouchEventFunctor rootFunctor( rootData ); // Consumes signal
-  rootActor.TouchSignal().Connect( &application, rootFunctor );
+  rootActor.TouchedSignal().Connect( &application, rootFunctor );
 
   // Emit a down signal
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -974,8 +974,8 @@ int UtcDaliTouchEventMultipleLayers(void)
   application.Render();
 
   // Connect to layer1 and actor1
-  layer1.TouchSignal().Connect( &application, functor );
-  actor1.TouchSignal().Connect( &application, functor );
+  layer1.TouchedSignal().Connect( &application, functor );
+  actor1.TouchedSignal().Connect( &application, functor );
 
   // Hit in hittable area, actor1 should be hit
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -1022,8 +1022,8 @@ int UtcDaliTouchEventMultipleLayers(void)
   application.Render();
 
   // Connect to layer2 and actor2
-  layer2.TouchSignal().Connect( &application, functor );
-  actor2.TouchSignal().Connect( &application, functor );
+  layer2.TouchedSignal().Connect( &application, functor );
+  actor2.TouchedSignal().Connect( &application, functor );
 
   // Emit an event, should hit layer2
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -1092,7 +1092,7 @@ int UtcDaliTouchEventMultipleRenderTasks(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -1142,8 +1142,8 @@ int UtcDaliTouchEventMultipleRenderTasksWithChildLayer(void)
   // Connect to layer's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
-  layer.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
+  layer.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -1204,7 +1204,7 @@ int UtcDaliTouchEventOffscreenRenderTasks(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -1236,8 +1236,8 @@ int UtcDaliTouchEventMultipleRenderableActors(void)
   // Connect to layer's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  parent.TouchSignal().Connect( &application, functor );
-  actor.TouchSignal().Connect( &application, functor );
+  parent.TouchedSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -1262,7 +1262,7 @@ int UtcDaliTouchEventActorRemovedInSignal(void)
   // Connect to actor's touched signal
   SignalData data;
   RemoveActorFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Register for leave events
   actor.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
@@ -1331,7 +1331,7 @@ int UtcDaliTouchEventActorSignalNotConsumed(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data, false );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -1355,7 +1355,7 @@ int UtcDaliTouchEventActorRemovedFromScene(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -1393,7 +1393,7 @@ int UtcDaliTouchEventLayerConsumesTouch(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Add a layer to overlap the actor
   Layer layer = Layer::New();
@@ -1448,7 +1448,7 @@ int UtcDaliTouchEventLeaveActorReadded(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down and motion
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -1504,7 +1504,7 @@ int UtcDaliTouchEventClippedActor(void)
   // Connect to actor's touch signal.
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit an event within clipped area - no hit.
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -1516,7 +1516,7 @@ int UtcDaliTouchEventClippedActor(void)
   DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
   data.Reset();
 
-  clippingChild.TouchSignal().Connect( &application, functor );
+  clippingChild.TouchedSignal().Connect( &application, functor );
 
   // Emit an event inside part of the child which is within the clipped area, we should have a hit.
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 30.0f, 30.0f ) ) );
@@ -1542,7 +1542,7 @@ int UtcDaliTouchEventActorUnparented(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -1585,7 +1585,7 @@ int UtcDaliTouchEventParentRemovedFromScene(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -1628,12 +1628,12 @@ int UtcDaliTouchEventActorRemovedFromSceneDifferentConsumer(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data, false /* Do not consume */ );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Connect to parent's touched signal
   SignalData parentData;
   TouchEventFunctor parentFunctor( parentData );
-  parent.TouchSignal().Connect( &application, parentFunctor );
+  parent.TouchedSignal().Connect( &application, parentFunctor );
 
   // Emit a down signal
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -1680,7 +1680,7 @@ int UtcDaliTouchEventActorRemovedFromSceneDifferentConsumer(void)
   // Parent is now consumer, connect again to the touched signal of the actor so that it becomes the consumer
   SignalData secondData;
   TouchEventFunctor secondFunctor( secondData /* Consume */ );
-  actor.TouchSignal().Connect( &application, secondFunctor );
+  actor.TouchedSignal().Connect( &application, secondFunctor );
 
   // Unparent the actor
   actor.Unparent();
@@ -1721,17 +1721,17 @@ int UtcDaliTouchEventInterruptedDifferentConsumer(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data, false /* Do not consume */ );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Connect to parent's touched signal
   SignalData parentData;
   TouchEventFunctor parentFunctor( parentData, false /* Do not consume */ );
-  parent.TouchSignal().Connect( &application, parentFunctor );
+  parent.TouchedSignal().Connect( &application, parentFunctor );
 
   // Connect to root's touched signal and consume
   SignalData rootData;
   TouchEventFunctor rootFunctor( rootData );
-  rootActor.TouchSignal().Connect( &application, rootFunctor );
+  rootActor.TouchedSignal().Connect( &application, rootFunctor );
 
   // Emit a down signal
   application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) ) );
@@ -1754,7 +1754,7 @@ int UtcDaliTouchEventInterruptedDifferentConsumer(void)
   // Root is now consumer, connect to the touched signal of the parent so that it becomes the consumer
   SignalData secondData;
   TouchEventFunctor secondFunctor( secondData /* Consume */ );
-  parent.TouchSignal().Connect( &application, secondFunctor );
+  parent.TouchedSignal().Connect( &application, secondFunctor );
 
   // Emit an interrupted signal, all three should STILL be called
   application.ProcessEvent( GenerateSingleTouch( PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) ) );
@@ -1787,7 +1787,7 @@ int UtcDaliTouchEventGetRadius(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal with an angle
   Integration::TouchEvent touchEvent = GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) );
@@ -1818,7 +1818,7 @@ int UtcDaliTouchEventGetEllipseRadius(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal with an angle
   Integration::TouchEvent touchEvent = GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) );
@@ -1849,7 +1849,7 @@ int UtcDaliTouchEventGetAngle(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal with an angle
   Integration::TouchEvent touchEvent = GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) );
@@ -1878,7 +1878,7 @@ int UtcDaliTouchEventGetPressure(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal with an angle
   Integration::TouchEvent touchEvent = GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) );
@@ -1907,7 +1907,7 @@ int UtcDaliTouchEventUsage(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
 
   // Emit a down signal with an angle
@@ -1934,7 +1934,7 @@ int UtcDaliTouchEventGetDeviceAPINegative(void)
   // Connect to actor's touched signal
   HandleData handleData;
   TouchEventHandleFunctor functor( handleData );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   Vector2 screenCoordinates( 10.0f, 10.0f );
   Vector2 localCoordinates;
@@ -1965,7 +1965,7 @@ int UtcDaliTouchEventGetMouseButtonPositive(void)
   // Connect to actor's touched signal
   HandleData handleData;
   TouchEventHandleFunctor functor( handleData );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal with MouseButton
   Integration::TouchEvent touchEvent = GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) );
@@ -1994,7 +1994,7 @@ int UtcDaliTouchEventGetMouseButtonNagative(void)
   // Connect to actor's touched signal
   HandleData handleData;
   TouchEventHandleFunctor functor( handleData );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal with MouseButton
   Integration::TouchEvent touchEvent = GenerateSingleTouch( PointState::DOWN, Vector2( 10.0f, 10.0f ) );
@@ -2024,7 +2024,7 @@ int UtcDaliTouchEventCapturePropertySet(void)
   // Connect to actor's touched signal
   SignalData data;
   TouchEventFunctor functor( data );
-  actor.TouchSignal().Connect( &application, functor );
+  actor.TouchedSignal().Connect( &application, functor );
 
   // Emit a down signal
   application.ProcessEvent( GenerateSingleTouch( PointState::STARTED, Vector2( 10.0f, 10.0f ) ) );

diff --git a/dali/devel-api/common/stage.cpp b/dali/devel-api/common/stage.cpp
index d343210..826ec0d 100644 (file)
--- a/dali/devel-api/common/stage.cpp
+++ b/dali/devel-api/common/stage.cpp
@@ -141,9 +141,9 @@ Stage::EventProcessingFinishedSignalType& Stage::EventProcessingFinishedSignal()
   return GetImplementation(*this).EventProcessingFinishedSignal();
 }
 
-Stage::TouchSignalType& Stage::TouchSignal()
+Stage::TouchEventSignalType& Stage::TouchedSignal()
 {
-  return GetImplementation( *this ).TouchSignal();
+  return GetImplementation( *this ).TouchedSignal();
 }
 
 Stage::WheelEventSignalType& Stage::WheelEventSignal()

diff --git a/dali/devel-api/common/stage.h b/dali/devel-api/common/stage.h
index 0d4a169..90d572c 100644 (file)
--- a/dali/devel-api/common/stage.h
+++ b/dali/devel-api/common/stage.h
@@ -76,23 +76,22 @@ class KeyEvent;
  * |-------------------------|--------------------------------------|
  * | keyEvent                | @ref KeyEventSignal()                |
  * | eventProcessingFinished | @ref EventProcessingFinishedSignal() |
- * | touch                   | @ref TouchSignal()                   |
+ * | touched                 | @ref TouchedSignal()                 |
  * | wheelEvent              | @ref WheelEventSignal()              |
  * | contextLost             | @ref ContextLostSignal()             |
  * | contextRegained         | @ref ContextRegainedSignal()         |
  * | sceneCreated            | @ref SceneCreatedSignal()            |
- * @SINCE_1_0.0
  */
 class DALI_CORE_API Stage : public BaseHandle
 {
 public:
 
-  typedef Signal< void (const KeyEvent&) > KeyEventSignalType;       ///< Key event signal type @SINCE_1_0.0
-  typedef Signal< void () > EventProcessingFinishedSignalType;       ///< Event Processing finished signal type @SINCE_1_0.0
-  typedef Signal< void (const TouchEvent&) > TouchSignalType;         ///< Touch signal type @SINCE_1_1.37
-  typedef Signal< void (const WheelEvent&) > WheelEventSignalType;   ///< Wheel signal type @SINCE_1_0.0
-  typedef Signal< void () > ContextStatusSignal;                     ///< Context status signal type @SINCE_1_0.0
-  typedef Signal< void () > SceneCreatedSignalType;                  ///< Scene created signal type @SINCE_1_0.0
+  typedef Signal< void (const KeyEvent&) > KeyEventSignalType;       ///< Key event signal type
+  typedef Signal< void () > EventProcessingFinishedSignalType;       ///< Event Processing finished signal type
+  typedef Signal< void (const TouchEvent&) > TouchEventSignalType;   ///< Touch signal type
+  typedef Signal< void (const WheelEvent&) > WheelEventSignalType;   ///< Wheel signal type
+  typedef Signal< void () > ContextStatusSignal;                     ///< Context status signal type
+  typedef Signal< void () > SceneCreatedSignalType;                  ///< Scene created signal type
 
   /**
    * @brief Allows the creation of an empty stage handle.
@@ -164,7 +163,6 @@ public:
    * The x component will be the width of the Stage in pixels.
    * The y component will be the height of the Stage in pixels.
    * The z component will be the distance between far and near planes.
-   * @SINCE_1_0.0
    * @return The size of the Stage as a Vector
    */
   Vector2 GetSize() const;
@@ -254,7 +252,6 @@ public:
    * @code
    *   void YourCallbackName(const KeyEvent& event);
    * @endcode
-   * @SINCE_1_0.0
    * @return The signal to connect to
    */
   KeyEventSignalType& KeyEventSignal();
@@ -281,7 +278,7 @@ public:
    * @return The touch signal to connect to
    * @note Motion events are not emitted.
    */
-  TouchSignalType& TouchSignal();
+  TouchEventSignalType& TouchedSignal();
 
   /**
    * @brief This signal is emitted when wheel event is received.

diff --git a/dali/integration-api/scene.cpp b/dali/integration-api/scene.cpp
index 4ab7dbf..b40c303 100644 (file)
--- a/dali/integration-api/scene.cpp
+++ b/dali/integration-api/scene.cpp
@@ -184,9 +184,9 @@ Scene::KeyEventGeneratedSignalType& Scene::KeyEventGeneratedSignal()
   return GetImplementation(*this).KeyEventGeneratedSignal();
 }
 
-Scene::TouchSignalType& Scene::TouchSignal()
+Scene::TouchEventSignalType& Scene::TouchedSignal()
 {
-  return GetImplementation(*this).TouchSignal();
+  return GetImplementation(*this).TouchedSignal();
 }
 
 Scene::WheelEventSignalType& Scene::WheelEventSignal()

diff --git a/dali/integration-api/scene.h b/dali/integration-api/scene.h
index b69eb10..67cec73 100755 (executable)
--- a/dali/integration-api/scene.h
+++ b/dali/integration-api/scene.h
@@ -59,7 +59,7 @@ public:
   typedef Signal< void () > EventProcessingFinishedSignalType; ///< Event Processing finished signal type
   typedef Signal< void (const Dali::KeyEvent&) > KeyEventSignalType; ///< Key event signal type
   typedef Signal< bool (const Dali::KeyEvent&) > KeyEventGeneratedSignalType; ///< key event generated signal type
-  typedef Signal< void (const Dali::TouchEvent&) > TouchSignalType; ///< Touch signal type
+  typedef Signal< void (const Dali::TouchEvent&) > TouchEventSignalType; ///< Touch signal type
   typedef Signal< void (const Dali::WheelEvent&) > WheelEventSignalType; ///< Touched signal type
 
   using FrameCallbackContainer = std::vector< std::pair< std::unique_ptr< CallbackBase >, int32_t > >;
@@ -334,7 +334,7 @@ public:
    * @return The touch signal to connect to
    * @note Motion events are not emitted.
    */
-  TouchSignalType& TouchSignal();
+  TouchEventSignalType& TouchedSignal();
 
   /**
    * @brief This signal is emitted when wheel event is received.

diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp
index 91f19d9..23cafc9 100644 (file)
--- a/dali/internal/event/actors/actor-impl.cpp
+++ b/dali/internal/event/actors/actor-impl.cpp
@@ -230,7 +230,7 @@ const char* const SIGNAL_WHEEL_EVENT = "wheelEvent";
 const char* const SIGNAL_ON_SCENE = "onScene";
 const char* const SIGNAL_OFF_SCENE = "offScene";
 const char* const SIGNAL_ON_RELAYOUT = "onRelayout";
-const char* const SIGNAL_TOUCH = "touch";
+const char* const SIGNAL_TOUCHED = "touched";
 const char* const SIGNAL_VISIBILITY_CHANGED = "visibilityChanged";
 const char* const SIGNAL_LAYOUT_DIRECTION_CHANGED = "layoutDirectionChanged";
 const char* const SIGNAL_CHILD_ADDED = "childAdded";
@@ -253,7 +253,7 @@ SignalConnectorType signalConnector3( mType, SIGNAL_WHEEL_EVENT, &Actor::DoConne
 SignalConnectorType signalConnector4( mType, SIGNAL_ON_SCENE, &Actor::DoConnectSignal );
 SignalConnectorType signalConnector5( mType, SIGNAL_OFF_SCENE, &Actor::DoConnectSignal );
 SignalConnectorType signalConnector6( mType, SIGNAL_ON_RELAYOUT, &Actor::DoConnectSignal );
-SignalConnectorType signalConnector7( mType, SIGNAL_TOUCH, &Actor::DoConnectSignal );
+SignalConnectorType signalConnector7( mType, SIGNAL_TOUCHED, &Actor::DoConnectSignal );
 SignalConnectorType signalConnector8( mType, SIGNAL_VISIBILITY_CHANGED, &Actor::DoConnectSignal );
 SignalConnectorType signalConnector9( mType, SIGNAL_LAYOUT_DIRECTION_CHANGED, &Actor::DoConnectSignal );
 SignalConnectorType signalConnector10( mType, SIGNAL_CHILD_ADDED, &Actor::DoConnectSignal );
@@ -1788,7 +1788,7 @@ bool Actor::IsKeyboardFocusable() const
 
 bool Actor::GetTouchRequired() const
 {
-  return !mTouchSignal.Empty() || mDerivedRequiresTouch;
+  return !mTouchedSignal.Empty() || mDerivedRequiresTouch;
 }
 
 bool Actor::GetHoverRequired() const
@@ -1826,10 +1826,10 @@ bool Actor::EmitTouchEventSignal( const Dali::TouchEvent& touch )
 {
   bool consumed = false;
 
-  if( !mTouchSignal.Empty() )
+  if( !mTouchedSignal.Empty() )
   {
     Dali::Actor handle( this );
-    consumed = mTouchSignal.Emit( handle, touch );
+    consumed = mTouchedSignal.Emit( handle, touch );
   }
 
   return consumed;
@@ -1909,9 +1909,9 @@ void Actor::EmitChildRemovedSignal( Actor& child )
   }
 }
 
-Dali::Actor::TouchEventSignalType& Actor::TouchSignal()
+Dali::Actor::TouchEventSignalType& Actor::TouchedSignal()
 {
-  return mTouchSignal;
+  return mTouchedSignal;
 }
 
 Dali::Actor::HoverSignalType& Actor::HoveredSignal()
@@ -1989,9 +1989,9 @@ bool Actor::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra
   {
     actor->OnRelayoutSignal().Connect( tracker, functor );
   }
-  else if( 0 == signalName.compare( SIGNAL_TOUCH ) )
+  else if( 0 == signalName.compare( SIGNAL_TOUCHED ) )
   {
-    actor->TouchSignal().Connect( tracker, functor );
+    actor->TouchedSignal().Connect( tracker, functor );
   }
   else if( 0 == signalName.compare( SIGNAL_VISIBILITY_CHANGED ) )
   {
@@ -2028,7 +2028,7 @@ Actor::Actor( DerivedType derivedType, const SceneGraph::Node& node )
   mAnchorPoint( NULL ),
   mRelayoutData( NULL ),
   mGestureData( NULL ),
-  mTouchSignal(),
+  mTouchedSignal(),
   mHoveredSignal(),
   mWheelEventSignal(),
   mOnSceneSignal(),

diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
index 4b65bb6..b69d897 100644 (file)
--- a/dali/internal/event/actors/actor-impl.h
+++ b/dali/internal/event/actors/actor-impl.h
@@ -1450,9 +1450,9 @@ public:
   void EmitChildRemovedSignal( Actor& child );
 
   /**
-   * @copydoc Dali::Actor::TouchEventSignal()
+   * @copydoc Dali::Actor::TouchedSignal()
    */
-  Dali::Actor::TouchEventSignalType& TouchSignal();
+  Dali::Actor::TouchEventSignalType& TouchedSignal();
 
   /**
    * @copydoc Dali::Actor::HoveredSignal()
@@ -1966,7 +1966,7 @@ protected:
   ActorGestureData* mGestureData;   ///< Optional Gesture data. Only created when actor requires gestures
 
   // Signals
-  Dali::Actor::TouchEventSignalType         mTouchSignal;
+  Dali::Actor::TouchEventSignalType        mTouchedSignal;
   Dali::Actor::HoverSignalType             mHoveredSignal;
   Dali::Actor::WheelEventSignalType        mWheelEventSignal;
   Dali::Actor::OnSceneSignalType           mOnSceneSignal;

diff --git a/dali/internal/event/common/scene-impl.cpp b/dali/internal/event/common/scene-impl.cpp
index 4c9c995..7f85aa1 100644 (file)
--- a/dali/internal/event/common/scene-impl.cpp
+++ b/dali/internal/event/common/scene-impl.cpp
@@ -313,9 +313,9 @@ void Scene::EmitEventProcessingFinishedSignal()
 void Scene::EmitTouchedSignal( const Dali::TouchEvent& touch )
 {
   Dali::Integration::Scene handle( this );
-  if ( !mTouchSignal.Empty() )
+  if ( !mTouchedSignal.Empty() )
   {
-    mTouchSignal.Emit( touch );
+    mTouchedSignal.Emit( touch );
   }
 }
 
@@ -365,9 +365,9 @@ Integration::Scene::EventProcessingFinishedSignalType& Scene::EventProcessingFin
   return mEventProcessingFinishedSignal;
 }
 
-Integration::Scene::TouchSignalType& Scene::TouchSignal()
+Integration::Scene::TouchEventSignalType& Scene::TouchedSignal()
 {
-  return mTouchSignal;
+  return mTouchedSignal;
 }
 
 Integration::Scene::WheelEventSignalType& Scene::WheelEventSignal()

diff --git a/dali/internal/event/common/scene-impl.h b/dali/internal/event/common/scene-impl.h
index a271761..09d6369 100644 (file)
--- a/dali/internal/event/common/scene-impl.h
+++ b/dali/internal/event/common/scene-impl.h
@@ -251,9 +251,9 @@ public:
   Integration::Scene::EventProcessingFinishedSignalType& EventProcessingFinishedSignal();
 
   /**
-    * @copydoc Integration::Scene::TouchSignal()
+    * @copydoc Integration::Scene::TouchedSignal()
     */
-  Integration::Scene::TouchSignalType& TouchSignal();
+  Integration::Scene::TouchEventSignalType& TouchedSignal();
 
   /**
    * @copydoc Integration::Scene::sWheelEventSignal()
@@ -323,7 +323,7 @@ private:
   Integration::Scene::EventProcessingFinishedSignalType mEventProcessingFinishedSignal;
 
   // The touch signal
-  Integration::Scene::TouchSignalType mTouchSignal;
+  Integration::Scene::TouchEventSignalType mTouchedSignal;
 
   // The wheel event signal
   Integration::Scene::WheelEventSignalType mWheelEventSignal;

diff --git a/dali/internal/event/common/stage-impl.cpp b/dali/internal/event/common/stage-impl.cpp
index 7464e64..f05b3f5 100644 (file)
--- a/dali/internal/event/common/stage-impl.cpp
+++ b/dali/internal/event/common/stage-impl.cpp
@@ -65,7 +65,7 @@ namespace
 const char* const SIGNAL_KEY_EVENT =                 "keyEvent";
 const char* const SIGNAL_KEY_EVENT_GENERATED =       "keyEventGenerated";
 const char* const SIGNAL_EVENT_PROCESSING_FINISHED = "eventProcessingFinished";
-const char* const SIGNAL_TOUCH =                     "touch";
+const char* const SIGNAL_TOUCHED =                   "touched";
 const char* const SIGNAL_WHEEL_EVENT =               "wheelEvent";
 const char* const SIGNAL_CONTEXT_LOST =              "contextLost";
 const char* const SIGNAL_CONTEXT_REGAINED =          "contextRegained";
@@ -80,7 +80,7 @@ SignalConnectorType signalConnector5( mType, SIGNAL_CONTEXT_LOST,              &
 SignalConnectorType signalConnector6( mType, SIGNAL_CONTEXT_REGAINED,          &Stage::DoConnectSignal );
 SignalConnectorType signalConnector7( mType, SIGNAL_SCENE_CREATED,             &Stage::DoConnectSignal );
 SignalConnectorType signalConnector8( mType, SIGNAL_KEY_EVENT_GENERATED,       &Stage::DoConnectSignal );
-SignalConnectorType signalConnector9( mType, SIGNAL_TOUCH,                     &Stage::DoConnectSignal );
+SignalConnectorType signalConnector9( mType, SIGNAL_TOUCHED,                   &Stage::DoConnectSignal );
 
 } // unnamed namespace
 
@@ -95,7 +95,7 @@ void Stage::Initialize( Scene& scene )
   mScene->SetBackgroundColor( Dali::DEFAULT_BACKGROUND_COLOR );
   mScene->EventProcessingFinishedSignal().Connect( this, &Stage::OnEventProcessingFinished );
   mScene->KeyEventSignal().Connect( this, &Stage::OnKeyEvent );
-  mScene->TouchSignal().Connect( this, &Stage::OnTouchEvent );
+  mScene->TouchedSignal().Connect( this, &Stage::OnTouchEvent );
   mScene->WheelEventSignal().Connect( this, &Stage::OnWheelEvent );
 }
 
@@ -231,9 +231,9 @@ bool Stage::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra
   {
     stage->EventProcessingFinishedSignal().Connect( tracker, functor );
   }
-  else if( 0 == strcmp( signalName.c_str(), SIGNAL_TOUCH ) )
+  else if( 0 == strcmp( signalName.c_str(), SIGNAL_TOUCHED ) )
   {
-    stage->TouchSignal().Connect( tracker, functor );
+    stage->TouchedSignal().Connect( tracker, functor );
   }
   else if( 0 == strcmp( signalName.c_str(), SIGNAL_WHEEL_EVENT ) )
   {
@@ -276,7 +276,7 @@ void Stage::OnKeyEvent( const Dali::KeyEvent& event )
 
 void Stage::OnTouchEvent( const Dali::TouchEvent& touch )
 {
-  mTouchSignal.Emit( touch );
+  EmitTouchedSignal( touch );
 }
 
 void Stage::OnWheelEvent( const Dali::WheelEvent& event )
@@ -300,12 +300,12 @@ bool Stage::EmitKeyEventGeneratedSignal(const KeyEvent& event)
 
 void Stage::EmitEventProcessingFinishedSignal()
 {
-   mEventProcessingFinishedSignal.Emit();
+  mEventProcessingFinishedSignal.Emit();
 }
 
 void Stage::EmitTouchedSignal( const Dali::TouchEvent& touch )
 {
-  mTouchSignal.Emit( touch );
+  mTouchedSignal.Emit( touch );
 }
 
 void Stage::EmitWheelEventSignal( const WheelEvent& event )
@@ -351,9 +351,9 @@ Dali::Stage::EventProcessingFinishedSignalType& Stage::EventProcessingFinishedSi
   return mEventProcessingFinishedSignal;
 }
 
-Dali::Stage::TouchSignalType& Stage::TouchSignal()
+Dali::Stage::TouchEventSignalType& Stage::TouchedSignal()
 {
-  return mTouchSignal;
+  return mTouchedSignal;
 }
 
 Dali::Stage::WheelEventSignalType& Stage::WheelEventSignal()
@@ -391,7 +391,7 @@ Stage::Stage( SceneGraph::UpdateManager& updateManager )
   mKeyEventSignal(),
   mKeyEventGeneratedSignal(),
   mEventProcessingFinishedSignal(),
-  mTouchSignal(),
+  mTouchedSignal(),
   mWheelEventSignal(),
   mContextLostSignal(),
   mContextRegainedSignal(),

diff --git a/dali/internal/event/common/stage-impl.h b/dali/internal/event/common/stage-impl.h
index 4ce80b0..734a2d6 100644 (file)
--- a/dali/internal/event/common/stage-impl.h
+++ b/dali/internal/event/common/stage-impl.h
@@ -206,7 +206,7 @@ public:
   void OnKeyEvent( const Dali::KeyEvent& event );
 
   /**
-   * Callback for Internal::Scene TouchSignal signal
+   * Callback for Internal::Scene TouchedSignal signal
    */
   void OnTouchEvent( const Dali::TouchEvent& touch );
 
@@ -263,9 +263,9 @@ public:
   Dali::Stage::EventProcessingFinishedSignalType& EventProcessingFinishedSignal();
 
   /**
-    * @copydoc Dali::Stage::TouchSignal()
+    * @copydoc Dali::Stage::TouchedSignal()
     */
-  Dali::Stage::TouchSignalType& TouchSignal();
+  Dali::Stage::TouchEventSignalType& TouchedSignal();
 
   /**
    * @copydoc Dali::Stage::WheelEventSignal()
@@ -351,7 +351,7 @@ private:
   Dali::Stage::EventProcessingFinishedSignalType  mEventProcessingFinishedSignal;
 
   // The touched signal
-  Dali::Stage::TouchSignalType                    mTouchSignal;
+  Dali::Stage::TouchEventSignalType               mTouchedSignal;
 
   // The wheel event signal
   Dali::Stage::WheelEventSignalType               mWheelEventSignal;

diff --git a/dali/public-api/actors/actor.cpp b/dali/public-api/actors/actor.cpp
index bdec7c3..b3e8cf7 100644 (file)
--- a/dali/public-api/actors/actor.cpp
+++ b/dali/public-api/actors/actor.cpp
@@ -202,9 +202,9 @@ float Actor::GetRelayoutSize( Dimension::Type dimension ) const
   return GetImplementation(*this).GetRelayoutSize( dimension );
 }
 
-Actor::TouchEventSignalType& Actor::TouchSignal()
+Actor::TouchEventSignalType& Actor::TouchedSignal()
 {
-  return GetImplementation( *this ).TouchSignal();
+  return GetImplementation( *this ).TouchedSignal();
 }
 
 Actor::HoverSignalType& Actor::HoveredSignal()

diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h
index d556600..7970256 100644 (file)
--- a/dali/public-api/actors/actor.h
+++ b/dali/public-api/actors/actor.h
@@ -65,7 +65,7 @@ typedef Rect<float> Padding;      ///< Padding definition @SINCE_1_0.0
  *
  * <h3>Multi-Touch Events:</h3>
  *
- * Touch or hover events are received via signals; see Actor::TouchSignal() and Actor::HoveredSignal() for more details.
+ * Touch or hover events are received via signals; see Actor::TouchedSignal() and Actor::HoveredSignal() for more details.
  *
  * <i>Hit Testing Rules Summary:</i>
  *
@@ -220,7 +220,7 @@ typedef Rect<float> Padding;      ///< Padding definition @SINCE_1_0.0
  * Signals
  * | %Signal Name      | Method                       |
  * |-------------------|------------------------------|
- * | touch             | @ref TouchSignal()           |
+ * | touched           | @ref TouchedSignal()         |
  * | hovered           | @ref HoveredSignal()         |
  * | wheelEvent        | @ref WheelEventSignal()      |
  * | onScene           | @ref OnSceneSignal()         |
@@ -730,7 +730,7 @@ public:
 
   // Typedefs
 
-  typedef Signal< bool (Actor, const TouchEvent&) >  TouchEventSignalType;    ///< Touch signal type @SINCE_1_1.37
+  typedef Signal< bool (Actor, const TouchEvent&) > TouchEventSignalType;   ///< Touch signal type @SINCE_1_1.37
   typedef Signal< bool (Actor, const HoverEvent&) > HoverSignalType;        ///< Hover signal type @SINCE_1_0.0
   typedef Signal< bool (Actor, const WheelEvent&) > WheelEventSignalType;   ///< Wheel signal type @SINCE_1_0.0
   typedef Signal< void (Actor) > OnSceneSignalType;                         ///< Scene connection signal type @SINCE_1_9.24
@@ -1170,11 +1170,11 @@ public: // Signals
    * The return value of True, indicates that the touch event has been consumed.
    * Otherwise the signal will be emitted on the next sensitive parent of the actor.
    * A true return will also cancel any ongoing gestures.
-   * @SINCE_1_1.37
+   * @SINCE_1_9.28
    * @return The signal to connect to
    * @pre The Actor has been initialized.
    */
-  TouchEventSignalType& TouchSignal();
+  TouchEventSignalType& TouchedSignal();
 
   /**
    * @brief This signal is emitted when hover input is received.

diff --git a/dali/public-api/signals/dali-signal.h b/dali/public-api/signals/dali-signal.h
index ec789c4..4812ca9 100644 (file)
--- a/dali/public-api/signals/dali-signal.h
+++ b/dali/public-api/signals/dali-signal.h
@@ -40,7 +40,7 @@
  *   {
  *     Actor actor = Actor::New();
  *
- *     actor.TouchSignal().Connect( this, &MyClass::Callback );
+ *     actor.TouchedSignal().Connect( this, &MyClass::Callback );
  *   }
  *
  *   ~MyClass()