X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=optional%2Fdali-toolkit%2Finternal%2Fcontrols%2Fcluster%2Fcluster-impl.h;h=863417f649a39a75a90c65167e17d25eb6235a14;hb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;hp=4d62606f96da8424a90b7438e5d6af9566a3f02e;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h
index 4d62606..863417f 100644
--- a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h
+++ b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_CLUSTER_H__
 #define __DALI_TOOLKIT_INTERNAL_CLUSTER_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/public-api/object/ref-object.h>
@@ -68,7 +69,7 @@ typedef ChildInfoContainer::const_iterator ChildInfoConstIter;
  * Multiple cluster styles may be provided, to determine the position, size, rotation, scale, color and visibility
  * of the child actors in the cluster.
  */
-class Cluster : public ControlImpl
+class Cluster : public Control
 {
 public:
 
@@ -230,9 +231,9 @@ private:
    */
   void DoTransformAction(const PropertyValueContainer& attributes);
 
-private: // From ControlImpl
+private: // From Control
   /**
-   * From Toolkit::ControlImpl; called shortly before a child is removed from the owning actor.
+   * From Control; called shortly before a child is removed from the owning actor.
    * @param[in] child The child being removed.Ptr
    */
   virtual void OnControlChildRemove(Actor& child);
@@ -248,7 +249,7 @@ public:
    */
   static bool DoAction(BaseObject* object, const std::string& actionName, const std::vector<Property::Value>& attributes);
 
-private: // From ControlImpl
+private: // From Control
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()