X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Ftool-bar%2Ftool-bar.h;h=36f4c34179b716229cd37950c73866b76c265628;hb=e7ec909c5ff33b751a8d92d0f38f7f9c2c0ccf2e;hp=b9f2c194727f6af3945e88c35a1891032f666540;hpb=70fc28a8c9ad04e29cb4a69c856bac3e96e2301d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h b/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h
index b9f2c19..36f4c34 100644
--- a/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h
+++ b/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_TOOL_BAR_H__
-#define __DALI_TOOLKIT_TOOL_BAR_H__
+#ifndef DALI_TOOLKIT_TOOL_BAR_H
+#define DALI_TOOLKIT_TOOL_BAR_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -22,19 +22,17 @@
 #include <string>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/alignment/alignment.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal DALI_INTERNAL
 {
 // Forward declarations
 class ToolBar;
-}
+} // namespace DALI_INTERNAL
 
 /**
  * Provides a tool bar where other controls (Dali::Actor) could be placed.
@@ -43,7 +41,7 @@ class ToolBar;
  * is not forbidden, it adds controls on the left group with a size of 10% of the total tool bar size.
  * Dali::Actor::Remove() method does nothing.
  */
-class DALI_IMPORT_API ToolBar : public Control
+class DALI_TOOLKIT_API ToolBar : public Control
 {
 public:
   static const Toolkit::Alignment::Padding DEFAULT_PADDING; ///< Default padding space between controls. By default all values are set to 0.
@@ -59,12 +57,12 @@ public:
    * Copy constructor. Creates another handle that points to the same real object
    * @param handle to copy from
    */
-  ToolBar( const ToolBar& handle );
+  ToolBar(const ToolBar& handle);
 
   /**
    * Assignment operator. Changes this handle to point to another real object
    */
-  ToolBar& operator=( const ToolBar& handle );
+  ToolBar& operator=(const ToolBar& handle);
 
   /**
    * @brief Destructor
@@ -85,7 +83,7 @@ public:
    * @param[in] handle Handle to an object
    * @return handle to a ToolBar or an uninitialized handle
    */
-  static ToolBar DownCast( BaseHandle handle );
+  static ToolBar DownCast(BaseHandle handle);
 
   /**
    * Adds an additional control to the tool bar.
@@ -96,32 +94,31 @@ public:
    * @param alignment Where to insert controls. Possible values are Toolkit::Alignment::Left, Toolkit::Alignment::Center or Toolkit::Alignment::Right.
    * @param padding Padding values used for the added control (left, right, top, bottom). By default, no padding is added.
    */
-  void AddControl( Actor control, float relativeSize, Toolkit::Alignment::Type alignment, const Toolkit::Alignment::Padding& padding = DEFAULT_PADDING );
+  void AddControl(Actor control, float relativeSize, Toolkit::Alignment::Type alignment, const Toolkit::Alignment::Padding& padding = DEFAULT_PADDING);
 
   /**
    * Removes a control from the tool bar.
    * @pre control must have been added before to this tool bar.
    * @param control The control to be removed.
    */
-  void RemoveControl( Actor control );
+  void RemoveControl(Actor control);
 
 public: // Not intended for application developers
-
   /**
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
-  DALI_INTERNAL ToolBar( Internal::ToolBar& implementation );
+  DALI_INTERNAL ToolBar(Internal::ToolBar& implementation);
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  explicit DALI_INTERNAL ToolBar( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL ToolBar(Dali::Internal::CustomActor* internal);
 };
 
 } // namespace Toolkit
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_TOOL_BAR_H__
+#endif // DALI_TOOLKIT_TOOL_BAR_H