Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

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

diff --git a/dali-toolkit/public-api/controls/effects-view/effects-view.h b/dali-toolkit/public-api/controls/effects-view/effects-view.h
index ca3d5e4..2255e1f 100644 (file)
--- a/dali-toolkit/public-api/controls/effects-view/effects-view.h
+++ b/dali-toolkit/public-api/controls/effects-view/effects-view.h
@@ -1,28 +1,30 @@
 #ifndef __DALI_TOOLKIT_EFFECTS_VIEW_H__
 #define __DALI_TOOLKIT_EFFECTS_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) 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/images/frame-buffer-image.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -65,7 +67,7 @@ class EffectsView;
  * // start effect processing
  * effectsView.Enable();
  */
-class EffectsView : public Control
+class DALI_IMPORT_API EffectsView : public Control
 {
 public:
 
@@ -108,10 +110,11 @@ public:
   static EffectsView DownCast( BaseHandle handle );
 
   /**
-   * 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 ~EffectsView();
+  ~EffectsView();
 
 public:
 
@@ -172,25 +175,25 @@ public:
     * Get the property index to the effect size
     * @return The property index to the effect size
     */
-   Property::Index GetEffectSizePropertyIndex() const;
+   Dali::Property::Index GetEffectSizePropertyIndex() const;
 
    /**
     * Get the property index to the effect strength
     * @return The property index to the effect strength
     */
-   Property::Index GetEffectStrengthPropertyIndex() const;
+   Dali::Property::Index GetEffectStrengthPropertyIndex() const;
 
    /**
     * Get the property index to the Vector3 specifying the effect offset (eg drop shadow offset)
     * @return The property index to the Vector3 specifying the effect offset
     */
-   Property::Index GetEffectOffsetPropertyIndex() const;
+   Dali::Property::Index GetEffectOffsetPropertyIndex() const;
 
    /**
     * Get the property index to the effect color (eg shadow color)
     * @return The property index to the effect color
     */
-   Property::Index GetEffectColorPropertyIndex() const;
+   Dali::Property::Index GetEffectColorPropertyIndex() const;
 
    /**
     * Set background color for the view. The background will be filled with this color.
@@ -210,13 +213,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
-  EffectsView( Internal::EffectsView& implementation );
+  DALI_INTERNAL EffectsView( Internal::EffectsView& implementation );
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  EffectsView( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL EffectsView( Dali::Internal::CustomActor* internal );
 
 }; // class EffectsView