Merge "Removing unused variables" into devel/master

[platform/core/uifw/dali-demo.git] / examples / gestures / gesture-example.cpp

diff --git a/examples/gestures/gesture-example.cpp b/examples/gestures/gesture-example.cpp
index c76496b..e2d8e8a 100644 (file)
--- a/examples/gestures/gesture-example.cpp
+++ b/examples/gestures/gesture-example.cpp
@@ -18,9 +18,6 @@
 // EXTERNAL INCLUDES
 #include <dali-toolkit/dali-toolkit.h>
 #include <string>
-#include <dali/devel-api/actors/actor-devel.h>
-#include <dali/devel-api/events/rotation-gesture.h>
-#include <dali/devel-api/events/rotation-gesture-detector.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -221,7 +218,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 ) )
     {
@@ -258,7 +255,7 @@ private:
         break;
       }
     }
-    return true;
+    return false;
   }
 
   /**
@@ -456,7 +453,7 @@ private:
    */
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.state == KeyEvent::Down )
+    if( event.GetState() == KeyEvent::DOWN )
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {