Merge "Remove obsolete and non functional SizeChanged signal from actor" into tizen

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / bloom-view / bloom-view.h

diff --git a/dali-toolkit/public-api/controls/bloom-view/bloom-view.h b/dali-toolkit/public-api/controls/bloom-view/bloom-view.h
index 42fe6f0..b36d416 100644 (file)
--- a/dali-toolkit/public-api/controls/bloom-view/bloom-view.h
+++ b/dali-toolkit/public-api/controls/bloom-view/bloom-view.h
@@ -1,27 +1,28 @@
 #ifndef __DALI_TOOLKIT_BLOOM_VIEW_H__
 #define __DALI_TOOLKIT_BLOOM_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.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -87,7 +88,7 @@ class BloomView;
  *  Stage::GetCurrent().Remove(bloomView);\n
  *  bloomView.Deactivate();\n
  */
-class BloomView : public Control
+class DALI_IMPORT_API BloomView : public Control
 {
 public:
 
@@ -108,9 +109,11 @@ public:
   BloomView& operator=(const BloomView& ZoomView);
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~BloomView();
+  ~BloomView();
 
   /**
    * Downcast an Object handle to BloomView. If handle points to a BloomView the
@@ -234,15 +237,13 @@ public:
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The UI Control implementation.
    */
-  BloomView( Internal::BloomView& implementation );
+  DALI_INTERNAL BloomView( Internal::BloomView& implementation );
 
   /**
    * Allows the creation of this UI Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  BloomView( Dali::Internal::CustomActor* internal );
-
-private:
+  explicit DALI_INTERNAL BloomView( Dali::Internal::CustomActor* internal );
 
 };