X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fcontrols%2Ftool-bar%2Ftool-bar-impl.h;h=e5116e8debd72ac7d643727a81af5d9ea85c6c19;hb=88f5c28e662678cc93e13a2bcc462ff2446012c1;hp=7caaed598ddff0183465f83b54f7979e9bd0c544;hpb=1c5674a11a51310ee689d6daf4e6b7d94dec607e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
index 7caaed5..e5116e8 100644
--- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
+++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__
-#define __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__
+#ifndef DALI_TOOLKIT_INTERNAL_TOOL_BAR_H
+#define DALI_TOOLKIT_INTERNAL_TOOL_BAR_H
 
 /*
- * Copyright (c) 2014 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.
@@ -23,7 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 #include <dali-toolkit/devel-api/controls/tool-bar/tool-bar.h>
 
 namespace Dali
@@ -66,15 +66,15 @@ private: // From Control
   /**
    * @copydoc Toolkit::Control::OnInitialize()
    */
-  virtual void OnInitialize();
+  void OnInitialize() override;
 
   /**
    * Adds a control using some default values (the control uses 10% of the tool bar space and is placed on the left group).
    * @param child The control to be added.
    *
-   * @see Control::OnControlChildAdd()
+   * @see Control::OnChildAdd()
    */
-  virtual void OnControlChildAdd(Actor& child);
+  void OnChildAdd(Actor& child) override;
 
 private:
   /**
@@ -155,4 +155,4 @@ inline const Toolkit::Internal::ToolBar& GetImpl( const Toolkit::ToolBar& toolBa
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__
+#endif // DALI_TOOLKIT_INTERNAL_TOOL_BAR_H