Conversion to Apache 2.0 license

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / table-view / table-view-impl.cpp

diff --git a/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp b/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
index 6a7dc98..7f760db 100644 (file)
--- a/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
+++ b/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
@@ -795,7 +795,7 @@ void TableView::OnControlChildRemove( Actor& child )
 }
 
 TableView::TableView( unsigned int initialRows, unsigned int initialColumns )
-: ControlImpl( true ),  // requires touch
+: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),
   mCellData( initialRows, initialColumns ),
   mLayoutingChild( false ),
   mConstraintDuration( DEFAULT_CONSTRAINT_DURATION )
@@ -1001,7 +1001,7 @@ TableView::~TableView()
   // nothing to do
 }
 
-Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Control::KeyboardFocusNavigationDirection direction, bool loopEnabled)
+Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled)
 {
   Actor nextFocusableActor;
 
@@ -1024,7 +1024,7 @@ Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Contro
 
       switch ( direction )
       {
-        case Control::Left:
+        case Toolkit::Control::Left:
         {
           if(--currentColumn < 0)
           {
@@ -1037,7 +1037,7 @@ Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Contro
           }
           break;
         }
-        case Control::Right:
+        case Toolkit::Control::Right:
         {
           if(++currentColumn > numberOfColumns - 1)
           {
@@ -1050,7 +1050,7 @@ Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Contro
           }
           break;
         }
-        case Control::Up:
+        case Toolkit::Control::Up:
         {
           if(--currentRow < 0)
           {
@@ -1059,7 +1059,7 @@ Actor TableView::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Contro
           }
           break;
         }
-        case Control::Down:
+        case Toolkit::Control::Down:
         {
           if(++currentRow > numberOfRows - 1)
           {