-#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.
// 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
/**
* @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:
/**
} // namespace Dali
-#endif // __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__
+#endif // DALI_TOOLKIT_INTERNAL_TOOL_BAR_H