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
(Text Controller) Moved ShowPlaceholder method into PlaceholderHandler
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
effects-view
/
effects-view-impl.h
diff --git
a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
index
bd09dcb
..
6abeb20
100644
(file)
--- a/
dali-toolkit/internal/controls/effects-view/effects-view-impl.h
+++ b/
dali-toolkit/internal/controls/effects-view/effects-view-impl.h
@@
-120,32
+120,32
@@
private: // From Control
/**
* @copydoc Toolkit::Internal::Control::OnInitialize()
*/
/**
* @copydoc Toolkit::Internal::Control::OnInitialize()
*/
- v
irtual void OnInitialize()
;
+ v
oid OnInitialize() override
;
/**
* @copydoc CustomActorImpl::OnSizeSet( const Vector3& targetSize )
*/
/**
* @copydoc CustomActorImpl::OnSizeSet( const Vector3& targetSize )
*/
- v
irtual void OnSizeSet( const Vector3& targetSize )
;
+ v
oid OnSizeSet( const Vector3& targetSize ) override
;
/**
* @copydoc Toolkit::Internal::Control::OnSceneConnection
*/
/**
* @copydoc Toolkit::Internal::Control::OnSceneConnection
*/
- v
irtual void OnSceneConnection( int depth )
;
+ v
oid OnSceneConnection( int depth ) override
;
/**
* @copydoc Toolkit::Internal::Control::OnSceneDisconnection
*/
/**
* @copydoc Toolkit::Internal::Control::OnSceneDisconnection
*/
- v
irtual void OnSceneDisconnection()
;
+ v
oid OnSceneDisconnection() override
;
/**
* @copydoc Toolkit::Internal::Control::OnChildAdd
*/
/**
* @copydoc Toolkit::Internal::Control::OnChildAdd
*/
- v
irtual void OnChildAdd( Actor& child )
;
+ v
oid OnChildAdd( Actor& child ) override
;
/**
* @copydoc Toolkit::Internal::Control::OnChildRemove
*/
/**
* @copydoc Toolkit::Internal::Control::OnChildRemove
*/
- v
irtual void OnChildRemove( Actor& child )
;
+ v
oid OnChildRemove( Actor& child ) override
;
private:
private: