Changes after TouchedSignal changes

Change-Id: I2969e88887c684a556c7372ca7f4e07abc3969fa

Changes after TouchedSignal changes
Change-Id: I2969e88887c684a556c7372ca7f4e07abc3969fa
Adeel Kazmi
1 parent 3818d79b
Showing 44 changed files with 61 additions and 61 deletions
examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
examples/animated-gradient-card-active/animated-gradient-card-active.cpp
examples/arc-visual/arc-visual-example.cpp
examples/benchmark/benchmark.cpp
examples/bezier-curve/bezier-curve-example.cpp
examples/blocks/blocks-example.cpp
examples/bubble-effect/bubble-effect-example.cpp
examples/clipping-draw-order/clipping-draw-order.cpp
examples/color-visual/color-visual-example.cpp
examples/compressed-texture-formats/compressed-texture-formats-example.cpp
examples/fpp-game/fpp-game-tutorial-controller.cpp
examples/fpp-game/game-camera.cpp
examples/gaussian-blur-view/gaussian-blur-view-example.cpp
examples/gestures/gesture-example.cpp
examples/hello-world/hello-world-example.cpp
examples/homescreen-benchmark/homescreen-benchmark.cpp
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
examples/magnifier/magnifier-example.cpp
examples/mesh-visual/mesh-visual-example.cpp
@@ -80,7 +80,7 @@ private:
  
     LoadImages();
  
-    window.TouchSignal().Connect( this, &ImageViewAlphaBlendApp::OnTouched );
+    window.TouchedSignal().Connect( this, &ImageViewAlphaBlendApp::OnTouched );
   }
  
   void OnTouched( const TouchEvent& touch )
@@ -308,7 +308,7 @@ public:
     SetupActors();
     SetupAnimation();
  
-    mWindow.GetRootLayer().TouchSignal().Connect( this, &CardController::OnTouchLayer );
+    mWindow.GetRootLayer().TouchedSignal().Connect( this, &CardController::OnTouchLayer );
     Reset();
   }
  
@@ -583,7 +583,7 @@ private:
     mCards.Init( mWindow );
     for( int k = 0; k < CARD_NUM; k++ )
     {
-      mCards[k].TouchSignal().Connect( this, &CardController::OnTouchCards );
+      mCards[k].TouchedSignal().Connect( this, &CardController::OnTouchCards );
     }
     mNormalStartColor = mCards.GetColorBackground( mCards.mCurIndex );
     mNormalEndColor = mCards.GetColorBackground( mCards.mCurIndex );
@@ -117,7 +117,7 @@ private:
     mStartAngleLabel.SetProperty( Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE );
     mStartAngleLabel.SetProperty( Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE );
     mStartAngleLabel.SetProperty( Control::Property::PADDING, Extents( 20.0f, 20.0f, 10.0f, 10.0f ) );
-    mStartAngleLabel.TouchSignal().Connect( this, &ArcVisualExample::OnButtonTouch );
+    mStartAngleLabel.TouchedSignal().Connect( this, &ArcVisualExample::OnButtonTouch );
     window.Add( mStartAngleLabel );
  
     mSweepAngleLabel = TextLabel::New( "2" );
@@ -128,7 +128,7 @@ private:
     mSweepAngleLabel.SetProperty( Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE );
     mSweepAngleLabel.SetProperty( Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE );
     mSweepAngleLabel.SetProperty( Control::Property::PADDING, Extents( 20.0f, 20.0f, 10.0f, 10.0f ) );
-    mSweepAngleLabel.TouchSignal().Connect( this, &ArcVisualExample::OnButtonTouch );
+    mSweepAngleLabel.TouchedSignal().Connect( this, &ArcVisualExample::OnButtonTouch );
     window.Add( mSweepAngleLabel );
  
     mThicknessLabel = TextLabel::New( "3" );
@@ -139,7 +139,7 @@ private:
     mThicknessLabel.SetProperty( Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE );
     mThicknessLabel.SetProperty( Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE );
     mThicknessLabel.SetProperty( Control::Property::PADDING, Extents( 20.0f, 20.0f, 10.0f, 10.0f ) );
-    mThicknessLabel.TouchSignal().Connect( this, &ArcVisualExample::OnButtonTouch );
+    mThicknessLabel.TouchedSignal().Connect( this, &ArcVisualExample::OnButtonTouch );
     window.Add( mThicknessLabel );
  
     mPlusTextLabel = TextLabel::New( "+" );
@@ -150,7 +150,7 @@ private:
     mPlusTextLabel.SetProperty( Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE );
     mPlusTextLabel.SetProperty( Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE );
     mPlusTextLabel.SetProperty( Control::Property::PADDING, Extents( 20.0f, 20.0f, 10.0f, 10.0f ) );
-    mPlusTextLabel.TouchSignal().Connect( this, &ArcVisualExample::OnButtonTouch );
+    mPlusTextLabel.TouchedSignal().Connect( this, &ArcVisualExample::OnButtonTouch );
     window.Add( mPlusTextLabel );
  
     mMinusTextLabel = TextLabel::New( "-" );
@@ -161,11 +161,11 @@ private:
     mMinusTextLabel.SetProperty( Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE );
     mMinusTextLabel.SetProperty( Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE );
     mMinusTextLabel.SetProperty( Control::Property::PADDING, Extents( 25.0f, 25.0f, 10.0f, 10.0f ) );
-    mMinusTextLabel.TouchSignal().Connect( this, &ArcVisualExample::OnButtonTouch );
+    mMinusTextLabel.TouchedSignal().Connect( this, &ArcVisualExample::OnButtonTouch );
     window.Add( mMinusTextLabel );
  
     // Respond to a click anywhere on the window
-    window.GetRootLayer().TouchSignal().Connect( this, &ArcVisualExample::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &ArcVisualExample::OnTouch );
  
     // Respond to key events
     window.KeyEventSignal().Connect( this, &ArcVisualExample::OnKeyEvent );
@@ -232,7 +232,7 @@ public:
     mSize = Vector3( windowSize.x / mColumnsPerPage, windowSize.y / mRowsPerPage, 0.0f );
  
     // Respond to a click anywhere on the window
-    window.GetRootLayer().TouchSignal().Connect( this, &Benchmark::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &Benchmark::OnTouch );
  
     // Respond to key events
     window.KeyEventSignal().Connect( this, &Benchmark::OnKeyEvent );
@@ -159,7 +159,7 @@ public:
  
     mContentLayer = Layer::New();
     mContentLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    mContentLayer.TouchSignal().Connect(this, &BezierCurveExample::OnTouchLayer);
+    mContentLayer.TouchedSignal().Connect(this, &BezierCurveExample::OnTouchLayer);
     mContentLayer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
     window.Add( mContentLayer );
  
@@ -330,7 +330,7 @@ public:
     constraint.AddSource( Source( parent, Actor::Property::SIZE ) );
     constraint.Apply();
  
-    actor.TouchSignal().Connect(this, &BezierCurveExample::OnTouchControlPoint);
+    actor.TouchedSignal().Connect(this, &BezierCurveExample::OnTouchControlPoint);
     return actor;
   }
  
@@ -312,8 +312,8 @@ private:
  
     mPaddle.SetProperty( Actor::Property::POSITION, windowSize * Vector3( PADDLE_START_POSITION ) );
     mContentLayer.Add(mPaddle);
-    mPaddle.TouchSignal().Connect(this, &ExampleController::OnTouchPaddle);
-    mContentLayer.TouchSignal().Connect(this, &ExampleController::OnTouchLayer);
+    mPaddle.TouchedSignal().Connect(this, &ExampleController::OnTouchPaddle);
+    mContentLayer.TouchedSignal().Connect(this, &ExampleController::OnTouchLayer);
  
     const float margin(BALL_SIZE.width * windowSize.width * 0.5f);
  
@@ -147,7 +147,7 @@ private:
     mTimerForBubbleEmission.TickSignal().Connect(this, &BubbleEffectExample::OnTimerTick);
  
     // Connect the callback to the touch signal on the background
-    mBackground.TouchSignal().Connect( this, &BubbleEffectExample::OnTouch );
+    mBackground.TouchedSignal().Connect( this, &BubbleEffectExample::OnTouch );
   }
  
  
@@ -198,7 +198,7 @@ public:
     window.Add( view );
  
     // Respond to a click anywhere on the window
-    window.GetRootLayer().TouchSignal().Connect( this, &ClippingDrawOrderVerification::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &ClippingDrawOrderVerification::OnTouch );
   }
  
   bool OnTouch( Actor actor, const TouchEvent& touch )
@@ -80,7 +80,7 @@ public:
     window.Add( mImageView );
  
     // Respond to a click anywhere on the window
-    window.GetRootLayer().TouchSignal().Connect( this, &ColorVisualExample::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &ColorVisualExample::OnTouch );
  
     // Respond to key events
     window.KeyEventSignal().Connect( this, &ColorVisualExample::OnKeyEvent );
@@ -177,7 +177,7 @@ public:
     window.Add( table );
  
     // Respond to touch and key signals
-    window.GetRootLayer().TouchSignal().Connect( this, &CompressedTextureFormatsController::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &CompressedTextureFormatsController::OnTouch );
     window.KeyEventSignal().Connect(this, &CompressedTextureFormatsController::OnKeyEvent);
   }
  
@@ -166,7 +166,7 @@ void FppGameTutorialController::DisplayTutorial( Dali::Window window )
 void FppGameTutorialController::OnTutorialAnimationFinished( Animation& animation )
 {
   // touch signal will wait for a single touch on each side of screen
-  mWindow.TouchSignal().Connect( this, &FppGameTutorialController::OnTouch );
+  mWindow.TouchedSignal().Connect( this, &FppGameTutorialController::OnTouch );
 }
  
 void FppGameTutorialController::OnTutorialComplete( Animation& animation )
@@ -200,8 +200,8 @@ void GameCamera::CreateInterceptorActor()
   mInterceptorActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
   mCameraActor.Add( mInterceptorActor );
  
-  // Connect TouchSignal to interceptor actor
-  mInterceptorActor.TouchSignal().Connect( this, &GameCamera::OnTouch );
+  // Connect TouchedSignal to interceptor actor
+  mInterceptorActor.TouchedSignal().Connect( this, &GameCamera::OnTouch );
 }
  
 bool GameCamera::OnTouch( Actor actor, const TouchEvent& touch )
@@ -110,7 +110,7 @@ private:
     mGaussianBlurView.Add( mImageView );
     mGaussianBlurView.SetProperty( mGaussianBlurView.GetBlurStrengthPropertyIndex(), mStrength );
  
-    window.GetRootLayer().TouchSignal().Connect( this, &GaussianBlurViewExample::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &GaussianBlurViewExample::OnTouch );
   }
  
   bool OnTouch( Actor actor, const TouchEvent& touch )
@@ -158,7 +158,7 @@ private:
     background.Add( touchControl );
  
     // Connect to the touch signal
-    touchControl.TouchSignal().Connect( this, &GestureExample::OnTouch );
+    touchControl.TouchedSignal().Connect( this, &GestureExample::OnTouch );
     touchControl.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
  
     // Create a long press gesture detector, attach the actor & connect
@@ -48,7 +48,7 @@ public:
     window.Add( textLabel );
  
     // Respond to a touch anywhere on the window
-    window.GetRootLayer().TouchSignal().Connect( this, &HelloWorldController::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &HelloWorldController::OnTouch );
  
     // Respond to key events
     window.KeyEventSignal().Connect( this, &HelloWorldController::OnKeyEvent );
@@ -184,7 +184,7 @@ public:
     window.Add( mScrollParent );
  
     // Respond to a click anywhere on the window.
-    window.GetRootLayer().TouchSignal().Connect( this, &HomescreenBenchmark::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &HomescreenBenchmark::OnTouch );
  
     // Respond to key events
     window.KeyEventSignal().Connect( this, &HomescreenBenchmark::OnKeyEvent );
@@ -270,7 +270,7 @@ public:
     imagePrevious.SetProperty( Actor::Property::OPACITY, 0.6f );
     controlsLayer.Add( imagePrevious );
     imagePrevious.SetProperty( Dali::Actor::Property::NAME, PREVIOUS_BUTTON_ID );
-    imagePrevious.TouchSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched );
+    imagePrevious.TouchedSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched );
  
     // Next image button:
     Toolkit::ImageView imageNext = Toolkit::ImageView::New( DALI_ICON_PLAY, ImageDimensions( playWidth, playWidth ) );
@@ -280,7 +280,7 @@ public:
     imageNext.SetProperty( Actor::Property::OPACITY, 0.6f );
     controlsLayer.Add( imageNext );
     imageNext.SetProperty( Dali::Actor::Property::NAME, NEXT_BUTTON_ID );
-    imageNext.TouchSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched );
+    imageNext.TouchedSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched );
  
     // Buttons to popup selectors for fitting and sampling modes:
  
@@ -477,7 +477,7 @@ public:
       ImageView image = CreateImageView( imageSource.configuration.path, imageSize.x, imageSize.y, fittingMode );
       image.SetProperty( Actor::Property::POSITION, Vector3( imagePosition.x, imagePosition.y, 0 ) );
       image.SetProperty( Actor::Property::SIZE, imageSize );
-      image.TouchSignal().Connect( this, &ImageScalingIrregularGridController::OnTouchImage );
+      image.TouchedSignal().Connect( this, &ImageScalingIrregularGridController::OnTouchImage );
       image.ResourceReadySignal().Connect( this, &ImageScalingIrregularGridController::ResourceReadySignal );
       mFittingModes[image.GetProperty< int >( Actor::Property::ID )] = fittingMode;
       mResourceUrls[image.GetProperty< int >( Actor::Property::ID )] = imageSource.configuration.path;
@@ -211,7 +211,7 @@ public:
                                        APPLICATION_TITLE );
  
     mContent.SetProperty( Actor::Property::LEAVE_REQUIRED,true);
-    mContent.TouchSignal().Connect( this, &ExampleController::OnTouched );
+    mContent.TouchedSignal().Connect( this, &ExampleController::OnTouched );
  
     // Create magnifier (controlled by human touch)
     Layer overlay = Layer::New();
@@ -99,7 +99,7 @@ public:
     //Set up root layer to receive touch gestures.
     Layer rootLayer = window.GetRootLayer();
     rootLayer.RegisterProperty( "Tag", LAYER_TAG ); //Used to differentiate between different kinds of actor.
-    rootLayer.TouchSignal().Connect( this, &MeshVisualController::OnTouch );
+    rootLayer.TouchedSignal().Connect( this, &MeshVisualController::OnTouch );
  
     //Place models on the scene.
     SetupModels( rootLayer );
@@ -124,7 +124,7 @@ public:
       mContainers[i].SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
       mContainers[i].RegisterProperty( "Tag", MODEL_TAG ); //Used to differentiate between different kinds of actor.
       mContainers[i].RegisterProperty( "Model", Property::Value( i ) ); //Used to index into the model.
-      mContainers[i].TouchSignal().Connect( this, &MeshVisualController::OnTouch );
+      mContainers[i].TouchedSignal().Connect( this, &MeshVisualController::OnTouch );
       layer.Add( mContainers[i] );
     }
  
@@ -280,7 +280,7 @@ public:
     SetLightImage();
  
     //Connect to touch signal for dragging.
-    mLightSource.TouchSignal().Connect( this, &MeshVisualController::OnTouch );
+    mLightSource.TouchedSignal().Connect( this, &MeshVisualController::OnTouch );
  
     //Place the light source on a layer above the base, so that it is rendered above everything else.
     Layer upperLayer = Layer::New();
@@ -364,7 +364,7 @@ void MetaballExplosionController::Create( Application&amp; app )
   mTimerDispersion.TickSignal().Connect( this, &MetaballExplosionController::OnTimerDispersionTick );
  
   // Connect the callback to the touch signal on the mesh actor
-  window.GetRootLayer().TouchSignal().Connect( this, &MetaballExplosionController::OnTouch );
+  window.GetRootLayer().TouchedSignal().Connect( this, &MetaballExplosionController::OnTouch );
 }
  
 Geometry MetaballExplosionController::CreateGeometry( bool aspectMappedTexture )
@@ -338,7 +338,7 @@ void MetaballRefracController::Create( Application&amp; app )
   CreateAnimations();
  
   // Connect the callback to the touch signal on the mesh actor
-  window.GetRootLayer().TouchSignal().Connect( this, &MetaballRefracController::OnTouch );
+  window.GetRootLayer().TouchedSignal().Connect( this, &MetaballRefracController::OnTouch );
 }
  
 Geometry MetaballRefracController::CreateGeometry( bool aspectMappedTexture )
@@ -233,7 +233,7 @@ public:
     mSize = Vector3( windowSize.x / mColumnsPerPage, windowSize.y / mRowsPerPage, 0.0f );
  
     // Respond to a click anywhere on the window
-    window.GetRootLayer().TouchSignal().Connect( this, &PerfScroll::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &PerfScroll::OnTouch );
  
     // Respond to key events
     window.KeyEventSignal().Connect( this, &PerfScroll::OnKeyEvent );
@@ -116,7 +116,7 @@ public:
     // Get a handle to the window
     Window window = application.GetWindow();
  
-    window.GetRootLayer().TouchSignal().Connect( this, &RayMarchingExample::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &RayMarchingExample::OnTouch );
  
     window.KeyEventSignal().Connect(this, &RayMarchingExample::OnKeyEvent);
  
@@ -298,7 +298,7 @@ private:
     mContent.Add( mMeshActor );
  
     // Connect the callback to the touch signal on the mesh actor
-    mContent.TouchSignal().Connect( this, &RefractionEffectExample::OnTouch );
+    mContent.TouchedSignal().Connect( this, &RefractionEffectExample::OnTouch );
  
     // shader used when the finger is touching the screen. render refraction effect
     mShaderRefraction = Shader::New( VERTEX_SHADER_REFRACTION, FRAGMENT_SHADER_REFRACTION );
@@ -45,7 +45,7 @@ public:
  
   void ConnectEventSignal(Control control)
   {
-    control.TouchSignal().Connect(this, &MyTester::OnControlTouch);
+    control.TouchedSignal().Connect(this, &MyTester::OnControlTouch);
  
     control.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true);
     control.KeyEventSignal().Connect(this, &MyTester::OnControlKeyEvent);
@@ -59,7 +59,7 @@ public:
     mWindow = application.GetWindow();
     mWindow.SetBackgroundColor(Color::BLACK);
     mWindow.KeyEventSignal().Connect(this, &MyTester::OnKey);
-    mWindow.TouchSignal().Connect(this, &MyTester::OnTouch);
+    mWindow.TouchedSignal().Connect(this, &MyTester::OnTouch);
  
     TextLabel rubric = TextLabel::New( "You will need a working internet connection to see the images below");
     rubric.SetProperty( TextLabel::Property::MULTI_LINE, true );
@@ -255,7 +255,7 @@ private:
     mBounceAnimation.Play();
  
     // Respond to a click anywhere on the window
-    window.GetRootLayer().TouchSignal().Connect( this, &RendererStencilExample::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &RendererStencilExample::OnTouch );
     // Connect signals to allow Back and Escape to exit.
     window.KeyEventSignal().Connect( this, &RendererStencilExample::OnKeyEvent );
   }
@@ -194,7 +194,7 @@ public:
     PlayAnimation();
  
     // Respond to a click anywhere on the window
-    window.GetRootLayer().TouchSignal().Connect( this, &BasicLightController::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &BasicLightController::OnTouch );
  
     // Respond to key events
     window.KeyEventSignal().Connect( this, &BasicLightController::OnKeyEvent );
@@ -126,7 +126,7 @@ public:
     InitActors();
  
     // Respond to a click anywhere on the window
-    window.GetRootLayer().TouchSignal().Connect( this, &BasicPbrController::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &BasicPbrController::OnTouch );
  
     // Respond to key events
     window.KeyEventSignal().Connect( this, &BasicPbrController::OnKeyEvent );
@@ -99,7 +99,7 @@ public:
     PlayAnimation();
  
     // Respond to a click anywhere on the window
-    window.GetRootLayer().TouchSignal().Connect( this, &DrawCubeController::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &DrawCubeController::OnTouch );
  
     // Respond to key events
     window.KeyEventSignal().Connect( this, &DrawCubeController::OnKeyEvent );
@@ -92,7 +92,7 @@ public:
     CreateActor();
  
     // Respond to a click anywhere on the window
-    window.GetRootLayer().TouchSignal().Connect( this, &DrawLineController::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &DrawLineController::OnTouch );
  
     // Respond to key events
     window.KeyEventSignal().Connect( this, &DrawLineController::OnKeyEvent );
@@ -152,7 +152,7 @@ public:
     animation.Play();
  
     // 6. Exit the application when touched
-    window.GetRootLayer().TouchSignal().Connect( this, &RadialProgressController::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &RadialProgressController::OnTouch );
   }
  
   bool OnTouch( Actor actor, const TouchEvent& touch )
@@ -143,8 +143,8 @@ void LookCamera::CreateInterceptorActor()
   mInterceptorActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
   mCameraActor.Add( mInterceptorActor );
  
-  // Connect TouchSignal to interceptor actor
-  mInterceptorActor.TouchSignal().Connect( this, &LookCamera::OnTouch );
+  // Connect TouchedSignal to interceptor actor
+  mInterceptorActor.TouchedSignal().Connect( this, &LookCamera::OnTouch );
 }
  
 bool LookCamera::OnTouch( Actor actor, const TouchEvent& touch )
@@ -105,7 +105,7 @@ public:
     PlayAnimation();
  
     // Respond to a click anywhere on the window
-    window.GetRootLayer().TouchSignal().Connect( this, &TexturedCubeController::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &TexturedCubeController::OnTouch );
  
     // Respond to key events
     window.KeyEventSignal().Connect( this, &TexturedCubeController::OnKeyEvent );
@@ -92,7 +92,7 @@ public:
     CreateActor();
  
     // Respond to a click anywhere on the window
-    window.GetRootLayer().TouchSignal().Connect( this, &DrawTriangleController::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &DrawTriangleController::OnTouch );
  
     // Respond to key events
     window.KeyEventSignal().Connect( this, &DrawTriangleController::OnKeyEvent );
@@ -469,7 +469,7 @@ private:
     actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
     actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER);
  
-    actor.TouchSignal().Connect( this, &ExampleController::OnTouchImage );
+    actor.TouchedSignal().Connect( this, &ExampleController::OnTouchImage );
     return actor;
   }
  
@@ -128,7 +128,7 @@ public:
     popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
     popup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::WIDTH );
     popup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::HEIGHT );
-    popup.TouchSignal().Connect( this, &TextFieldExample::OnPopupTouched );
+    popup.TouchedSignal().Connect( this, &TextFieldExample::OnPopupTouched );
  
     return popup;
   }
@@ -65,7 +65,7 @@ public:
     mTableView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
     mTableView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
     mTableView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-    mTableView.TouchSignal().Connect( this, &EmojiExample::OnTouch );
+    mTableView.TouchedSignal().Connect( this, &EmojiExample::OnTouch );
     window.Add( mTableView );
  
     for( unsigned int index = 0u; index < NUMBER_OF_EMOJIS; ++index )
@@ -67,7 +67,7 @@ public:
     mTableView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
     mTableView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
     mTableView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
-    mTableView.TouchSignal().Connect( this, &TextLabelMultiLanguageExample::OnTouch );
+    mTableView.TouchedSignal().Connect( this, &TextLabelMultiLanguageExample::OnTouch );
     window.Add( mTableView );
  
     for( unsigned int index = 0u; index < NUMBER_OF_LANGUAGES; ++index )
@@ -56,7 +56,7 @@ public:
     window.Add( mTextLabel );
  
     // Respond to a click anywhere on the window
-    window.GetRootLayer().TouchSignal().Connect( this, &TiltController::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect( this, &TiltController::OnTouch );
  
     CreateSensor();
  
@@ -129,7 +129,7 @@ void TransitionApplication::Create( Application&amp; application )
     mVisualButtons[i].SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
     mVisualButtons[i].SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT );
     mVisualIndex = mVisualButtons[i].RegisterProperty( "visualId", i, Property::READ_WRITE );
-    mVisualButtons[i].TouchSignal().Connect( this, &TransitionApplication::OnVisualButtonClicked );
+    mVisualButtons[i].TouchedSignal().Connect( this, &TransitionApplication::OnVisualButtonClicked );
     visualTypeLayout.AddChild( mVisualButtons[i], TableView::CellPosition( 0, i ) );
   }
  
@@ -82,7 +82,7 @@ public:
     mAddressLabel.SetProperty( Toolkit::TextLabel::Property::POINT_SIZE, fontSize );
     mAddressLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
     mAddressLabel.SetBackgroundColor( Vector4( 0, 0, 0, 0.5f ) );
-    mAddressLabel.TouchSignal().Connect( this, &WebViewController::OnTouchText );
+    mAddressLabel.TouchedSignal().Connect( this, &WebViewController::OnTouchText );
     window.Add( mAddressLabel );
  
     // Respond to key events
@@ -92,7 +92,7 @@
     "size": [200, 200, 1],
     "orientation": [0, 0, 30],
     "signals": [{
-      "name": "touch",
+      "name": "touched",
       "action": "play",
       "animation": "animate"
     }]
@@ -106,7 +106,7 @@
     "position": [-150, -50, 0],
     "text": "or me",
     "signals": [{
-      "name": "touch",
+      "name": "touched",
       "action": "play",
       "animation": "pathAnimation"
     }]
@@ -124,7 +124,7 @@
     "position": [0, 200, 0],
     "size": [200, 200, 1],
     "signals": [{
-      "name": "touch",
+      "name": "touched",
       "action": "play",
       "animation": "rotate"
     }],
@@ -265,7 +265,7 @@ void DaliTableView::Initialize( Application&amp; application )
   mScrollView.SetAxisAutoLock( true );
   mScrollView.ScrollCompletedSignal().Connect( this, &DaliTableView::OnScrollComplete );
   mScrollView.ScrollStartedSignal().Connect( this, &DaliTableView::OnScrollStart );
-  mScrollView.TouchSignal().Connect( this, &DaliTableView::OnScrollTouched );
+  mScrollView.TouchedSignal().Connect( this, &DaliTableView::OnScrollTouched );
  
   mPageWidth = windowSize.GetWidth() * TABLE_RELATIVE_SIZE.x * 0.5f;
  
@@ -551,7 +551,7 @@ Actor DaliTableView::CreateTile( const std::string&amp; name, const std::string&amp; tit
   focusableTile.Add( label );
  
   // Connect to the touch events
-  focusableTile.TouchSignal().Connect( this, &DaliTableView::OnTilePressed );
+  focusableTile.TouchedSignal().Connect( this, &DaliTableView::OnTilePressed );
   focusableTile.HoveredSignal().Connect( this, &DaliTableView::OnTileHovered );
  
   return focusableTile;