projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved Gesture::State and -::Type to gesture-enumerations.h.
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
events
/
gesture-impl.h
diff --git
a/dali/internal/event/events/gesture-impl.h
b/dali/internal/event/events/gesture-impl.h
index
f0a733b
..
8e521db
100644
(file)
--- a/
dali/internal/event/events/gesture-impl.h
+++ b/
dali/internal/event/events/gesture-impl.h
@@
-40,17
+40,12
@@
class Gesture : public BaseObject
{
public:
{
public:
- using State = Dali::Gesture::State;
- using Type = Dali::Gesture::Type;
-
-public:
-
/**
* @brief Get the gesture type.
*
* @return The gesture type.
*/
/**
* @brief Get the gesture type.
*
* @return The gesture type.
*/
- inline
Typ
e GetType() const
+ inline
GestureType::Valu
e GetType() const
{
return mGestureType;
}
{
return mGestureType;
}
@@
-59,7
+54,7
@@
public:
* @brief Set the state of the gesture.
* @param[in] state The state of the gesture to set
*/
* @brief Set the state of the gesture.
* @param[in] state The state of the gesture to set
*/
- inline void SetState( State state )
+ inline void SetState(
Gesture
State state )
{
mState = state;
}
{
mState = state;
}
@@
-69,7
+64,7
@@
public:
*
* @return The state of the gesture.
*/
*
* @return The state of the gesture.
*/
- inline State GetState() const
+ inline
Gesture
State GetState() const
{
return mState;
}
{
return mState;
}
@@
-105,7
+100,7
@@
protected:
* @param[in] gestureType The type of gesture event.
* @param[in] gestureState The state of the gesture event.
*/
* @param[in] gestureType The type of gesture event.
* @param[in] gestureState The state of the gesture event.
*/
- Gesture(
Type gestureType,
State gestureState)
+ Gesture(
GestureType::Value gestureType, Gesture
State gestureState)
: mGestureType( gestureType ),
mState( gestureState )
{
: mGestureType( gestureType ),
mState( gestureState )
{
@@
-119,8
+114,8
@@
protected:
virtual ~Gesture() = default;
private:
virtual ~Gesture() = default;
private:
-
Typ
e mGestureType;
- State mState;
+
GestureType::Valu
e mGestureType;
+
Gesture
State mState;
uint32_t mTime{0u};
};
uint32_t mTime{0u};
};