From e9e71d84be4c6ba2fd29e84815b3a956388d8fbf Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Fri, 27 Jan 2012 16:51:23 +0000 Subject: [PATCH] elm_gesture_layer: Elm_Gesture_Types -> Elm_Gesture_Type to keep consistency with other parts of the API SVN revision: 67569 --- legacy/elementary/src/lib/elm_gesture_layer.c | 18 +++++++++--------- legacy/elementary/src/lib/elm_gesture_layer.h | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/legacy/elementary/src/lib/elm_gesture_layer.c b/legacy/elementary/src/lib/elm_gesture_layer.c index 95ef4a5740..ccba14e4ed 100644 --- a/legacy/elementary/src/lib/elm_gesture_layer.c +++ b/legacy/elementary/src/lib/elm_gesture_layer.c @@ -75,7 +75,7 @@ struct _Gesture_Info Evas_Object *obj; void *data; /**< Holds gesture intemidiate processing data */ Func_Data fn[ELM_GESTURE_STATE_ABORT + 1]; /**< Callback info for states */ - Elm_Gesture_Types g_type; /**< gesture type */ + Elm_Gesture_Type g_type; /**< gesture type */ Elm_Gesture_State state; /**< gesture state */ void *info; /**< Data for the state callback */ Eina_Bool test; /**< if true this gesture should be tested on input */ @@ -270,7 +270,7 @@ static Eina_Bool _event_history_clear(Evas_Object *obj); static void _reset_states(Widget_Data *wd); static void _key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); static void _key_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); -static void _zoom_with_wheel_test(Evas_Object *obj, void *event_info, Evas_Callback_Type event_type, Elm_Gesture_Types g_type); +static void _zoom_with_wheel_test(Evas_Object *obj, void *event_info, Evas_Callback_Type event_type, Elm_Gesture_Type g_type); static void _mouse_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); static void _mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info); @@ -1438,7 +1438,7 @@ _compute_taps_center(Long_Tap_Type *st, static void _n_long_tap_test(Evas_Object *obj, Pointer_Event *pe, void *event_info, Evas_Callback_Type event_type, - Elm_Gesture_Types g_type) + Elm_Gesture_Type g_type) { /* Here we fill Recent_Taps struct and fire-up click/tap timers */ Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -1738,7 +1738,7 @@ _get_direction(Evas_Coord x1, Evas_Coord x2) static void _momentum_test(Evas_Object *obj, Pointer_Event *pe, void *event_info, Evas_Callback_Type event_type, - Elm_Gesture_Types g_type) + Elm_Gesture_Type g_type) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -2010,7 +2010,7 @@ _single_line_process(Elm_Gesture_Line_Info *info, Line_Data *st, */ static void _n_line_test(Evas_Object *obj, Pointer_Event *pe, void *event_info, - Evas_Callback_Type event_type, Elm_Gesture_Types g_type) + Evas_Callback_Type event_type, Elm_Gesture_Type g_type) { if (!pe) return; @@ -2524,7 +2524,7 @@ compute_zoom(Zoom_Type *st, Evas_Coord x1, Evas_Coord y1, */ static void _zoom_with_wheel_test(Evas_Object *obj, void *event_info, - Evas_Callback_Type event_type, Elm_Gesture_Types g_type) + Evas_Callback_Type event_type, Elm_Gesture_Type g_type) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -2650,7 +2650,7 @@ _zoom_with_wheel_test(Evas_Object *obj, void *event_info, */ static void _zoom_test(Evas_Object *obj, Pointer_Event *pe, void *event_info, - Evas_Callback_Type event_type, Elm_Gesture_Types g_type) + Evas_Callback_Type event_type, Elm_Gesture_Type g_type) { if (!pe) return; @@ -2873,7 +2873,7 @@ _get_rotate_properties(Rotate_Type *st, */ static void _rotate_test(Evas_Object *obj, Pointer_Event *pe, void *event_info, - Evas_Callback_Type event_type, Elm_Gesture_Types g_type) + Evas_Callback_Type event_type, Elm_Gesture_Type g_type) { if (!pe) return; @@ -3444,7 +3444,7 @@ elm_gesture_layer_attach(Evas_Object *obj, Evas_Object *t) } EAPI void -elm_gesture_layer_cb_set(Evas_Object *obj, Elm_Gesture_Types idx, +elm_gesture_layer_cb_set(Evas_Object *obj, Elm_Gesture_Type idx, Elm_Gesture_State cb_type, Elm_Gesture_Event_Cb cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); diff --git a/legacy/elementary/src/lib/elm_gesture_layer.h b/legacy/elementary/src/lib/elm_gesture_layer.h index 7f92b6f18c..385a2dc3e6 100644 --- a/legacy/elementary/src/lib/elm_gesture_layer.h +++ b/legacy/elementary/src/lib/elm_gesture_layer.h @@ -15,7 +15,7 @@ * Now you need to tell gesture layer what gestures you follow. * This is done with @ref elm_gesture_layer_cb_set call. * By setting the callback you actually saying to gesture layer: - * I would like to know when the gesture @ref Elm_Gesture_Types + * I would like to know when the gesture @ref Elm_Gesture_Type * switches to state @ref Elm_Gesture_State. * * Next, you need to implement the actual action that follows the input @@ -26,7 +26,7 @@ * (again with @ref elm_gesture_layer_cb_set) * * The information reported by gesture layer to your callback is depending - * on @ref Elm_Gesture_Types: + * on @ref Elm_Gesture_Type: * @ref Elm_Gesture_Taps_Info is the info reported for tap gestures: * @ref ELM_GESTURE_N_TAPS, @ref ELM_GESTURE_N_LONG_TAPS, * @ref ELM_GESTURE_N_DOUBLE_TAPS, @ref ELM_GESTURE_N_TRIPLE_TAPS. @@ -82,7 +82,7 @@ typedef enum ELM_GESTURE_ROTATE, /**< Rotate */ ELM_GESTURE_LAST -} Elm_Gesture_Types; +} Elm_Gesture_Type; /** * @enum _Elm_Gesture_State @@ -237,7 +237,7 @@ typedef Evas_Event_Flags (*Elm_Gesture_Event_Cb)(void *data, void *event_info); * * @ingroup Elm_Gesture_Layer */ -EAPI void elm_gesture_layer_cb_set(Evas_Object *obj, Elm_Gesture_Types idx, Elm_Gesture_State cb_type, Elm_Gesture_Event_Cb cb, void *data); +EAPI void elm_gesture_layer_cb_set(Evas_Object *obj, Elm_Gesture_Type idx, Elm_Gesture_State cb_type, Elm_Gesture_Event_Cb cb, void *data); /** * Call this function to get repeat-events settings.