Changes after TouchedSignal changes

[platform/core/uifw/dali-demo.git] / shared / dali-table-view.cpp

diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp
index 6efc3da..11f0c97 100644 (file)
--- a/shared/dali-table-view.cpp
+++ b/shared/dali-table-view.cpp
@@ -265,7 +265,7 @@ void DaliTableView::Initialize( Application& 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;
 
@@ -523,7 +523,7 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit
   // and pass it to the shader uniform, along with the tile's position.
   Constraint shaderPosition = Constraint::New < Vector3 > ( focusableTile, propertyIndex, TileShaderPositionConstraint( mPageWidth, position.x ) );
   shaderPosition.AddSource( Source( mScrollView, ScrollView::Property::SCROLL_POSITION ) );
-  shaderPosition.SetRemoveAction( Constraint::Discard );
+  shaderPosition.SetRemoveAction( Constraint::DISCARD );
   shaderPosition.Apply();
   //focusableTile.Add( tileContent );
 
@@ -551,7 +551,7 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& 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;
@@ -596,7 +596,7 @@ bool DaliTableView::DoTilePress( Actor actor, PointState::Type pointState )
     if( consumed )
     {
       mPressedAnimation = Animation::New( BUTTON_PRESS_ANIMATION_TIME );
-      mPressedAnimation.SetEndAction( Animation::Discard );
+      mPressedAnimation.SetEndAction( Animation::DISCARD );
 
       // scale the content actor within the Tile, as to not affect the placement within the Table.
       Actor content = actor.GetChildAt(0);
@@ -699,7 +699,7 @@ void DaliTableView::SetupInnerPageCubeEffect()
 
 void DaliTableView::OnKeyEvent( const KeyEvent& event )
 {
-  if( event.GetState() == KeyEvent::Down )
+  if( event.GetState() == KeyEvent::DOWN )
   {
     if ( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
     {
@@ -748,7 +748,7 @@ void DaliTableView::InitialiseBackgroundActors( Actor actor )
     animConstraint.AddSource( Source( mScrollView, ScrollView::Property::SCROLL_POSITION ) );
     animConstraint.AddSource( Dali::ParentSource( Dali::Actor::Property::SIZE ) );
     animConstraint.AddSource( Dali::LocalSource( Dali::Actor::Property::SIZE ) );
-    animConstraint.SetRemoveAction( Constraint::Discard );
+    animConstraint.SetRemoveAction( Constraint::DISCARD );
     animConstraint.Apply();
 
     // Kickoff animation