Conversion to Apache 2.0 license

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

diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.h b/optional/dali-toolkit/internal/controls/view/view-impl.h
index ea0a4c5..3531149 100644 (file)
--- a/optional/dali-toolkit/internal/controls/view/view-impl.h
+++ b/optional/dali-toolkit/internal/controls/view/view-impl.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_VIEW_H__
 #define __DALI_TOOLKIT_INTERNAL_VIEW_H__
 
 #ifndef __DALI_TOOLKIT_INTERNAL_VIEW_H__
 #define __DALI_TOOLKIT_INTERNAL_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.
+ *
+ */

 
 // EXTERNAL INCLUDES
 #include <dali/dali.h>
 
 // EXTERNAL INCLUDES
 #include <dali/dali.h>


@@ -39,7 +40,7 @@ namespace Internal
  * View is a control to add layers and a background.
  * @see Dali::Toolkit::View for more details.
  */
  * View is a control to add layers and a background.
  * @see Dali::Toolkit::View for more details.
  */

-class View : public ControlImpl
+class View : public Control

 {
 private:
   typedef std::map<unsigned int,Layer> LayerContainer;
 {
 private:
   typedef std::map<unsigned int,Layer> LayerContainer;


@@ -127,7 +128,7 @@ public:
    */
   static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
 
    */
   static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
 

-private: // From ControlImpl
+private: // From Control

 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()