Conversion to Apache 2.0 license

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

diff --git a/base/dali-toolkit/internal/controls/table-view/table-view-impl.h b/base/dali-toolkit/internal/controls/table-view/table-view-impl.h
index 5f7a5d1..e5eeb43 100644 (file)
--- a/base/dali-toolkit/internal/controls/table-view/table-view-impl.h
+++ b/base/dali-toolkit/internal/controls/table-view/table-view-impl.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_TABLE_VIEW_H__
 #define __DALI_TOOLKIT_INTERNAL_TABLE_VIEW_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
@@ -35,7 +36,7 @@ namespace Internal
  * TableView is a custom control for laying out actors in a table layout
  * @see Dali::Toolkit:TableView for more details
  */
-class TableView : public ControlImpl
+class TableView : public Control
 {
 public:
 
@@ -186,32 +187,32 @@ public:
    */
   unsigned int GetColumns();
 
-private: // From ControlImpl
+private: // From Control
 
   /**
-   * @copydoc Toolkit::ControlImpl::OnControlChildAdd(Actor& child)
+   * @copydoc Control::OnControlChildAdd(Actor& child)
    */
   virtual void OnControlChildAdd(Actor& child);
 
   /**
-   * @copydoc Toolkit::ControlImpl::OnControlChildRemove(Actor& child)
+   * @copydoc Control::OnControlChildRemove(Actor& child)
    */
   virtual void OnControlChildRemove(Actor& child);
 
   /**
-   * @copydoc Toolkit::ControlImpl::OnRelaidOut
+   * @copydoc Control::OnRelaidOut
    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
 
   /**
-   * @copydoc Toolkit::ControlImpl::OnInitialize()
+   * @copydoc Control::OnInitialize()
    */
   virtual void OnInitialize();
 
   /**
-   * @copydoc Toolkit::ControlImpl::GetNextKeyboardFocusableActor
+   * @copydoc Control::GetNextKeyboardFocusableActor
    */
-  virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);
+  virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);
 
 private: // Implementation