Conversion to Apache 2.0 license

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / focus-manager / keyinput-focus-manager-impl.cpp

diff --git a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
index 8fa9500..de83d17 100644 (file)
--- a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
+++ b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-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.
+ *
+ */
 
 // CLASS HEADER
 #include "keyinput-focus-manager-impl.h"
@@ -91,9 +92,9 @@ void KeyInputFocusManager::SetFocus(Toolkit::Control control)
   }
 }
 
-Control KeyInputFocusManager::GetCurrentFocusControl() const
+Toolkit::Control KeyInputFocusManager::GetCurrentFocusControl() const
 {
-  Control currentFocusControl;
+  Toolkit::Control currentFocusControl;
 
   if(!mFocusActorsQueue.empty())
   {