summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2020-02-14 09:36:53 -0500
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-03-03 10:54:20 +0100
commit25d96317c063c4b12f7f3fc78a1eb6225b4890fc (patch)
treed1532f8001e511062dfe40602348489f4bdde7e2
parentd481cbe83c3c57883d32fc96ff3121f07025ab84 (diff)
efl/gesture: remove 'type' member from Efl_Canvas_Gesture_Data
this is no longer used Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D11353
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture.c8
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_custom.c1
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_double_tap.c1
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_flick.c1
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_long_tap.c1
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_momentum.c1
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_private.h2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_tap.c1
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_triple_tap.c1
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_zoom.c1
10 files changed, 0 insertions, 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 @@
3 3
4#define MY_CLASS EFL_CANVAS_GESTURE_CLASS 4#define MY_CLASS EFL_CANVAS_GESTURE_CLASS
5 5
6const Efl_Event_Description *
7_efl_gesture_type_get(const Eo *obj)
8{
9 Efl_Canvas_Gesture_Data *pd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS);
10
11 return pd->type;
12}
13
14EOLIAN static Efl_Canvas_Gesture_State 6EOLIAN static Efl_Canvas_Gesture_State
15_efl_canvas_gesture_state_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Data *pd) 7_efl_canvas_gesture_state_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Data *pd)
16{ 8{
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
19 obj = efl_constructor(efl_super(obj, MY_CLASS)); 19 obj = efl_constructor(efl_super(obj, MY_CLASS));
20 20
21 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); 21 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS);
22 gd->type = EFL_EVENT_GESTURE_CUSTOM;
23 22
24 return obj; 23 return obj;
25} 24}
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
10 obj = efl_constructor(efl_super(obj, MY_CLASS)); 10 obj = efl_constructor(efl_super(obj, MY_CLASS));
11 11
12 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); 12 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS);
13 gd->type = EFL_EVENT_GESTURE_DOUBLE_TAP;
14 13
15 return obj; 14 return obj;
16} 15}
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
10 obj = efl_constructor(efl_super(obj, MY_CLASS)); 10 obj = efl_constructor(efl_super(obj, MY_CLASS));
11 11
12 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); 12 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS);
13 gd->type = EFL_EVENT_GESTURE_FLICK;
14 13
15 return obj; 14 return obj;
16} 15}
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
9 9
10 obj = efl_constructor(efl_super(obj, MY_CLASS)); 10 obj = efl_constructor(efl_super(obj, MY_CLASS));
11 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); 11 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS);
12 gd->type = EFL_EVENT_GESTURE_LONG_TAP;
13 12
14 return obj; 13 return obj;
15} 14}
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_
10 obj = efl_constructor(efl_super(obj, MY_CLASS)); 10 obj = efl_constructor(efl_super(obj, MY_CLASS));
11 11
12 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); 12 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS);
13 gd->type = EFL_EVENT_GESTURE_MOMENTUM;
14 13
15 return obj; 14 return obj;
16} 15}
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 @@
11/* milliseconds */ 11/* milliseconds */
12#define TAP_TOUCH_TIME_THRESHOLD (0.1 * 1000) 12#define TAP_TOUCH_TIME_THRESHOLD (0.1 * 1000)
13 13
14const Efl_Event_Description * _efl_gesture_type_get(const Eo *obj);
15int _direction_get(Evas_Coord xx1, Evas_Coord xx2); 14int _direction_get(Evas_Coord xx1, Evas_Coord xx2);
16Eina_Value *_recognizer_config_get(const Eo *obj, const char *name); 15Eina_Value *_recognizer_config_get(const Eo *obj, const char *name);
17Eina_Bool _event_multi_touch_get(const Efl_Canvas_Gesture_Touch *event); 16Eina_Bool _event_multi_touch_get(const Efl_Canvas_Gesture_Touch *event);
@@ -139,7 +138,6 @@ struct _Efl_Canvas_Gesture_Recognizer_Custom_Data
139struct _Efl_Canvas_Gesture_Data 138struct _Efl_Canvas_Gesture_Data
140{ 139{
141 Efl_Canvas_Gesture_State state; 140 Efl_Canvas_Gesture_State state;
142 const Efl_Event_Description *type;
143 Eina_Position2D hotspot; 141 Eina_Position2D hotspot;
144 unsigned int timestamp; 142 unsigned int timestamp;
145 unsigned int touch_count; 143 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)
10 obj = efl_constructor(efl_super(obj, MY_CLASS)); 10 obj = efl_constructor(efl_super(obj, MY_CLASS));
11 11
12 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); 12 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS);
13 gd->type = EFL_EVENT_GESTURE_TAP;
14 13
15 return obj; 14 return obj;
16} 15}
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
10 obj = efl_constructor(efl_super(obj, MY_CLASS)); 10 obj = efl_constructor(efl_super(obj, MY_CLASS));
11 11
12 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); 12 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS);
13 gd->type = EFL_EVENT_GESTURE_TRIPLE_TAP;
14 13
15 return obj; 14 return obj;
16} 15}
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
9 9
10 obj = efl_constructor(efl_super(obj, MY_CLASS)); 10 obj = efl_constructor(efl_super(obj, MY_CLASS));
11 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS); 11 gd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_CLASS);
12 gd->type = EFL_EVENT_GESTURE_ZOOM;
13 12
14 return obj; 13 return obj;
15} 14}