Initial removal of Text features

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

diff --git a/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h b/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h
index edd57e7..777b303 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/carousel-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
@@ -40,7 +40,7 @@ namespace Toolkit
  * Finally, the carousel's center position can be specified as a Screen coordinate (top-left being
  * the origin).
  */
-class CarouselEffect : public ShaderEffect
+class DALI_IMPORT_API CarouselEffect : public ShaderEffect
 {
 public:
 
@@ -51,9 +51,11 @@ public:
   CarouselEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~CarouselEffect();
+  ~CarouselEffect();
 
   /**
    * Create an initialized CarouselEffect.
@@ -109,7 +111,7 @@ public:
 
 
 private: // Not intended for application developers
-  CarouselEffect(ShaderEffect handle);
+  DALI_INTERNAL CarouselEffect(ShaderEffect handle);
 };
 
 } // namespace Toolkit