[dali_1.4.21] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / tool-bar / tool-bar.h

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..a9ad2e0 100644 (file)
--- 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) 2019 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.
@@ -43,7 +43,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.
@@ -124,4 +124,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_TOOL_BAR_H__
+#endif // DALI_TOOLKIT_TOOL_BAR_H