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
Merge changes I2df640e0,Ia1188305,I7fae506e,I7967a7cc,Ib0fdcdf4, ... into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
bloom-view
/
bloom-view-impl.h
diff --git
a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
index
0377146
..
09732e0
100644
(file)
--- a/
dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
+++ b/
dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
@@
-82,18
+82,18
@@
public:
private:
private:
- v
irtual void OnInitialize()
;
- v
irtual void OnSizeSet(const Vector3& targetSize)
;
+ v
oid OnInitialize() override
;
+ v
oid OnSizeSet(const Vector3& targetSize) override
;
/**
* @copydoc Control::OnChildAdd()
*/
/**
* @copydoc Control::OnChildAdd()
*/
- v
irtual void OnChildAdd( Actor& child )
;
+ v
oid OnChildAdd( Actor& child ) override
;
/**
* @copydoc Control::OnChildRemove()
*/
/**
* @copydoc Control::OnChildRemove()
*/
- v
irtual void OnChildRemove( Actor& child )
;
+ v
oid OnChildRemove( Actor& child ) override
;
void AllocateResources();
void CreateRenderTasks();
void AllocateResources();
void CreateRenderTasks();