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
Reduce Cyclomatic Complexity of Text classes
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller.h
diff --git
a/dali-toolkit/internal/text/text-controller.h
b/dali-toolkit/internal/text/text-controller.h
index
c7a549e
..
4d40f41
100755
(executable)
--- a/
dali-toolkit/internal/text/text-controller.h
+++ b/
dali-toolkit/internal/text/text-controller.h
@@
-1470,7
+1470,7
@@
public: // Text-input Event Queuing.
* @param[in] state The state of the gesture.
* @param[in] displacement This distance panned since the last pan gesture.
*/
* @param[in] state The state of the gesture.
* @param[in] displacement This distance panned since the last pan gesture.
*/
- void PanEvent( Gesture
::
State state, const Vector2& displacement );
+ void PanEvent( GestureState state, const Vector2& displacement );
/**
* @brief Called by editable UI controls when a long press gesture occurs.
/**
* @brief Called by editable UI controls when a long press gesture occurs.
@@
-1479,7
+1479,7
@@
public: // Text-input Event Queuing.
* @param[in] x The x position relative to the top-left of the parent control.
* @param[in] y The y position relative to the top-left of the parent control.
*/
* @param[in] x The x position relative to the top-left of the parent control.
* @param[in] y The y position relative to the top-left of the parent control.
*/
- void LongPressEvent( Gesture
::
State state, float x, float y );
+ void LongPressEvent( GestureState state, float x, float y );
/**
* @brief Creates a selection event.
/**
* @brief Creates a selection event.
@@
-1532,31
+1532,31
@@
protected: // Inherit from Text::Decorator::ControllerInterface.
/**
* @copydoc Dali::Toolkit::Text::Decorator::ControllerInterface::GetTargetSize()
*/
/**
* @copydoc Dali::Toolkit::Text::Decorator::ControllerInterface::GetTargetSize()
*/
- v
irtual void GetTargetSize( Vector2& targetSize )
;
+ v
oid GetTargetSize( Vector2& targetSize ) override
;
/**
* @copydoc Dali::Toolkit::Text::Decorator::ControllerInterface::AddDecoration()
*/
/**
* @copydoc Dali::Toolkit::Text::Decorator::ControllerInterface::AddDecoration()
*/
- v
irtual void AddDecoration( Actor& actor, bool needsClipping )
;
+ v
oid AddDecoration( Actor& actor, bool needsClipping ) override
;
/**
* @copydoc Dali::Toolkit::Text::Decorator::ControllerInterface::DecorationEvent()
*/
/**
* @copydoc Dali::Toolkit::Text::Decorator::ControllerInterface::DecorationEvent()
*/
- v
irtual void DecorationEvent( HandleType handle, HandleState state, float x, float y )
;
+ v
oid DecorationEvent( HandleType handle, HandleState state, float x, float y ) override
;
protected: // Inherit from TextSelectionPopup::TextPopupButtonCallbackInterface.
/**
* @copydoc Dali::Toolkit::TextSelectionPopup::TextPopupButtonCallbackInterface::TextPopupButtonTouched()
*/
protected: // Inherit from TextSelectionPopup::TextPopupButtonCallbackInterface.
/**
* @copydoc Dali::Toolkit::TextSelectionPopup::TextPopupButtonCallbackInterface::TextPopupButtonTouched()
*/
- v
irtual void TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Buttons button )
;
+ v
oid TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Buttons button ) override
;
protected: // Inherit from HiddenText.
/**
* @brief Invoked from HiddenText when showing time of the last character was expired
*/
protected: // Inherit from HiddenText.
/**
* @brief Invoked from HiddenText when showing time of the last character was expired
*/
- v
irtual void DisplayTimeExpired()
;
+ v
oid DisplayTimeExpired() override
;
private: // Update.
private: // Update.