X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fshader-effects%2Fwater-effect.h;h=bd69308ee3e9ce1b64c0b5a73170ac944f096ea9;hp=9ab412c55c245d61c03ce6869d6e4440ee43d345;hb=57869973578f6a0b0f836d396c7232ddb8302c6b;hpb=e2eda444afbe82e9591fe198eef339227f90a616

diff --git a/dali-toolkit/public-api/shader-effects/water-effect.h b/dali-toolkit/public-api/shader-effects/water-effect.h
index 9ab412c..bd69308 100644
--- a/dali-toolkit/public-api/shader-effects/water-effect.h
+++ b/dali-toolkit/public-api/shader-effects/water-effect.h
@@ -1,26 +1,27 @@
 #ifndef __DALI_TOOLKIT_WATER_EFFECT_H__
 #define __DALI_TOOLKIT_WATER_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.
-//
-
-// INTERNAL INCLUDES
-#include <dali/dali.h>
-
-namespace Dali DALI_IMPORT_API
+/*
+ * 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/shader-effects/shader-effect.h>
+
+namespace Dali
 {
 
 namespace Toolkit
@@ -53,7 +54,7 @@ class WaterEffect;
  *   std::string propertyName = waterEffect.GetPropagationPropertyName( 1 );
  *   animation.AnimateTo( Property(waterEffect, propertyName), FINAL_RADIUS );
  */
-class WaterEffect : public ShaderEffect
+class DALI_IMPORT_API WaterEffect : public ShaderEffect
 {
 public:
 
@@ -64,9 +65,11 @@ public:
   WaterEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~WaterEffect();
+  ~WaterEffect();
 
   /**
    * Create an initialized WaterEffect.
@@ -155,7 +158,7 @@ public:
 
 public: // Not intended for developer use
 
-  WaterEffect( ShaderEffect handle, Internal::WaterEffect* shaderExtension );
+  DALI_INTERNAL WaterEffect( ShaderEffect handle, Internal::WaterEffect* shaderExtension );
 };
 
 } // namespace Toolkit