Conversion to Apache 2.0 license

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

diff --git a/base/dali-toolkit/internal/controls/relayout-controller-impl.cpp b/base/dali-toolkit/internal/controls/relayout-controller-impl.cpp
index 84b79d1..8bfa297 100644 (file)
--- a/base/dali-toolkit/internal/controls/relayout-controller-impl.cpp
+++ b/base/dali-toolkit/internal/controls/relayout-controller-impl.cpp
@@ -1,18 +1,19 @@
-//
-// 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.
+ *
+ */
 
 // FILE HEADER
 
@@ -129,7 +130,7 @@ void SetIfNotZero( Vector2& target, const Vector2& source )
  */
 void FindControls( Actor actor, ControlStack& controls, Vector2 size )
 {
-  Control control( Control::DownCast( actor ) );
+  Toolkit::Control control( Toolkit::Control::DownCast( actor ) );
   if( control )
   {
     // If the control size has been set by the application / control, then we should try and honour that.
@@ -195,7 +196,7 @@ void RelayoutControllerImpl::Relayout()
   while ( !controlStack.empty() )
   {
     ControlSizePair pair ( controlStack.top() );
-    Control control ( pair.first );
+    Toolkit::Control control ( pair.first );
     Vector2 size ( pair.second );
     controlStack.pop();