From 50f5704cc6b95ed30b25c668e2fc1679a4131279 Mon Sep 17 00:00:00 2001 From: Guilherme Iscaro Date: Thu, 29 Sep 2016 17:51:14 -0300 Subject: [PATCH] Evas_Device: Fix API name. Summary: It should be evas_device_add_full() in order to follow the EFL name pattern. Reviewers: DaveMDS, bdilly Reviewed By: DaveMDS, bdilly Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D4325 --- src/lib/evas/Evas_Common.h | 4 ++-- src/lib/evas/canvas/evas_device.c | 4 ++-- src/modules/ecore_evas/engines/x/ecore_evas_x.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index ddc15df..902aca0 100644 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -1126,7 +1126,7 @@ EAPI void evas_render_updates_free(Eina_List *updates); * @return the device node created or NULL if an error occurred. * * @see evas_device_del - * @see evas_device_full_add + * @see evas_device_add_full * @since 1.8 */ EAPI Evas_Device *evas_device_add(Evas *e); @@ -1151,7 +1151,7 @@ EAPI Evas_Device *evas_device_add(Evas *e); * @see evas_device_del * @since 1.19 */ -EAPI Evas_Device *evas_device_full_add(Evas *eo_e, const char *name, +EAPI Evas_Device *evas_device_add_full(Evas *eo_e, const char *name, const char *desc, Evas_Device *parent_dev, Evas_Device *emulation_dev, diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c index a485cb8..bea2ad7 100644 --- a/src/lib/evas/canvas/evas_device.c +++ b/src/lib/evas/canvas/evas_device.c @@ -38,13 +38,13 @@ _del_cb(void *data, const Efl_Event *ev) EAPI Evas_Device * evas_device_add(Evas *eo_e) { - return evas_device_full_add(eo_e, NULL, NULL, NULL, NULL, + return evas_device_add_full(eo_e, NULL, NULL, NULL, NULL, EVAS_DEVICE_CLASS_NONE, EVAS_DEVICE_SUBCLASS_NONE); } EAPI Evas_Device * -evas_device_full_add(Evas *eo_e, const char *name, const char *desc, +evas_device_add_full(Evas *eo_e, const char *name, const char *desc, Evas_Device *parent_dev, Evas_Device *emulation_dev, Evas_Device_Class clas, Evas_Device_Subclass sub_clas) { diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c b/src/modules/ecore_evas/engines/x/ecore_evas_x.c index 75e391e..b8ece81 100644 --- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c +++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c @@ -5359,18 +5359,18 @@ _ecore_evas_x11_vnc_client_connection_new(rfbClientRec *client) snprintf(buf, sizeof(buf), "seat-%u", _available_seat); - cdata->seat = evas_device_full_add(ee->evas, buf, - "A remote VNC seat", - NULL, NULL, EVAS_DEVICE_CLASS_SEAT, - EVAS_DEVICE_SUBCLASS_NONE); + cdata->seat = evas_device_add_full(ee->evas, buf, + "A remote VNC seat", + NULL, NULL, EVAS_DEVICE_CLASS_SEAT, + EVAS_DEVICE_SUBCLASS_NONE); EINA_SAFETY_ON_NULL_GOTO(cdata->seat, err_handler); - cdata->keyboard = evas_device_full_add(ee->evas, "Keyboard", + cdata->keyboard = evas_device_add_full(ee->evas, "Keyboard", "A remote VNC keyboard", cdata->seat, NULL, EVAS_DEVICE_CLASS_KEYBOARD, EVAS_DEVICE_SUBCLASS_NONE); EINA_SAFETY_ON_NULL_GOTO(cdata->keyboard, err_dev); - cdata->mouse = evas_device_full_add(ee->evas, "Mouse", + cdata->mouse = evas_device_add_full(ee->evas, "Mouse", "A remote VNC mouse", cdata->seat, NULL, EVAS_DEVICE_CLASS_MOUSE, -- 2.7.4