From: Duna Oh Date: Wed, 3 Feb 2016 00:18:38 +0000 (+0900) Subject: ecore_wl: change 'class' to 'clas' of tizen_input_device X-Git-Tag: submit/submit/tizen/20160203.003623/20160203.003711^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F82%2F58682%2F1;p=platform%2Fupstream%2Fefl.git ecore_wl: change 'class' to 'clas' of tizen_input_device Signed-off-by: Duna Oh Change-Id: If67cfb9cee7f280e46e4257a72a36ae8f165f27e --- diff --git a/src/lib/ecore_wayland/ecore_wl_input.c b/src/lib/ecore_wayland/ecore_wl_input.c index 8ae539c..21a573f 100644 --- a/src/lib/ecore_wayland/ecore_wl_input.c +++ b/src/lib/ecore_wayland/ecore_wl_input.c @@ -93,7 +93,7 @@ static void _ecore_wl_input_mouse_wheel_send(Ecore_Wl_Input *input, unsigned int static Ecore_Wl_Mouse_Down_Info *_ecore_wl_mouse_down_info_get(int dev); static void _ecore_wl_input_device_manager_cb_device_add(void *data EINA_UNUSED, struct tizen_input_device_manager *tizen_input_device_manager EINA_UNUSED, unsigned int serial EINA_UNUSED, const char *name, struct tizen_input_device *device, struct wl_seat *seat); static void _ecore_wl_input_device_manager_cb_device_remove(void *data EINA_UNUSED, struct tizen_input_device_manager *tizen_input_device_manager EINA_UNUSED, unsigned int serial EINA_UNUSED, const char *name, struct tizen_input_device *device, struct wl_seat *seat); -static void _ecore_wl_input_device_cb_device_info(void *data, struct tizen_input_device *tizen_input_device EINA_UNUSED, uint32_t class, uint32_t subclass, struct wl_array *axes EINA_UNUSED); +static void _ecore_wl_input_device_cb_device_info(void *data, struct tizen_input_device *tizen_input_device EINA_UNUSED, uint32_t clas, uint32_t subclas, struct wl_array *axes EINA_UNUSED); static void _ecore_wl_input_device_cb_event_device(void *data, struct tizen_input_device *tizen_input_device EINA_UNUSED, unsigned int serial EINA_UNUSED, const char *name EINA_UNUSED, uint32_t time EINA_UNUSED); static void _ecore_wl_input_device_cb_axis(void *data EINA_UNUSED, struct tizen_input_device *tizen_input_device EINA_UNUSED, uint32_t axis_type EINA_UNUSED, wl_fixed_t value EINA_UNUSED); @@ -1901,13 +1901,13 @@ _ecore_wl_input_device_manager_cb_device_remove(void *data EINA_UNUSED, struct t } static void -_ecore_wl_input_device_cb_device_info(void *data, struct tizen_input_device *tizen_input_device EINA_UNUSED, uint32_t class, uint32_t subclass, struct wl_array *axes EINA_UNUSED) +_ecore_wl_input_device_cb_device_info(void *data, struct tizen_input_device *tizen_input_device EINA_UNUSED, uint32_t clas, uint32_t subclas, struct wl_array *axes EINA_UNUSED) { Ecore_Wl_Input_Device *dev; if (!(dev = data)) return; - dev->clas = class; - dev->subclas = subclass; + dev->clas = clas; + dev->subclas = subclas; if (!dev->identifier) return; _ecore_wl_input_device_info_broadcast(dev->identifier, dev->identifier, dev->clas, EINA_TRUE); diff --git a/src/lib/ecore_wayland/ecore_wl_private.h b/src/lib/ecore_wayland/ecore_wl_private.h index 2c44a02..5163911 100644 --- a/src/lib/ecore_wayland/ecore_wl_private.h +++ b/src/lib/ecore_wayland/ecore_wl_private.h @@ -243,8 +243,8 @@ struct _Ecore_Wl_Input_Device struct tizen_input_device *tz_device; const char *name; const char *identifier; - enum tizen_input_device_class clas; - enum tizen_input_device_subclass subclas; + enum tizen_input_device_clas clas; + enum tizen_input_device_subclas subclas; struct wl_seat *seat; };