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
/
progress-bar
/
progress-bar-impl.h
diff --git
a/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h
b/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h
index
31ae483
..
bdc5da9
100755
(executable)
--- a/
dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h
+++ b/
dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h
@@
-171,12
+171,12
@@
protected:
/**
* @copydoc CustomActorImpl::OnRelayout()
*/
/**
* @copydoc CustomActorImpl::OnRelayout()
*/
- v
irtual void OnRelayout( const Vector2& size, RelayoutContainer& container )
;
+ v
oid OnRelayout( const Vector2& size, RelayoutContainer& container ) override
;
/**
* @copydoc CustomActorImpl::GetNaturalSize()
*/
/**
* @copydoc CustomActorImpl::GetNaturalSize()
*/
-
virtual Vector3 GetNaturalSize()
;
+
Vector3 GetNaturalSize() override
;
private:
private:
@@
-202,7
+202,7
@@
private:
/**
* @copydoc Toolkit::Control::OnInitialize()
*/
/**
* @copydoc Toolkit::Control::OnInitialize()
*/
- v
irtual void OnInitialize()
;
+ v
oid OnInitialize() override
;
/**
* Get the range of the valid values the ProgressBar handle can move between
/**
* Get the range of the valid values the ProgressBar handle can move between
@@
-245,7
+245,7
@@
private:
/**
* Check if we should start animating
*/
/**
* Check if we should start animating
*/
- v
irtual void OnStageConnection( int depth )
;
+ v
oid OnSceneConnection( int depth ) override
;
private:
private: