From 8a108db5ab8a5dd70c3c165b1c2bbab74db83e5f Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Sun, 3 Apr 2011 05:32:17 +0000 Subject: [PATCH] Elementary: Use pre-defined type Edje_Signal_Cb instead of describing all of its parameters. SVN revision: 58283 --- legacy/elementary/src/lib/elc_scrolled_entry.c | 4 ++-- legacy/elementary/src/lib/elm_button.c | 4 ++-- legacy/elementary/src/lib/elm_calendar.c | 4 ++-- legacy/elementary/src/lib/elm_clock.c | 4 ++-- legacy/elementary/src/lib/elm_entry.c | 4 ++-- legacy/elementary/src/lib/elm_hover.c | 4 ++-- legacy/elementary/src/lib/elm_icon.c | 4 ++-- legacy/elementary/src/lib/elm_index.c | 4 ++-- legacy/elementary/src/lib/elm_layout.c | 4 ++-- legacy/elementary/src/lib/elm_list.c | 4 ++-- legacy/elementary/src/lib/elm_panel.c | 4 ++-- legacy/elementary/src/lib/elm_scroller.c | 4 ++-- legacy/elementary/src/lib/elm_spinner.c | 4 ++-- legacy/elementary/src/lib/elm_widget.c | 16 ++++++---------- legacy/elementary/src/lib/elm_widget.h | 4 ++-- 15 files changed, 34 insertions(+), 38 deletions(-) diff --git a/legacy/elementary/src/lib/elc_scrolled_entry.c b/legacy/elementary/src/lib/elc_scrolled_entry.c index 76568a1228..7a861a77ef 100644 --- a/legacy/elementary/src/lib/elc_scrolled_entry.c +++ b/legacy/elementary/src/lib/elc_scrolled_entry.c @@ -184,7 +184,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source) } static void -_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -194,7 +194,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so } static void -_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data __UNUSED__) +_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data __UNUSED__) { Widget_Data *wd = elm_widget_data_get(obj); elm_object_signal_callback_del(wd->entry, emission, source, func_cb); diff --git a/legacy/elementary/src/lib/elm_button.c b/legacy/elementary/src/lib/elm_button.c index f5b8c5f7cc..6416786921 100644 --- a/legacy/elementary/src/lib/elm_button.c +++ b/legacy/elementary/src/lib/elm_button.c @@ -152,7 +152,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source) } static void -_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -160,7 +160,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so } static void -_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); edje_object_signal_callback_del_full(wd->btn, emission, source, func_cb, diff --git a/legacy/elementary/src/lib/elm_calendar.c b/legacy/elementary/src/lib/elm_calendar.c index 15848ff192..8330a27b3a 100644 --- a/legacy/elementary/src/lib/elm_calendar.c +++ b/legacy/elementary/src/lib/elm_calendar.c @@ -471,7 +471,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source) } static void -_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -480,7 +480,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so } static void -_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; diff --git a/legacy/elementary/src/lib/elm_clock.c b/legacy/elementary/src/lib/elm_clock.c index 769b7e4587..06e315d055 100644 --- a/legacy/elementary/src/lib/elm_clock.c +++ b/legacy/elementary/src/lib/elm_clock.c @@ -105,7 +105,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source) } static void -_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); int i; @@ -120,7 +120,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so } static void -_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); int i; diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c index 8d3ce9f259..1e4ac062da 100644 --- a/legacy/elementary/src/lib/elm_entry.c +++ b/legacy/elementary/src/lib/elm_entry.c @@ -655,7 +655,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source) } static void -_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -663,7 +663,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so } static void -_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); edje_object_signal_callback_del_full(wd->ent, emission, source, func_cb, diff --git a/legacy/elementary/src/lib/elm_hover.c b/legacy/elementary/src/lib/elm_hover.c index 638a7342c5..7ad12af457 100644 --- a/legacy/elementary/src/lib/elm_hover.c +++ b/legacy/elementary/src/lib/elm_hover.c @@ -168,7 +168,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source) } static void -_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd; @@ -180,7 +180,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so } static void -_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd; diff --git a/legacy/elementary/src/lib/elm_icon.c b/legacy/elementary/src/lib/elm_icon.c index 3ef9e74464..f4ad22edb1 100644 --- a/legacy/elementary/src/lib/elm_icon.c +++ b/legacy/elementary/src/lib/elm_icon.c @@ -96,7 +96,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source) } static void -_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -107,7 +107,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so } static void -_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c index 6967a3f5ad..a9c4323b58 100644 --- a/legacy/elementary/src/lib/elm_index.c +++ b/legacy/elementary/src/lib/elm_index.c @@ -76,7 +76,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source) } static void -_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -84,7 +84,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so } static void -_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); edje_object_signal_callback_del_full(wd->base, emission, source, func_cb, diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c index 74d4749125..77dc9a65e9 100644 --- a/legacy/elementary/src/lib/elm_layout.c +++ b/legacy/elementary/src/lib/elm_layout.c @@ -127,14 +127,14 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source) } static void -_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); edje_object_signal_callback_add(wd->lay, emission, source, func_cb, data); } static void -_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); edje_object_signal_callback_del_full(wd->lay, emission, source, func_cb, diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c index d6e8372229..682efbafea 100644 --- a/legacy/elementary/src/lib/elm_list.c +++ b/legacy/elementary/src/lib/elm_list.c @@ -519,7 +519,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source) } static void -_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); edje_object_signal_callback_add(elm_smart_scroller_edje_object_get(wd->scr), @@ -527,7 +527,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so } static void -_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); edje_object_signal_callback_del_full( diff --git a/legacy/elementary/src/lib/elm_panel.c b/legacy/elementary/src/lib/elm_panel.c index 724bb9b019..d5c21bb9cc 100644 --- a/legacy/elementary/src/lib/elm_panel.c +++ b/legacy/elementary/src/lib/elm_panel.c @@ -123,7 +123,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source) } static void -_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -132,7 +132,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so } static void -_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); edje_object_signal_callback_del_full( diff --git a/legacy/elementary/src/lib/elm_scroller.c b/legacy/elementary/src/lib/elm_scroller.c index 67d64004e1..76a906abb7 100644 --- a/legacy/elementary/src/lib/elm_scroller.c +++ b/legacy/elementary/src/lib/elm_scroller.c @@ -238,7 +238,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source) } static void -_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -247,7 +247,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so } static void -_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); edje_object_signal_callback_del_full( diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c index 57da67495a..53a4cf33ea 100644 --- a/legacy/elementary/src/lib/elm_spinner.c +++ b/legacy/elementary/src/lib/elm_spinner.c @@ -98,7 +98,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source) } static void -_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; @@ -107,7 +107,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so } static void -_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) { Widget_Data *wd = elm_widget_data_get(obj); edje_object_signal_callback_del_full(wd->spinner, emission, source, diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c index ccf7c9fd46..9b01098f28 100644 --- a/legacy/elementary/src/lib/elm_widget.c +++ b/legacy/elementary/src/lib/elm_widget.c @@ -34,13 +34,9 @@ struct _Smart_Data void (*signal_func) (Evas_Object *obj, const char *emission, const char *source); void (*callback_add_func) (Evas_Object *obj, const char *emission, - const char *source, void (*func) (void *data, - Evas_Object *o, const char *emission, - const char *source), void *data); + const char *source, Edje_Signal_Cb func, void *data); void (*callback_del_func) (Evas_Object *obj, const char *emission, - const char *source, void (*func) (void *data, - Evas_Object *o, const char *emission, - const char *source), void *data); + const char *source, Edje_Signal_Cb func, void *data); void (*changed_func) (Evas_Object *obj); Eina_Bool (*focus_next_func) (const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next); @@ -451,14 +447,14 @@ elm_widget_signal_emit_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj } EAPI void -elm_widget_signal_callback_add_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)) +elm_widget_signal_callback_add_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)) { API_ENTRY return; sd->callback_add_func = func; } EAPI void -elm_widget_signal_callback_del_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)) +elm_widget_signal_callback_del_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)) { API_ENTRY return; sd->callback_del_func = func; @@ -1439,7 +1435,7 @@ _edje_signal_callback(void *data, Evas_Object *obj __UNUSED__, const char *emiss } EAPI void -elm_widget_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *o, const char *emission, const char *source), void *data) +elm_widget_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data) { Edje_Signal_Data *esd; API_ENTRY return; @@ -1459,7 +1455,7 @@ elm_widget_signal_callback_add(Evas_Object *obj, const char *emission, const cha } EAPI void * -elm_widget_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *o, const char *emission, const char *source)) +elm_widget_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func) { Edje_Signal_Data *esd; Eina_List *l; diff --git a/legacy/elementary/src/lib/elm_widget.h b/legacy/elementary/src/lib/elm_widget.h index 2efc6846f5..fe754672dd 100644 --- a/legacy/elementary/src/lib/elm_widget.h +++ b/legacy/elementary/src/lib/elm_widget.h @@ -219,8 +219,8 @@ EAPI void elm_widget_theme_hook_set(Evas_Object *obj, void (*func) ( EAPI void elm_widget_event_hook_set(Evas_Object *obj, Eina_Bool (*func) (Evas_Object *obj, Evas_Object *source, Evas_Callback_Type type, void *event_info)); EAPI void elm_widget_changed_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj)); EAPI void elm_widget_signal_emit_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source)); -EAPI void elm_widget_signal_callback_add_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)); -EAPI void elm_widget_signal_callback_del_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)); +EAPI void elm_widget_signal_callback_add_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)); +EAPI void elm_widget_signal_callback_del_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)); EAPI void elm_widget_theme(Evas_Object *obj); EAPI void elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force); EAPI void elm_widget_focus_next_hook_set(Evas_Object *obj, Eina_Bool (*func) (const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next));