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
/
text-controls
/
text-editor-impl.h
diff --git
a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
index
413c069
..
d51ba2a
100755
(executable)
--- a/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
@@
-116,91
+116,91
@@
private: // From Control
/**
* @copydoc Control::OnInitialize()
*/
/**
* @copydoc Control::OnInitialize()
*/
- v
irtual void OnInitialize()
;
+ v
oid OnInitialize() override
;
/**
* @copydoc Control::OnStyleChange()
*/
/**
* @copydoc Control::OnStyleChange()
*/
- v
irtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change )
;
+ v
oid OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) override
;
/**
* @copydoc Control::GetNaturalSize()
*/
/**
* @copydoc Control::GetNaturalSize()
*/
-
virtual Vector3 GetNaturalSize()
;
+
Vector3 GetNaturalSize() override
;
/**
* @copydoc Control::GetHeightForWidth()
*/
/**
* @copydoc Control::GetHeightForWidth()
*/
-
virtual float GetHeightForWidth( float width )
;
+
float GetHeightForWidth( float width ) override
;
/**
* @copydoc Control::OnInitialize()
*/
/**
* @copydoc Control::OnInitialize()
*/
- v
irtual void OnRelayout( const Vector2& size, RelayoutContainer& container )
;
+ v
oid OnRelayout( const Vector2& size, RelayoutContainer& container ) override
;
/**
* @copydoc Control::OnKeyInputFocusGained()
*/
/**
* @copydoc Control::OnKeyInputFocusGained()
*/
- v
irtual void OnKeyInputFocusGained()
;
+ v
oid OnKeyInputFocusGained() override
;
/**
* @copydoc Control::OnKeyInputFocusLost()
*/
/**
* @copydoc Control::OnKeyInputFocusLost()
*/
- v
irtual void OnKeyInputFocusLost()
;
+ v
oid OnKeyInputFocusLost() override
;
/**
* @copydoc Control::OnTap()
*/
/**
* @copydoc Control::OnTap()
*/
- v
irtual void OnTap( const TapGesture& tap )
;
+ v
oid OnTap( const TapGesture& tap ) override
;
/**
* @copydoc Control::OnPan()
*/
/**
* @copydoc Control::OnPan()
*/
- v
irtual void OnPan( const PanGesture& gesture )
;
+ v
oid OnPan( const PanGesture& gesture ) override
;
/**
* @copydoc Control::OnLongPress()
*/
/**
* @copydoc Control::OnLongPress()
*/
- v
irtual void OnLongPress( const LongPressGesture& gesture )
;
+ v
oid OnLongPress( const LongPressGesture& gesture ) override
;
/**
* @copydoc Control::OnSceneConnection()
*/
/**
* @copydoc Control::OnSceneConnection()
*/
- v
irtual void OnSceneConnection( int depth )
;
+ v
oid OnSceneConnection( int depth ) override
;
/**
* @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
*/
/**
* @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
*/
-
virtual bool OnKeyEvent(const KeyEvent& event)
;
+
bool OnKeyEvent(const KeyEvent& event) override
;
// From ControlInterface
/**
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
// From ControlInterface
/**
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
- v
irtual void RequestTextRelayout()
;
+ v
oid RequestTextRelayout() override
;
// From EditableControlInterface
/**
* @copydoc Text::ControlInterface::TextChanged()
*/
// From EditableControlInterface
/**
* @copydoc Text::ControlInterface::TextChanged()
*/
- v
irtual void TextChanged()
;
+ v
oid TextChanged() override
;
/**
* @copydoc Text::ControlInterface::MaxLengthReached()
*/
/**
* @copydoc Text::ControlInterface::MaxLengthReached()
*/
- v
irtual void MaxLengthReached()
;
+ v
oid MaxLengthReached() override
;
/**
* @copydoc Text::ControlInterface::InputStyleChanged()
*/
/**
* @copydoc Text::ControlInterface::InputStyleChanged()
*/
- v
irtual void InputStyleChanged( Text::InputStyle::Mask inputStyleMask )
;
+ v
oid InputStyleChanged( Text::InputStyle::Mask inputStyleMask ) override
;
/**
* @copydoc Text::ControlInterface::AddDecoration()
*/
/**
* @copydoc Text::ControlInterface::AddDecoration()
*/
- v
irtual void AddDecoration( Actor& actor, bool needsClipping )
;
+ v
oid AddDecoration( Actor& actor, bool needsClipping ) override
;
private: // Implementation
private: // Implementation