From 25d96317c063c4b12f7f3fc78a1eb6225b4890fc Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 14 Feb 2020 09:36:53 -0500 Subject: [PATCH] efl/gesture: remove 'type' member from Efl_Canvas_Gesture_Data this is no longer used Reviewed-by: Xavi Artigas Differential Revision: https://phab.enlightenment.org/D11353 --- src/lib/evas/gesture/efl_canvas_gesture.c | 8 -------- src/lib/evas/gesture/efl_canvas_gesture_custom.c | 1 - src/lib/evas/gesture/efl_canvas_gesture_double_tap.c | 1 - src/lib/evas/gesture/efl_canvas_gesture_flick.c | 1 - src/lib/evas/gesture/efl_canvas_gesture_long_tap.c | 1 - src/lib/evas/gesture/efl_canvas_gesture_momentum.c | 1 - src/lib/evas/gesture/efl_canvas_gesture_private.h | 2 -- src/lib/evas/gesture/efl_canvas_gesture_tap.c | 1 - src/lib/evas/gesture/efl_canvas_gesture_triple_tap.c | 1 - src/lib/evas/gesture/efl_canvas_gesture_zoom.c | 1 - 10 files changed, 18 deletions(-) diff --git a/src/lib/evas/gesture/efl_canvas_gesture.c b/src/lib/evas/gesture/efl_canvas_gesture.c index 231bc865a0..e1fbe7824c 100644 --- a/src/lib/evas/gesture/efl_canvas_gesture.c +++ b/src/lib/evas/gesture/efl_canvas_gesture.c @@ -3,14 +3,6 @@ #define MY_CLASS EFL_CANVAS_GESTURE_CLASS -const Efl_Event_Description * -_efl_gesture_type_get(const Eo *obj) -{ - Efl_Canvas_Gesture_Data *pd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); - - return pd->type; -} - EOLIAN static Efl_Canvas_Gesture_State _efl_canvas_gesture_state_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Data *pd) { diff --git a/src/lib/evas/gesture/efl_canvas_gesture_custom.c b/src/lib/evas/gesture/efl_canvas_gesture_custom.c index 105558b57e..15fe0fe898 100644 --- a/src/lib/evas/gesture/efl_canvas_gesture_custom.c +++ b/src/lib/evas/gesture/efl_canvas_gesture_custom.c @@ -19,7 +19,6 @@ _efl_canvas_gesture_custom_efl_object_constructor(Eo *obj, Efl_Canvas_Gesture_Cu obj = efl_constructor(efl_super(obj, MY_CLASS)); gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); - gd->type = EFL_EVENT_GESTURE_CUSTOM; return obj; } diff --git a/src/lib/evas/gesture/efl_canvas_gesture_double_tap.c b/src/lib/evas/gesture/efl_canvas_gesture_double_tap.c index 971d49e3b6..d29e61a4a2 100644 --- a/src/lib/evas/gesture/efl_canvas_gesture_double_tap.c +++ b/src/lib/evas/gesture/efl_canvas_gesture_double_tap.c @@ -10,7 +10,6 @@ _efl_canvas_gesture_double_tap_efl_object_constructor(Eo *obj, void *pd EINA_UNU obj = efl_constructor(efl_super(obj, MY_CLASS)); gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); - gd->type = EFL_EVENT_GESTURE_DOUBLE_TAP; return obj; } diff --git a/src/lib/evas/gesture/efl_canvas_gesture_flick.c b/src/lib/evas/gesture/efl_canvas_gesture_flick.c index faa8e3812f..47364b1423 100644 --- a/src/lib/evas/gesture/efl_canvas_gesture_flick.c +++ b/src/lib/evas/gesture/efl_canvas_gesture_flick.c @@ -10,7 +10,6 @@ _efl_canvas_gesture_flick_efl_object_constructor(Eo *obj, Efl_Canvas_Gesture_Fli obj = efl_constructor(efl_super(obj, MY_CLASS)); gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); - gd->type = EFL_EVENT_GESTURE_FLICK; return obj; } diff --git a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.c b/src/lib/evas/gesture/efl_canvas_gesture_long_tap.c index 21f0055414..9ab6ff09c8 100644 --- a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.c +++ b/src/lib/evas/gesture/efl_canvas_gesture_long_tap.c @@ -9,7 +9,6 @@ _efl_canvas_gesture_long_tap_efl_object_constructor(Eo *obj, void *pd EINA_UNUSE obj = efl_constructor(efl_super(obj, MY_CLASS)); gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); - gd->type = EFL_EVENT_GESTURE_LONG_TAP; return obj; } diff --git a/src/lib/evas/gesture/efl_canvas_gesture_momentum.c b/src/lib/evas/gesture/efl_canvas_gesture_momentum.c index 91d2ca8f1d..4d00d0b580 100644 --- a/src/lib/evas/gesture/efl_canvas_gesture_momentum.c +++ b/src/lib/evas/gesture/efl_canvas_gesture_momentum.c @@ -10,7 +10,6 @@ _efl_canvas_gesture_momentum_efl_object_constructor(Eo *obj, Efl_Canvas_Gesture_ obj = efl_constructor(efl_super(obj, MY_CLASS)); gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); - gd->type = EFL_EVENT_GESTURE_MOMENTUM; return obj; } diff --git a/src/lib/evas/gesture/efl_canvas_gesture_private.h b/src/lib/evas/gesture/efl_canvas_gesture_private.h index e7627d336d..3ef595c3c8 100644 --- a/src/lib/evas/gesture/efl_canvas_gesture_private.h +++ b/src/lib/evas/gesture/efl_canvas_gesture_private.h @@ -11,7 +11,6 @@ /* milliseconds */ #define TAP_TOUCH_TIME_THRESHOLD (0.1 * 1000) -const Efl_Event_Description * _efl_gesture_type_get(const Eo *obj); int _direction_get(Evas_Coord xx1, Evas_Coord xx2); Eina_Value *_recognizer_config_get(const Eo *obj, const char *name); Eina_Bool _event_multi_touch_get(const Efl_Canvas_Gesture_Touch *event); @@ -139,7 +138,6 @@ struct _Efl_Canvas_Gesture_Recognizer_Custom_Data struct _Efl_Canvas_Gesture_Data { Efl_Canvas_Gesture_State state; - const Efl_Event_Description *type; Eina_Position2D hotspot; unsigned int timestamp; unsigned int touch_count; diff --git a/src/lib/evas/gesture/efl_canvas_gesture_tap.c b/src/lib/evas/gesture/efl_canvas_gesture_tap.c index d777bebba1..a93dab95c1 100644 --- a/src/lib/evas/gesture/efl_canvas_gesture_tap.c +++ b/src/lib/evas/gesture/efl_canvas_gesture_tap.c @@ -10,7 +10,6 @@ _efl_canvas_gesture_tap_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); - gd->type = EFL_EVENT_GESTURE_TAP; return obj; } diff --git a/src/lib/evas/gesture/efl_canvas_gesture_triple_tap.c b/src/lib/evas/gesture/efl_canvas_gesture_triple_tap.c index 5a6bb2f126..d27dcec988 100644 --- a/src/lib/evas/gesture/efl_canvas_gesture_triple_tap.c +++ b/src/lib/evas/gesture/efl_canvas_gesture_triple_tap.c @@ -10,7 +10,6 @@ _efl_canvas_gesture_triple_tap_efl_object_constructor(Eo *obj, void *pd EINA_UNU obj = efl_constructor(efl_super(obj, MY_CLASS)); gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); - gd->type = EFL_EVENT_GESTURE_TRIPLE_TAP; return obj; } diff --git a/src/lib/evas/gesture/efl_canvas_gesture_zoom.c b/src/lib/evas/gesture/efl_canvas_gesture_zoom.c index 9ea7533aeb..d8f73ba92a 100644 --- a/src/lib/evas/gesture/efl_canvas_gesture_zoom.c +++ b/src/lib/evas/gesture/efl_canvas_gesture_zoom.c @@ -9,7 +9,6 @@ _efl_canvas_gesture_zoom_efl_object_constructor(Eo *obj, Efl_Canvas_Gesture_Zoom obj = efl_constructor(efl_super(obj, MY_CLASS)); gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); - gd->type = EFL_EVENT_GESTURE_ZOOM; return obj; }