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
[AT-SPI] Squashed implementation
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
transition-effects
/
cube-transition-effect-impl.h
diff --git
a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h
b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h
index
d3e9673
..
65e294f
100644
(file)
--- a/
dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h
+++ b/
dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h
@@
-132,12
+132,12
@@
protected:
/**
* @copydoc CustomActorImpl::OnSceneConnection()
*/
/**
* @copydoc CustomActorImpl::OnSceneConnection()
*/
- v
irtual void OnSceneConnection( int depth )
;
+ v
oid OnSceneConnection( int depth ) override
;
/**
* @copydoc CustomActorImpl::OnSceneDisconnection()
*/
/**
* @copydoc CustomActorImpl::OnSceneDisconnection()
*/
- v
irtual void OnSceneDisconnection()
;
+ v
oid OnSceneDisconnection() override
;
protected:
protected:
@@
-192,7
+192,7
@@
private:
*/
virtual void OnStopTransition() {}
*/
virtual void OnStopTransition() {}
- v
irtual void OnRelayout( const Vector2& size, RelayoutContainer& container )
;
+ v
oid OnRelayout( const Vector2& size, RelayoutContainer& container ) override
;
void ResetToInitialState();
void ResetToInitialState();