Merge remote-tracking branch 'origin/tizen' into new_text

[platform/core/uifw/dali-toolkit.git] / optional / dali-toolkit / public-api / shader-effects / spot-effect.h

diff --git a/optional/dali-toolkit/public-api/shader-effects/spot-effect.h b/optional/dali-toolkit/public-api/shader-effects/spot-effect.h
index 24fac72..5c69baa 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/spot-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/spot-effect.h
@@ -18,10 +18,10 @@
  *
  */
 
-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -30,7 +30,7 @@ namespace Toolkit
 /**
  * SpotEffect2D is a custom shader effect to achieve spot effects on Image actors
  */
-class SpotEffect : public ShaderEffect
+class DALI_IMPORT_API SpotEffect : public ShaderEffect
 {
 public:
 
@@ -41,9 +41,11 @@ public:
   SpotEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~SpotEffect();
+  ~SpotEffect();
 
   /**
    * Create an initialized SpotEffect.
@@ -76,8 +78,7 @@ public:
   const std::string& GetRadiusPropertyName() const;
 
 private:
-  SpotEffect(ShaderEffect handle);
-
+  DALI_INTERNAL SpotEffect(ShaderEffect handle);
 };
 
 } // namespace Toolkit