Merge "Fix for the cursor position with the arabic script." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / bubble-effect / bubble-actor.h

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h b/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h
index 69d0026..3033032 100644 (file)
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_BUBBLE_ACTOR_H_
-#define __DALI_TOOLKIT_INTERNAL_BUBBLE_ACTOR_H_
+#ifndef DALI_TOOLKIT_INTERNAL_BUBBLE_ACTOR_H
+#define DALI_TOOLKIT_INTERNAL_BUBBLE_ACTOR_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -19,10 +19,10 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/actors/actor.h>
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/property-map.h>
-#include <dali/devel-api/rendering/renderer.h>
+#include <dali/public-api/rendering/renderer.h>
 
 namespace Dali
 {
@@ -49,7 +49,7 @@ public:
    * Ideally use one group of uniform to control one bubble.
    * If the num of patches in the MeshActor is more than groups of uniforms,
    * the uniform values will be shared by multiple bubbles. Allow up to 9 times.
-   * @param[in] movementArea The size of the bubble moving area, usually the same size as the background image actor.
+   * @param[in] movementArea The size of the bubble moving area, usually the same size as the background.
    * @return A newly allocated object.
    */
   BubbleActor( unsigned int numberOfBubble,
@@ -131,7 +131,7 @@ private:
   Actor        mActor;
   Renderer     mRenderer;
 
-  Vector2      mMovementArea;      ///< The size of the bubble moving area, usually the same size as the background image actor.
+  Vector2      mMovementArea;      ///< The size of the bubble moving area, usually the same size as the background.
 
   //properties mapped as uniforms
   std::vector<Property::Index> mIndicesOffset;             ///< Indices of the properties mapping to uniform array 'uOffset'
@@ -151,4 +151,4 @@ private:
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_INTERNAL_BUBBLE_ACTOR_H_ */
+#endif // DALI_TOOLKIT_INTERNAL_BUBBLE_ACTOR_H