diff options
author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-02-09 19:08:45 +0100 |
---|---|---|
committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-02-13 16:59:57 +0100 |
commit | 3b2a5a429be16e5b8e5d322b7a077a2c849586b8 (patch) | |
tree | b4f1ac841445e904705e33810380106ddba685d0 /src/lib/ecore_evas | |
parent | 33c40419502265c7a2c357d6a274453818d98729 (diff) |
efl_input: remove the API of efl_input_instance_get
there is basically no reason for this API. You can only use the API when
you know the class, when you know the class you can also just know the
function to call to get this API.
The reason this API needs to go is that we don't want to use
polymorphism on class-functions.
ref T7675
Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es>
Differential Revision: https://phab.enlightenment.org/D7900
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r-- | src/lib/ecore_evas/ecore_evas.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index cbd3107fa3..ff711084d7 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c | |||
@@ -3618,7 +3618,7 @@ _ecore_evas_mouse_move_process_internal(Ecore_Evas *ee, | |||
3618 | 3618 | ||
3619 | if (!send_event) return; | 3619 | if (!send_event) return; |
3620 | 3620 | ||
3621 | evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, ee->evas, (void **) &ev); | 3621 | evt = efl_input_pointer_instance_get( ee->evas, (void **) &ev); |
3622 | if (!evt) return; | 3622 | if (!evt) return; |
3623 | 3623 | ||
3624 | ev->action = EFL_POINTER_ACTION_MOVE; | 3624 | ev->action = EFL_POINTER_ACTION_MOVE; |
@@ -4811,7 +4811,7 @@ _direct_mouse_updown(Ecore_Evas *ee, const Ecore_Event_Mouse_Button *info, Efl_P | |||
4811 | * modifiers (already passed to evas, no need to do anything) | 4811 | * modifiers (already passed to evas, no need to do anything) |
4812 | */ | 4812 | */ |
4813 | 4813 | ||
4814 | evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, e, (void **) &ev); | 4814 | evt = efl_input_pointer_instance_get( e, (void **) &ev); |
4815 | if (!evt) return EINA_FALSE; | 4815 | if (!evt) return EINA_FALSE; |
4816 | 4816 | ||
4817 | ev->action = action; | 4817 | ev->action = action; |
@@ -4875,7 +4875,7 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info) | |||
4875 | * modifiers (already passed to evas, no need to do anything) | 4875 | * modifiers (already passed to evas, no need to do anything) |
4876 | */ | 4876 | */ |
4877 | 4877 | ||
4878 | evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, e, (void **) &ev); | 4878 | evt = efl_input_pointer_instance_get( e, (void **) &ev); |
4879 | if (!evt) return EINA_FALSE; | 4879 | if (!evt) return EINA_FALSE; |
4880 | 4880 | ||
4881 | ev->action = EFL_POINTER_ACTION_MOVE; | 4881 | ev->action = EFL_POINTER_ACTION_MOVE; |
@@ -4915,7 +4915,7 @@ _direct_mouse_wheel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Wheel *info) | |||
4915 | * modifiers (already passed to evas, no need to do anything) | 4915 | * modifiers (already passed to evas, no need to do anything) |
4916 | */ | 4916 | */ |
4917 | 4917 | ||
4918 | evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, e, (void **) &ev); | 4918 | evt = efl_input_pointer_instance_get( e, (void **) &ev); |
4919 | if (!evt) return EINA_FALSE; | 4919 | if (!evt) return EINA_FALSE; |
4920 | 4920 | ||
4921 | ev->action = EFL_POINTER_ACTION_WHEEL; | 4921 | ev->action = EFL_POINTER_ACTION_WHEEL; |
@@ -4947,7 +4947,7 @@ _direct_mouse_inout(Ecore_Evas *ee, const Ecore_Event_Mouse_IO *info, Efl_Pointe | |||
4947 | * modifiers (already passed to evas, no need to do anything) | 4947 | * modifiers (already passed to evas, no need to do anything) |
4948 | */ | 4948 | */ |
4949 | 4949 | ||
4950 | evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, e, (void **) &ev); | 4950 | evt = efl_input_pointer_instance_get( e, (void **) &ev); |
4951 | if (!evt) return EINA_FALSE; | 4951 | if (!evt) return EINA_FALSE; |
4952 | 4952 | ||
4953 | ev->action = action; | 4953 | ev->action = action; |
@@ -4991,7 +4991,7 @@ _direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info) | |||
4991 | * window, root_window, event_window | 4991 | * window, root_window, event_window |
4992 | */ | 4992 | */ |
4993 | 4993 | ||
4994 | evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, e, (void **) &ev); | 4994 | evt = efl_input_pointer_instance_get( e, (void **) &ev); |
4995 | if (!ev) return EINA_FALSE; | 4995 | if (!ev) return EINA_FALSE; |
4996 | 4996 | ||
4997 | ev->action = EFL_POINTER_ACTION_AXIS; | 4997 | ev->action = EFL_POINTER_ACTION_AXIS; |
@@ -5110,7 +5110,7 @@ _direct_key_updown_cb(Ecore_Evas *ee, const Ecore_Event_Key *info, Eina_Bool dow | |||
5110 | * modifiers (already passed to evas, no need to do anything) | 5110 | * modifiers (already passed to evas, no need to do anything) |
5111 | */ | 5111 | */ |
5112 | 5112 | ||
5113 | evt = efl_input_instance_get(EFL_INPUT_KEY_CLASS, e, (void **) &ev); | 5113 | evt = efl_input_key_instance_get( e, (void **) &ev); |
5114 | if (!evt || !ev) return EINA_FALSE; | 5114 | if (!evt || !ev) return EINA_FALSE; |
5115 | 5115 | ||
5116 | ev->timestamp = info->timestamp; | 5116 | ev->timestamp = info->timestamp; |