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 "Reduce Cyclomatic Complexity of Text classes" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
model3d-view
/
model3d-view-impl.h
diff --git
a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.h
b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.h
index
51388f3
..
cb0c22b
100644
(file)
--- a/
dali-toolkit/internal/controls/model3d-view/model3d-view-impl.h
+++ b/
dali-toolkit/internal/controls/model3d-view/model3d-view-impl.h
@@
-76,7
+76,7
@@
public:
/**
* @copydoc Control::OnRelayout
*/
/**
* @copydoc Control::OnRelayout
*/
- v
irtual void OnRelayout( const Vector2& size, RelayoutContainer& container )
;
+ v
oid OnRelayout( const Vector2& size, RelayoutContainer& container ) override
;
/**
* @brief Called to load both geometry (.obj) and material (.mtl) files
/**
* @brief Called to load both geometry (.obj) and material (.mtl) files
@@
-101,12
+101,12
@@
private:
/**
* @copydoc Toolkit::Control::OnInitialize()
*/
/**
* @copydoc Toolkit::Control::OnInitialize()
*/
- v
irtual void OnInitialize()
;
+ v
oid OnInitialize() override
;
/**
/**
- * @copydoc CustomActorImpl::OnS
tag
eConnection()
+ * @copydoc CustomActorImpl::OnS
cen
eConnection()
*/
*/
- v
irtual void OnStageConnection( int depth )
;
+ v
oid OnSceneConnection( int depth ) override
;
private:
private: