X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=optional%2Fdali-toolkit%2Fpublic-api%2Fshader-effects%2Fsoft-button-effect.h;h=6b2f3ff23c5f6c8c24cd34b7fcbfe83b493cb2ae;hp=3b783f6380d9f85035369de2110e845a5c89cb31;hb=42eeffaa69044c2236996eb543416486ae92335c;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e

diff --git a/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h b/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h
index 3b783f6..6b2f3ff 100644
--- a/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h
@@ -1,26 +1,27 @@
 #ifndef __DALI_TOOLKIT_SHADER_EFFECT_SOFT_BUTTON_H__
 #define __DALI_TOOLKIT_SHADER_EFFECT_SOFT_BUTTON_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
@@ -48,7 +49,7 @@ namespace Toolkit
  * animation.Play();\n
  *
  */
-class SoftButtonEffect : public ShaderEffect
+class DALI_IMPORT_API SoftButtonEffect : public ShaderEffect
 {
 
 public:
@@ -60,9 +61,11 @@ public:
   SoftButtonEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~SoftButtonEffect();
+  ~SoftButtonEffect();
 
   typedef enum
   {
@@ -164,7 +167,7 @@ public:
 
 private:
   // Not intended for application developers
-  SoftButtonEffect(ShaderEffect handle);
+  DALI_INTERNAL SoftButtonEffect(ShaderEffect handle);
 };
 
 }