X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=optional%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fgaussian-blur-view%2Fgaussian-blur-view.h;h=f4cce4667d2a7b2515ea42ba672c4462626ffc43;hp=913acded15cdf3f9f5676e30f3161474991b9dec;hb=7e315a440bad7033d19fefa8f9952d625ee6f076;hpb=e58fa784d19a558e35f458ecf6d262a2344beb4f

diff --git a/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h b/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
index 913acde..f4cce46 100644
--- a/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
+++ b/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
@@ -1,26 +1,35 @@
 #ifndef __DALI_TOOLKIT_GAUSSIAN_BLUR_EFFECT_H__
 #define __DALI_TOOLKIT_GAUSSIAN_BLUR_EFFECT_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.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/images/frame-buffer-image.h>
+#include <dali/public-api/render-tasks/render-task.h>
+#include <dali/public-api/shader-effects/shader-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -87,13 +96,13 @@ class BloomView;
  *  Stage::GetCurrent().Remove(gaussianBlurView);\n
  *  gaussianBlurView.Deactivate();\n
  */
-class GaussianBlurView : public Control
+class DALI_IMPORT_API GaussianBlurView : public Control
 {
 public:
   /**
    * Signal type for notifications
    */
-  typedef SignalV2< void (GaussianBlurView source) > GaussianBlurViewSignal;
+  typedef Signal< void (GaussianBlurView source) > GaussianBlurViewSignal;
 
   /**
    * Create an uninitialized GaussianBlurView; this can be initialized with GaussianBlurView::New()
@@ -112,9 +121,11 @@ public:
   GaussianBlurView& operator=(const GaussianBlurView& ZoomView);
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~GaussianBlurView();
+  ~GaussianBlurView();
 
   /**
    * Downcast an Object handle to GaussianBlurView. If handle points to a GaussianBlurView the
@@ -255,15 +266,13 @@ public:
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The UI Control implementation.
    */
-  GaussianBlurView( Internal::GaussianBlurView& implementation );
+  DALI_INTERNAL GaussianBlurView( Internal::GaussianBlurView& implementation );
 
   /**
    * Allows the creation of this UI Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  GaussianBlurView( Dali::Internal::CustomActor* internal );
-
-private:
+  DALI_INTERNAL GaussianBlurView( Dali::Internal::CustomActor* internal );
 
 };