Merge branch 'master' into tizen

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

diff --git a/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h b/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
index 7d05cde..25060f7 100644 (file)
--- a/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
@@ -1,22 +1,21 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H__
 #define __DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H__
 
-/*
- * 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.
- *
- */
+//
+// 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.
+//
 
 // INTERNAL INCLUDES
 #include <dali/dali.h>
@@ -38,14 +37,14 @@ namespace Internal
 /**
  * SuperBlurView implementation class
  */
-class SuperBlurView : public ControlImpl
+class SuperBlurView : public Control
 {
 public:
 
   // Properties
   enum
   {
-    SUPER_BLUR_VIEW_PROPERTY_START_INDEX = ControlImpl::CONTROL_PROPERTY_END_INDEX + 1,
+    SUPER_BLUR_VIEW_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
     SUPER_BLUR_VIEW_PROPERTY_END_INDEX = SUPER_BLUR_VIEW_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
   };
 
@@ -116,7 +115,7 @@ protected:
    */
   virtual ~SuperBlurView();
 
-private: // from ControlImpl
+private: // from Control
 
   /**
    * @copydoc Toolkit::Control::OnInitialize
@@ -129,7 +128,7 @@ private: // from ControlImpl
   virtual void OnControlSizeSet(const Vector3& targetSize);
 
   /**
-   * @copydoc Toolkit::ControlImpl::OnRelaidOut()
+   * @copydoc Control::OnRelaidOut()
    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );