X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcluster%2Fcluster.h;h=11dc5aed84c9846f91e68471ea252398b154d2ab;hb=refs%2Fchanges%2F99%2F38499%2F2;hp=8d6c3e449e6c126c0dde0a5c8aeebd6f9efad8b2;hpb=e2eda444afbe82e9591fe198eef339227f90a616;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/public-api/controls/cluster/cluster.h b/dali-toolkit/public-api/controls/cluster/cluster.h
index 8d6c3e4..11dc5ae 100644
--- a/dali-toolkit/public-api/controls/cluster/cluster.h
+++ b/dali-toolkit/public-api/controls/cluster/cluster.h
@@ -1,26 +1,31 @@
 #ifndef __DALI_TOOLKIT_CLUSTER_H__
 #define __DALI_TOOLKIT_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) 2015 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/public-api/animation/alpha-functions.h>
+#include <dali/public-api/animation/time-period.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -34,20 +39,22 @@ class Cluster;
 class ClusterStyle;
 
 /**
- * Cluster is a container of grouped actors positioned in different cluster styles.
+ * @brief Cluster is a container of grouped actors positioned in different cluster styles.
+ *
+ * Actions
+ * | %Action Name              | Method                    |
+ * |---------------------------|---------------------------|
+ * | expand                    | DoExpandAction()          |
+ * | collapse                  | DoCollapseAction()        |
+ * | transform                 | DoTransformAction()       |
  */
-class Cluster : public Control
+class DALI_IMPORT_API Cluster : public Control
 {
 public:
 
   // Custom properties
 
-  static const std::string CLUSTER_ACTOR_DEPTH;                           ///< Property, name "cluster-actor-depth",      type FLOAT
-
-  //Action Names
-  static const char* const ACTION_EXPAND;
-  static const char* const ACTION_COLLAPSE;
-  static const char* const ACTION_TRANSFORM;
+  static const std::string CLUSTER_ACTOR_DEPTH;                           ///< Property, name "cluster-actor-depth",      type float
 
 public:
 
@@ -68,10 +75,11 @@ public:
   Cluster& operator=( const Cluster& cluster );
 
   /**
-   * Virtual destructor.
-   * Dali::Object derived classes typically do not contain member data.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~Cluster();
+  ~Cluster();
 
   /**
    * Create the Cluster control with the given style.
@@ -240,13 +248,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
-  Cluster( Internal::Cluster& implementation );
+  DALI_INTERNAL Cluster( Internal::Cluster& implementation );
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  Cluster( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL Cluster( Dali::Internal::CustomActor* internal );
 };
 
 } // namespace Toolkit