X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fshader-effects%2Fmotion-stretch-effect.h;h=5cc7bcf882ae7187958f8228578a1e60a1306c3a;hb=9781441fa162e32e5796658d4169387a3ffb5d88;hp=af32b52089516f70b29a0d444edfe012f1f0b301;hpb=e2eda444afbe82e9591fe198eef339227f90a616;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h b/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h
index af32b52..5cc7bcf 100644
--- a/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h
+++ b/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h
@@ -1,28 +1,28 @@
 #ifndef __DALI_TOOLKIT_SHADER_EFFECT_MOTION_STRETCH_H__
 #define __DALI_TOOLKIT_SHADER_EFFECT_MOTION_STRETCH_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.
-//
+/*
+ * Copyright (c) 2015 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/actors/renderable-actor.h>
+#include <dali/public-api/shader-effects/shader-effect.h>
 
-// INTERNAL INCLUDES
-#include <dali/dali.h>
-
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -43,7 +43,7 @@ namespace Toolkit
  * Actor.SetShaderEffect( MotionStretchEffect );
  *
  */
-class MotionStretchEffect : public ShaderEffect
+class DALI_IMPORT_API MotionStretchEffect : public ShaderEffect
 {
 
 public:
@@ -55,9 +55,11 @@ public:
   MotionStretchEffect();
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~MotionStretchEffect();
+  ~MotionStretchEffect();
 
   /**
    * Create an initialized MotionStretchEffect
@@ -67,9 +69,10 @@ public:
 
   /**
    * Create a  MotionStretchEffect and attach it to the specified actor
+   * @param renderable actor to apply the effect to
    * @return A handle to a newly allocated Dali resource.
    */
-  static MotionStretchEffect Apply( Actor handle );
+  static MotionStretchEffect Apply( RenderableActor renderable );
 
   /**
    * Set geometry stretch factor property. This scales the amount the geometry
@@ -154,7 +157,7 @@ public:
 
 private:
   // Not intended for application developers
-  MotionStretchEffect( ShaderEffect handle );
+  DALI_INTERNAL MotionStretchEffect( ShaderEffect handle );
 };
 
 }
@@ -162,4 +165,3 @@ private:
 }
 
 #endif //#ifndef __DALI_TOOLKIT_SHADER_EFFECT_MOTION_STRETCH_H__
-