projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed 'virtual' function override declarations to 'override' in dali-toolkit.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
tool-bar
/
tool-bar-impl.h
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
6f8a82b
..
e5116e8
100644
(file)
--- a/
dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
+++ b/
dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
@@
-66,7
+66,7
@@
private: // From Control
/**
* @copydoc Toolkit::Control::OnInitialize()
*/
/**
* @copydoc Toolkit::Control::OnInitialize()
*/
- v
irtual void OnInitialize()
;
+ v
oid 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).
/**
* Adds a control using some default values (the control uses 10% of the tool bar space and is placed on the left group).
@@
-74,7
+74,7
@@
private: // From Control
*
* @see Control::OnChildAdd()
*/
*
* @see Control::OnChildAdd()
*/
- v
irtual void OnChildAdd(Actor& child)
;
+ v
oid OnChildAdd(Actor& child) override
;
private:
/**
private:
/**