Initial removal of Text features

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

diff --git a/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h b/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h
index d5ba25c..63e26b1 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/square-dissolve-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
 /**
  * SquareDissolveEffect is a custom shader effect to achieve square effects in Image actors
  */
-class SquareDissolveEffect : public ShaderEffect
+class DALI_IMPORT_API SquareDissolveEffect : public ShaderEffect
 {
 public:
 
@@ -41,9 +41,11 @@ public:
   SquareDissolveEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~SquareDissolveEffect();
+  ~SquareDissolveEffect();
 
   /**
    * Create an initialized SquareDissolveEffect.
@@ -104,7 +106,7 @@ public:
   const std::string& GetTexSizePropertyName() const;
 
 private: // Not intended for application developers
-  SquareDissolveEffect(ShaderEffect handle);
+  DALI_INTERNAL SquareDissolveEffect(ShaderEffect handle);
 };
 
 } // namespace Toolkit