Changes after TouchedSignal changes
[platform/core/uifw/dali-demo.git] / examples / animated-gradient-card-active / animated-gradient-card-active.cpp
index 7ec7d9f..a4da888 100644 (file)
@@ -308,11 +308,11 @@ public:
     SetupActors();
     SetupAnimation();
 
-    mWindow.GetRootLayer().TouchSignal().Connect( this, &CardController::OnTouchLayer );
+    mWindow.GetRootLayer().TouchedSignal().Connect( this, &CardController::OnTouchLayer );
     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 )
     {
@@ -425,7 +425,7 @@ public:
 
   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 ) )
       {
@@ -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 );