Changes after TouchData renamed to TouchEvent

Change-Id: I969b6aad154b839410daef4fdbd3962b58b97fd7

diff --git a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
index 4a80e59596d8bd1b214a40d8533fd87b1eaf3b6f..6ed10ed540cc48892e524dfd237a2530d28d5aa8 100644 (file)
--- a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
+++ b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
@@ -83,15 +83,15 @@ private:
     window.TouchSignal().Connect( this, &ImageViewAlphaBlendApp::OnTouched );
   }
 
-  void OnTouched( const TouchData& touchData )
+  void OnTouched( const TouchEvent& touch )
   {
     static bool touched = false;
-    if( touchData.GetState( 0 ) == PointState::DOWN )
+    if( touch.GetState( 0 ) == PointState::DOWN )
     {
       touched = true;
     }
 
-    if( touchData.GetState( 0 ) == PointState::UP && touched)
+    if( touch.GetState( 0 ) == PointState::UP && touched )
     {
       mImageCombinationIndex++;
       touched = false;

diff --git a/examples/animated-gradient-card-active/animated-gradient-card-active.cpp b/examples/animated-gradient-card-active/animated-gradient-card-active.cpp
index 7ec7d9fc521dad9113d9ea534734cf25b27a2618..9861aa43843b286bd38b26df6dfcd14113a419fc 100644 (file)
--- a/examples/animated-gradient-card-active/animated-gradient-card-active.cpp
+++ b/examples/animated-gradient-card-active/animated-gradient-card-active.cpp
@@ -312,7 +312,7 @@ public:
     Reset();
   }
 
-  bool OnTouchCards(Actor actor, const TouchData &data)
+  bool OnTouchCards(Actor actor, const TouchEvent &data)
   {
     if( data.GetPointCount() > 0 )
     {
@@ -347,7 +347,7 @@ public:
     return true;
   }
 
-  bool OnTouchLayer(Actor actor, const TouchData &data)
+  bool OnTouchLayer(Actor actor, const TouchEvent &data)
   {
     if( data.GetPointCount() > 0 )
     {

diff --git a/examples/arc-visual/arc-visual-example.cpp b/examples/arc-visual/arc-visual-example.cpp
index 3131981f51b62799f7c96956f7cd64f0ae5caeaf..88e42536d80e0055c158d79f3b5d88d2209c4c50 100644 (file)
--- a/examples/arc-visual/arc-visual-example.cpp
+++ b/examples/arc-visual/arc-visual-example.cpp
@@ -171,7 +171,7 @@ private:
     window.KeyEventSignal().Connect( this, &ArcVisualExample::OnKeyEvent );
   }
 
-  bool OnButtonTouch( Actor actor, const TouchData& touch )
+  bool OnButtonTouch( Actor actor, const TouchEvent& touch )
   {
     if( touch.GetState( 0 ) == PointState::UP )
     {
@@ -212,7 +212,7 @@ private:
     return true;
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     if( touch.GetState( 0 ) == PointState::UP )
     {

diff --git a/examples/benchmark/benchmark.cpp b/examples/benchmark/benchmark.cpp
index e8755a5ee9e11bee8843e537f27002c869ac454d..7a12692b426e85b4504b081f00b0bcb43a07559f 100644 (file)
--- a/examples/benchmark/benchmark.cpp
+++ b/examples/benchmark/benchmark.cpp
@@ -256,7 +256,7 @@ public:
     ShowAnimation();
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     // quit the application
     mApplication.Quit();

diff --git a/examples/bezier-curve/bezier-curve-example.cpp b/examples/bezier-curve/bezier-curve-example.cpp
index 38405afd34ba1f76f00b42a3003a741f51fceb79..677152e6a1850122496b82ac7224e75edc1f5f12 100644 (file)
--- a/examples/bezier-curve/bezier-curve-example.cpp
+++ b/examples/bezier-curve/bezier-curve-example.cpp
@@ -492,7 +492,7 @@ public:
     }
   }
 
-  bool OnTouchControlPoint( Actor controlPoint, const TouchData& event )
+  bool OnTouchControlPoint( Actor controlPoint, const TouchEvent& event )
   {
     if( event.GetPointCount() > 0 )
     {
@@ -510,7 +510,7 @@ public:
     return false; // Don't mark this as consumed - let the layer get the touch
   }
 
-  bool OnTouchLayer( Actor actor, const TouchData& event )
+  bool OnTouchLayer( Actor actor, const TouchEvent& event )
   {
     if( event.GetPointCount() > 0 )
     {

diff --git a/examples/blocks/blocks-example.cpp b/examples/blocks/blocks-example.cpp
index 66c9916ff69ccfb404816ff909f06410826bb68f..300f057553fb3039d45b78f7930b94d36e36b9e0 100644 (file)
--- a/examples/blocks/blocks-example.cpp
+++ b/examples/blocks/blocks-example.cpp
@@ -615,7 +615,7 @@ private:
    * @param[in] actor The actor touched
    * @param[in] event The touch event
    */
-  bool OnTouchPaddle(Actor actor, const TouchData& event)
+  bool OnTouchPaddle(Actor actor, const TouchEvent& event)
   {
     if(event.GetPointCount()>0)
     {
@@ -641,7 +641,7 @@ private:
    * @param[in] actor The actor touched
    * @param[in] event The touch event
    */
-  bool OnTouchLayer(Actor actor, const TouchData& event)
+  bool OnTouchLayer(Actor actor, const TouchEvent& event)
   {
     if(event.GetPointCount()>0)
     {

diff --git a/examples/bubble-effect/bubble-effect-example.cpp b/examples/bubble-effect/bubble-effect-example.cpp
index ad6b774a2e3d61e800425e833578946f65432bd3..58c788824a3b0361ed00eaaf8f53c1323491842e 100644 (file)
--- a/examples/bubble-effect/bubble-effect-example.cpp
+++ b/examples/bubble-effect/bubble-effect-example.cpp
@@ -202,7 +202,7 @@ private:
   }
 
   // Callback function of the touch signal on the background
-  bool OnTouch(Dali::Actor actor, const Dali::TouchData& event)
+  bool OnTouch(Dali::Actor actor, const Dali::TouchEvent& event)
   {
     switch( event.GetState( 0 ) )
     {

diff --git a/examples/clipping-draw-order/clipping-draw-order.cpp b/examples/clipping-draw-order/clipping-draw-order.cpp
index c8a57757ad91546b374e07a0f75cf41d5e835ed5..363ef09bceb27439a3048fff923bac9b55fdcd09 100644 (file)
--- a/examples/clipping-draw-order/clipping-draw-order.cpp
+++ b/examples/clipping-draw-order/clipping-draw-order.cpp
@@ -201,7 +201,7 @@ public:
     window.GetRootLayer().TouchSignal().Connect( this, &ClippingDrawOrderVerification::OnTouch );
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     // Quit the application.
     mApplication.Quit();

diff --git a/examples/color-visual/color-visual-example.cpp b/examples/color-visual/color-visual-example.cpp
index d96e586a4c29524a14c612020b484891e6d95f45..27c85d260816c7ad904817d61a575f48d1f6b08f 100644 (file)
--- a/examples/color-visual/color-visual-example.cpp
+++ b/examples/color-visual/color-visual-example.cpp
@@ -86,7 +86,7 @@ public:
     window.KeyEventSignal().Connect( this, &ColorVisualExample::OnKeyEvent );
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     if( touch.GetState( 0 ) == PointState::UP )
     {

diff --git a/examples/compressed-texture-formats/compressed-texture-formats-example.cpp b/examples/compressed-texture-formats/compressed-texture-formats-example.cpp
index ec957ce84a6090e4c1d8ba2c488627e0e5c2a523..912d6f46fd29f32f3910682a3ee41210b61356f0 100644 (file)
--- a/examples/compressed-texture-formats/compressed-texture-formats-example.cpp
+++ b/examples/compressed-texture-formats/compressed-texture-formats-example.cpp
@@ -181,7 +181,7 @@ public:
     window.KeyEventSignal().Connect(this, &CompressedTextureFormatsController::OnKeyEvent);
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     // quit the application
     mApplication.Quit();

diff --git a/examples/fpp-game/fpp-game-tutorial-controller.cpp b/examples/fpp-game/fpp-game-tutorial-controller.cpp
index ef20090abaa9569ddcd78d32c7a7f31d1c91a1c1..7ee29f1f5f123b24a19e3946b0f9f39ce1fb9a17 100644 (file)
--- a/examples/fpp-game/fpp-game-tutorial-controller.cpp
+++ b/examples/fpp-game/fpp-game-tutorial-controller.cpp
@@ -17,7 +17,7 @@
 
 #include "fpp-game-tutorial-controller.h"
 
-#include <dali/public-api/events/touch-data.h>
+#include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/actors/camera-actor.h>
 #include <dali/public-api/object/property-map.h>
@@ -40,7 +40,7 @@ FppGameTutorialController::~FppGameTutorialController()
 
 }
 
-void FppGameTutorialController::OnTouch( const TouchData& touchEvent )
+void FppGameTutorialController::OnTouch( const TouchEvent& touchEvent )
 {
   Vector2 size( mWindow.GetSize() );
 

diff --git a/examples/fpp-game/fpp-game-tutorial-controller.h b/examples/fpp-game/fpp-game-tutorial-controller.h
index cafdeb6790fb6f77094b80cf9f6f109a55122e62..cc09dae039a851bca4d78815e4d785286ea6bb85 100644 (file)
--- a/examples/fpp-game/fpp-game-tutorial-controller.h
+++ b/examples/fpp-game/fpp-game-tutorial-controller.h
@@ -48,7 +48,7 @@ public:
    * Handles tutorial touch input
    * @param[in] touchEvent Incoming touch event in the UI space
    */
-  void OnTouch( const Dali::TouchData& touchEvent );
+  void OnTouch( const Dali::TouchEvent& touchEvent );
 
   /**
    * Handles tutorial animation finished signal

diff --git a/examples/fpp-game/game-camera.cpp b/examples/fpp-game/game-camera.cpp
index 975dafaa9acfc36f3f18fcfec675f4d1ba88b1cc..2d33dc6a49da84fa14e3b10117c98cca8e9d2a49 100644 (file)
--- a/examples/fpp-game/game-camera.cpp
+++ b/examples/fpp-game/game-camera.cpp
@@ -19,7 +19,7 @@
 
 #include <dali/public-api/render-tasks/render-task-list.h>
 #include <dali/public-api/render-tasks/render-task.h>
-#include <dali/public-api/events/touch-data.h>
+#include <dali/public-api/events/touch-event.h>
 
 using namespace Dali;
 
@@ -204,7 +204,7 @@ void GameCamera::CreateInterceptorActor()
   mInterceptorActor.TouchSignal().Connect( this, &GameCamera::OnTouch );
 }
 
-bool GameCamera::OnTouch( Actor actor, const TouchData& touch )
+bool GameCamera::OnTouch( Actor actor, const TouchEvent& touch )
 {
   for( int i = 0; i < (int)touch.GetPointCount() && i < 3; ++i )
   {

diff --git a/examples/fpp-game/game-camera.h b/examples/fpp-game/game-camera.h
index edbfdc8c664bcf4372b2363c6c036224218e888b..879af85045137e2ce7855e314004f0e4a6b81118 100644 (file)
--- a/examples/fpp-game/game-camera.h
+++ b/examples/fpp-game/game-camera.h
@@ -81,7 +81,7 @@ private:
    * @param[in] actor Actor receiving signal
    * @param[in] touch Touch data
    */
-  bool OnTouch( Dali::Actor actor, const Dali::TouchData& touch );
+  bool OnTouch( Dali::Actor actor, const Dali::TouchEvent& touch );
 
   /**
    * Handles camera tick() update

diff --git a/examples/gaussian-blur-view/gaussian-blur-view-example.cpp b/examples/gaussian-blur-view/gaussian-blur-view-example.cpp
index b3651d06255f8ddf179951500761b23cb52a044c..d93703da4279b998e4c3af77778e76c9fd70ea14 100644 (file)
--- a/examples/gaussian-blur-view/gaussian-blur-view-example.cpp
+++ b/examples/gaussian-blur-view/gaussian-blur-view-example.cpp
@@ -113,7 +113,7 @@ private:
     window.GetRootLayer().TouchSignal().Connect( this, &GaussianBlurViewExample::OnTouch );
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     const PointState::Type state = touch.GetState( 0 );
 

diff --git a/examples/gestures/gesture-example.cpp b/examples/gestures/gesture-example.cpp
index a3a927dfa9ca43add8b7d947f1bb17c3c58fef65..fb5b4a71c5ca8a414cef6c7cea73069c869ccf47 100644 (file)
--- a/examples/gestures/gesture-example.cpp
+++ b/examples/gestures/gesture-example.cpp
@@ -221,7 +221,7 @@ private:
    * @param[in]  actor  The touched actor
    * @param[in]  touch  The touch event
    */
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     switch( touch.GetState( 0 ) )
     {

diff --git a/examples/hello-world/hello-world-example.cpp b/examples/hello-world/hello-world-example.cpp
index 22a13aba3dd87a6223b994afe09f0890cf7e93bd..8e1907752590309646329acc5f2db86b76fa6173 100644 (file)
--- a/examples/hello-world/hello-world-example.cpp
+++ b/examples/hello-world/hello-world-example.cpp
@@ -54,7 +54,7 @@ public:
     window.KeyEventSignal().Connect( this, &HelloWorldController::OnKeyEvent );
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     // quit the application
     mApplication.Quit();

diff --git a/examples/homescreen-benchmark/homescreen-benchmark.cpp b/examples/homescreen-benchmark/homescreen-benchmark.cpp
index e47e5bee3215d74ab40be91a1ec14b0b144f2737..cde8ee053d9ae7425b61d3b066fcd31c602c3abd 100644 (file)
--- a/examples/homescreen-benchmark/homescreen-benchmark.cpp
+++ b/examples/homescreen-benchmark/homescreen-benchmark.cpp
@@ -190,7 +190,7 @@ public:
     window.KeyEventSignal().Connect( this, &HomescreenBenchmark::OnKeyEvent );
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     // Quit the application.
     mApplication.Quit();

diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
index c6f842e3ac04efa3d485c38ddf0f416d581f1088..ea8290f7e184b07d6ec713ffb5c7998ba4424d13 100644 (file)
--- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
+++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
@@ -495,7 +495,7 @@ public:
     }
   }
 
-  bool OnControlTouched( Actor actor, const TouchData& event )
+  bool OnControlTouched( Actor actor, const TouchEvent& event )
   {
     if(event.GetPointCount() > 0)
     {

diff --git a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
index cd6c8375581fc18f5c02315a3b36067250992428..567c569813d6a39ac849f4dcf9756f7e846ef5e4 100644 (file)
--- a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
+++ b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
@@ -502,7 +502,7 @@ public:
   * @param[in] actor The actor touched
   * @param[in] event The Touch information.
   */
-  bool OnTouchImage( Actor actor, const TouchData& event )
+  bool OnTouchImage( Actor actor, const TouchEvent& event )
   {
     if( ( event.GetPointCount() > 0 ) && ( !mScrolling ) )
     {

diff --git a/examples/magnifier/magnifier-example.cpp b/examples/magnifier/magnifier-example.cpp
index e1d7b6be823f50121df0b7bbf404bf44b08fcc7f..305485a34d53067df90f0bcefb2ee4bfb9282d9e 100644 (file)
--- a/examples/magnifier/magnifier-example.cpp
+++ b/examples/magnifier/magnifier-example.cpp
@@ -298,7 +298,7 @@ public:
    * @param[in] actor The actor that received the touch
    * @param[in] event The touch-event information
    */
-  bool OnTouched( Actor actor, const TouchData& event )
+  bool OnTouched( Actor actor, const TouchEvent& event )
   {
     if(event.GetPointCount() > 0)
     {

diff --git a/examples/mesh-visual/mesh-visual-example.cpp b/examples/mesh-visual/mesh-visual-example.cpp
index 02fef7ea1df1e20ca19a78d983755323c9cde5b8..9697649c4178db5cbcf96b1b57eccb4846bd6747 100644 (file)
--- a/examples/mesh-visual/mesh-visual-example.cpp
+++ b/examples/mesh-visual/mesh-visual-example.cpp
@@ -395,7 +395,7 @@ public:
 
   //If the light source is touched, move it by dragging it.
   //If a model is touched, rotate it by panning around.
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     switch( touch.GetState( 0 ) )
     {

diff --git a/examples/metaball-explosion/metaball-explosion-example.cpp b/examples/metaball-explosion/metaball-explosion-example.cpp
index 5601a00f7c7601b69f0f328670e4f52def2085b3..0eae70bc293982dc34e568cc8ff0334858c04d8c 100644 (file)
--- a/examples/metaball-explosion/metaball-explosion-example.cpp
+++ b/examples/metaball-explosion/metaball-explosion-example.cpp
@@ -204,7 +204,7 @@ public:
    * Touch event handler to center metaballs at touch position
    * and start explosion animation on release
    */
-  bool OnTouch( Actor actor, const TouchData& touch );
+  bool OnTouch( Actor actor, const TouchEvent& touch );
 
   /**
    * Key event handler to quit application on escape or back key
@@ -629,7 +629,7 @@ void MetaballExplosionController::SetPositionToMetaballs( const Vector2& metabal
   mCompositionActor.SetProperty( mPositionIndex, metaballCenter );
 }
 
-bool MetaballExplosionController::OnTouch( Actor actor, const TouchData& touch )
+bool MetaballExplosionController::OnTouch( Actor actor, const TouchEvent& touch )
 {
   float aspectR = mScreenSize.y / mScreenSize.x;
 

diff --git a/examples/metaball-refrac/metaball-refrac-example.cpp b/examples/metaball-refrac/metaball-refrac-example.cpp
index 2184a7a13b6f47d1379079952f95ea803d677ebc..e66ecdea2a4b1d166b66d8353f23e7d02fbdcf41 100644 (file)
--- a/examples/metaball-refrac/metaball-refrac-example.cpp
+++ b/examples/metaball-refrac/metaball-refrac-example.cpp
@@ -196,7 +196,7 @@ public:
   /**
    * Touch handler, start the grow animation and creates additional metaballs
    */
-  bool OnTouch( Actor actor, const TouchData& touch );
+  bool OnTouch( Actor actor, const TouchEvent& touch );
 
   /**
    * Key event callback to quit the application on escape or back key
@@ -680,7 +680,7 @@ void MetaballRefracController::SetPositionToMetaballs( const Vector2& metaballCe
   }
 }
 
-bool MetaballRefracController::OnTouch( Actor actor, const TouchData& touch )
+bool MetaballRefracController::OnTouch( Actor actor, const TouchEvent& touch )
 {
   const float aspect = mScreenSize.y / mScreenSize.x;
   switch( touch.GetState( 0 ) )

diff --git a/examples/perf-scroll/perf-scroll.cpp b/examples/perf-scroll/perf-scroll.cpp
index be98e6682ed904aa9b7268710a83e5959d278d76..35dca0123ba80e94a20d9349c7a877a5d75cead6 100644 (file)
--- a/examples/perf-scroll/perf-scroll.cpp
+++ b/examples/perf-scroll/perf-scroll.cpp
@@ -261,7 +261,7 @@ public:
     ShowAnimation();
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     // quit the application
     mApplication.Quit();

diff --git a/examples/ray-marching/ray-marching-example.cpp b/examples/ray-marching/ray-marching-example.cpp
index 7ea54869ff765e878588bbf8931f862ca44d6d84..0660bec212521046170f7a9224436b60e8a4fab6 100644 (file)
--- a/examples/ray-marching/ray-marching-example.cpp
+++ b/examples/ray-marching/ray-marching-example.cpp
@@ -137,7 +137,7 @@ public:
     AddContentLayer();
 
   }
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     // quit the application
     mApplication.Quit();

diff --git a/examples/refraction-effect/refraction-effect-example.cpp b/examples/refraction-effect/refraction-effect-example.cpp
index e995e60e9582b64efe54d0e5cedbba2516aa0f3d..804e784a8669081f8c5ada067eae2d502fb40506 100644 (file)
--- a/examples/refraction-effect/refraction-effect-example.cpp
+++ b/examples/refraction-effect/refraction-effect-example.cpp
@@ -352,7 +352,7 @@ private:
     return true;
   }
 
-  bool OnTouch( Actor actor, const TouchData& event )
+  bool OnTouch( Actor actor, const TouchEvent& event )
   {
     switch( event.GetState( 0 ) )
     {

diff --git a/examples/remote-image-loading/remote-image-loading-example.cpp b/examples/remote-image-loading/remote-image-loading-example.cpp
index 5bf7e1faf293755f14dfce567065abcac8c75090..a58abf4da1ed1181ae41d3935485721999c5e8fc 100644 (file)
--- a/examples/remote-image-loading/remote-image-loading-example.cpp
+++ b/examples/remote-image-loading/remote-image-loading-example.cpp
@@ -144,7 +144,7 @@ public:
     }
   }
 
-  void OnTouch(const TouchData &touch)
+  void OnTouch(const TouchEvent &touch)
   {
     if (touch.GetState(0) == PointState::DOWN)
     {
@@ -165,7 +165,7 @@ public:
     return false;
   }
 
-  bool OnControlTouch(Actor actor, const TouchData &touch)
+  bool OnControlTouch(Actor actor, const TouchEvent &touch)
   {
     if (touch.GetState(0) == PointState::DOWN)
     {

diff --git a/examples/renderer-stencil/renderer-stencil-example.cpp b/examples/renderer-stencil/renderer-stencil-example.cpp
index 98685962a927a91eae7f921ebb427b692671de1f..e9004dbbe5ea40032b4d9949dbdec3b6c02ce53d 100644 (file)
--- a/examples/renderer-stencil/renderer-stencil-example.cpp
+++ b/examples/renderer-stencil/renderer-stencil-example.cpp
@@ -718,7 +718,7 @@ private:
    * @param[in] touch The touch information
    * @return True if the event has been handled
    */
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     // Quit the application.
     mApplication.Quit();

diff --git a/examples/rendering-basic-light/rendering-basic-light-example.cpp b/examples/rendering-basic-light/rendering-basic-light-example.cpp
index f9b960b78709eb19a2955980b41b98163abaf1a5..7d89a7747f4a1483f558fd1771461e76311620f2 100644 (file)
--- a/examples/rendering-basic-light/rendering-basic-light-example.cpp
+++ b/examples/rendering-basic-light/rendering-basic-light-example.cpp
@@ -203,7 +203,7 @@ public:
   /**
    * This function will change the material of the cube when touched
    */
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     if(touch.GetState(0) == PointState::UP)
     {

diff --git a/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp b/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp
index c333bc3a1748afc659b89895346788b218697b86..7d15eab142f5d7175944f35f0cdbafb6a3cbad8d 100644 (file)
--- a/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp
+++ b/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp
@@ -145,7 +145,7 @@ public:
   /**
    * This function will change the material Roughness, Metalness or the model orientation when touched
    */
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     const PointState::Type state = touch.GetState( 0 );
 

diff --git a/examples/rendering-cube/rendering-cube.cpp b/examples/rendering-cube/rendering-cube.cpp
index e7059ff6c94eac02c88cf92d04f9eb7434325a0f..9b4260f81cc86991f77b5d547354a896caeb35dd 100644 (file)
--- a/examples/rendering-cube/rendering-cube.cpp
+++ b/examples/rendering-cube/rendering-cube.cpp
@@ -105,7 +105,7 @@ public:
     window.KeyEventSignal().Connect( this, &DrawCubeController::OnKeyEvent );
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     // quit the application
     mApplication.Quit();

diff --git a/examples/rendering-line/rendering-line.cpp b/examples/rendering-line/rendering-line.cpp
index 2d6dbe337355387c993d826038145dff8ac54a3a..1f421adedc3caa1b99250c570c8adbf4118c56ea 100644 (file)
--- a/examples/rendering-line/rendering-line.cpp
+++ b/examples/rendering-line/rendering-line.cpp
@@ -98,7 +98,7 @@ public:
     window.KeyEventSignal().Connect( this, &DrawLineController::OnKeyEvent );
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     // quit the application
     mApplication.Quit();

diff --git a/examples/rendering-radial-progress/radial-progress.cpp b/examples/rendering-radial-progress/radial-progress.cpp
index 2c7008bc7fe37bb9070f9fc4ca69b541650aea28..e3133ca5eee7d8cb3491a6a26fbcd95ba3df1147 100644 (file)
--- a/examples/rendering-radial-progress/radial-progress.cpp
+++ b/examples/rendering-radial-progress/radial-progress.cpp
@@ -155,7 +155,7 @@ public:
     window.GetRootLayer().TouchSignal().Connect( this, &RadialProgressController::OnTouch );
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     // quit the application
     mApplication.Quit();

diff --git a/examples/rendering-skybox/look-camera.cpp b/examples/rendering-skybox/look-camera.cpp
index 1ef3194f3bb68be6cce80d854a5af969a72d9af8..54f0c8a8f374fb0d87c94ae66464ec5220b8f979 100644 (file)
--- a/examples/rendering-skybox/look-camera.cpp
+++ b/examples/rendering-skybox/look-camera.cpp
@@ -19,7 +19,7 @@
 
 #include <dali/public-api/render-tasks/render-task-list.h>
 #include <dali/public-api/render-tasks/render-task.h>
-#include <dali/public-api/events/touch-data.h>
+#include <dali/public-api/events/touch-event.h>
 
 using namespace Dali;
 
@@ -147,7 +147,7 @@ void LookCamera::CreateInterceptorActor()
   mInterceptorActor.TouchSignal().Connect( this, &LookCamera::OnTouch );
 }
 
-bool LookCamera::OnTouch( Actor actor, const TouchData& touch )
+bool LookCamera::OnTouch( Actor actor, const TouchEvent& touch )
 {
   for( int i = 0; i < (int)touch.GetPointCount() && i < 3; ++i )
   {

diff --git a/examples/rendering-skybox/look-camera.h b/examples/rendering-skybox/look-camera.h
index 4a0dc924820fae35c92b2b83c3b94ba9695d9651..4ab6fee77c398009322891782a42dc8b3e768e68 100644 (file)
--- a/examples/rendering-skybox/look-camera.h
+++ b/examples/rendering-skybox/look-camera.h
@@ -77,7 +77,7 @@ private:
    * @param[in] actor Actor receiving signal
    * @param[in] touch Touch data
    */
-  bool OnTouch( Dali::Actor actor, const Dali::TouchData& touch );
+  bool OnTouch( Dali::Actor actor, const Dali::TouchEvent& touch );
 
   /**
    * Handles camera tick() update

diff --git a/examples/rendering-textured-cube/rendering-textured-cube.cpp b/examples/rendering-textured-cube/rendering-textured-cube.cpp
index cc20719d9348d933426d94b0d5bb9b0490df050b..be225674c359b4b77d6a32a440523dad2585f70d 100644 (file)
--- a/examples/rendering-textured-cube/rendering-textured-cube.cpp
+++ b/examples/rendering-textured-cube/rendering-textured-cube.cpp
@@ -111,7 +111,7 @@ public:
     window.KeyEventSignal().Connect( this, &TexturedCubeController::OnKeyEvent );
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     // quit the application
     mApplication.Quit();

diff --git a/examples/rendering-triangle/rendering-triangle.cpp b/examples/rendering-triangle/rendering-triangle.cpp
index 58fedcb61b3150326bf3754df31cc6090474214e..c69f323c491b67d602cd16723ddd879c68e6b197 100644 (file)
--- a/examples/rendering-triangle/rendering-triangle.cpp
+++ b/examples/rendering-triangle/rendering-triangle.cpp
@@ -98,7 +98,7 @@ public:
     window.KeyEventSignal().Connect( this, &DrawTriangleController::OnKeyEvent );
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     // quit the application
     mApplication.Quit();

diff --git a/examples/scroll-view/scroll-view-example.cpp b/examples/scroll-view/scroll-view-example.cpp
index ab7789ab965a0ffee84be3e5f59ebce4100b14a5..e9c65d0291c5986ad0119908d139beec03c02b35 100644 (file)
--- a/examples/scroll-view/scroll-view-example.cpp
+++ b/examples/scroll-view/scroll-view-example.cpp
@@ -499,7 +499,7 @@ private:
    * @param[in] actor The actor touched
    * @param[in] event The touch information.
    */
-  bool OnTouchImage( Actor actor, const TouchData& event )
+  bool OnTouchImage( Actor actor, const TouchEvent& event )
   {
     if( (event.GetPointCount() > 0) && (!mScrolling) )
     {

diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp
index a401d77874e9733cd805f7f26c6053aace5cb0b0..e0e8cebea9791860c39c83616f4d09b6e2313af4 100644 (file)
--- a/examples/text-field/text-field-example.cpp
+++ b/examples/text-field/text-field-example.cpp
@@ -151,7 +151,7 @@ public:
     mField.Reset();
   }
 
-  bool OnPopupTouched( Actor actor, const TouchData& event )
+  bool OnPopupTouched( Actor actor, const TouchEvent& event )
   {
     // End edit mode for TextField if parent Popup touched.
     if((event.GetPointCount() > 0) && (mPopup == event.GetHitActor(0)))

diff --git a/examples/text-label-emojis/text-label-emojis.cpp b/examples/text-label-emojis/text-label-emojis.cpp
index 3c96974d6d7ce13d114ad6417d90612f1baddac9..6068e61bca819466ca534baec201004c124667ee 100644 (file)
--- a/examples/text-label-emojis/text-label-emojis.cpp
+++ b/examples/text-label-emojis/text-label-emojis.cpp
@@ -83,7 +83,7 @@ public:
     }
   }
 
-  bool OnTouch( Actor actor, const TouchData& event )
+  bool OnTouch( Actor actor, const TouchEvent& event )
   {
     if( 1u == event.GetPointCount() )
     {

diff --git a/examples/text-label-multi-language/text-label-multi-language-example.cpp b/examples/text-label-multi-language/text-label-multi-language-example.cpp
index d55d2a7f2f9194d0451427962199da3d0ef2bd2e..a1a9b8e55e2aab8589630d80202e7a4dfb9857ad 100644 (file)
--- a/examples/text-label-multi-language/text-label-multi-language-example.cpp
+++ b/examples/text-label-multi-language/text-label-multi-language-example.cpp
@@ -85,7 +85,7 @@ public:
     }
   }
 
-  bool OnTouch( Actor actor, const TouchData& event )
+  bool OnTouch( Actor actor, const TouchEvent& event )
   {
     if( 1u == event.GetPointCount() )
     {

diff --git a/examples/tilt/tilt-example.cpp b/examples/tilt/tilt-example.cpp
index 06bf64e7c046e6518ba814db732a2d9d356386f2..aaee512adbb49a40626f45346e7f43d0c0a5a50c 100644 (file)
--- a/examples/tilt/tilt-example.cpp
+++ b/examples/tilt/tilt-example.cpp
@@ -74,7 +74,7 @@ public:
     }
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     // quit the application
     mApplication.Quit();

diff --git a/examples/visual-transitions/transition-application.cpp b/examples/visual-transitions/transition-application.cpp
index b721341fc627b849b2631ddb26c476726dc3acae..70b330de895132b2fae4cfcb27f866fddbfbd6c5 100644 (file)
--- a/examples/visual-transitions/transition-application.cpp
+++ b/examples/visual-transitions/transition-application.cpp
@@ -276,9 +276,9 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map )
   }
 }
 
-bool TransitionApplication::OnVisualButtonClicked( Actor actor, const TouchData& touchData )
+bool TransitionApplication::OnVisualButtonClicked( Actor actor, const TouchEvent& touch )
 {
-  if( touchData.GetState(0) == PointState::FINISHED )
+  if( touch.GetState(0) == PointState::FINISHED )
   {
     int visual = actor.GetProperty<int>( mVisualIndex );
     Property::Map map;

diff --git a/examples/visual-transitions/transition-application.h b/examples/visual-transitions/transition-application.h
index 9846c11d0146c43b42e057fadc43f7fb0a8d85f1..6f6e722bc2f692dee52b577045f36ae776f6e79f 100644 (file)
--- a/examples/visual-transitions/transition-application.h
+++ b/examples/visual-transitions/transition-application.h
@@ -2,7 +2,7 @@
 #define DALI_DEMO_TRANSITION_APPLICATION_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ public:
   void OnKeyEvent( const KeyEvent& event );
 
   bool OnActionButtonClicked( Button button );
-  bool OnVisualButtonClicked( Actor actor, const TouchData& touchData );
+  bool OnVisualButtonClicked( Actor actor, const TouchEvent& touch );
 
   static const char* DEMO_THEME_ONE_PATH;
 

diff --git a/examples/web-view/web-view-example.cpp b/examples/web-view/web-view-example.cpp
index af668dc3a1983d453a7cd86dba5c0f8fb1b988d0..bd371dd194a8f19acc60089e9ce57e7542eb43c5 100644 (file)
--- a/examples/web-view/web-view-example.cpp
+++ b/examples/web-view/web-view-example.cpp
@@ -100,7 +100,7 @@ public:
     mAddressLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, url.c_str() );
   }
 
-  bool OnTouchText( Actor actor, const TouchData& touch )
+  bool OnTouchText( Actor actor, const TouchEvent& touch )
   {
     if ( touch.GetState( 0 ) == PointState::UP )
     {

diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp
index 4d95f05b0d29bb915a088dfbe22ab796663e776c..869bc7b8bbb0c5d643927229087714e1252c12b8 100644 (file)
--- a/shared/dali-table-view.cpp
+++ b/shared/dali-table-view.cpp
@@ -557,7 +557,7 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit
   return focusableTile;
 }
 
-bool DaliTableView::OnTilePressed( Actor actor, const TouchData& event )
+bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event )
 {
   return DoTilePress( actor, event.GetState( 0 ) );
 }
@@ -644,7 +644,7 @@ void DaliTableView::OnScrollComplete( const Dali::Vector2& position )
   accessibilityManager.SetCurrentFocusActor(mPages[mScrollView.GetCurrentPage()].GetChildAt(0) );
 }
 
-bool DaliTableView::OnScrollTouched( Actor actor, const TouchData& event )
+bool DaliTableView::OnScrollTouched( Actor actor, const TouchEvent& event )
 {
   if( PointState::DOWN == event.GetState( 0 ) )
   {

diff --git a/shared/dali-table-view.h b/shared/dali-table-view.h
index beb85dd0597bfef29b3abec8a7ee8eacffd6f548..aa94d389f70cc6059d00ffa4da111d492b9941a9 100644 (file)
--- a/shared/dali-table-view.h
+++ b/shared/dali-table-view.h
@@ -2,7 +2,7 @@
 #define DALI_DEMO_TABLEVIEW_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -150,7 +150,7 @@ private: // Application callbacks & implementation
    *
    * @return Consume flag
    */
-  bool OnTilePressed( Dali::Actor actor, const Dali::TouchData& event );
+  bool OnTilePressed( Dali::Actor actor, const Dali::TouchEvent& event );
 
   /**
    * Called by OnTilePressed & Accessibility to do the appropriate action.
@@ -211,7 +211,7 @@ private: // Application callbacks & implementation
    *
    * @return Consume flag
    */
-  bool OnScrollTouched( Dali::Actor actor, const Dali::TouchData& event );
+  bool OnScrollTouched( Dali::Actor actor, const Dali::TouchEvent& event );
 
   /**
    * Setup the effect on the scroll view