From 30392f23a9b824b57adccdc7972420f45995b303 Mon Sep 17 00:00:00 2001 From: Boris Faure Date: Tue, 27 Aug 2013 15:36:50 +0200 Subject: [PATCH] s/__UNUSED__/EINA_UNUSED/g --- src/bin/about.c | 4 +- src/bin/config.c | 2 +- src/bin/controls.c | 26 +++++------ src/bin/dbus.c | 4 +- src/bin/ipc.c | 2 +- src/bin/main.c | 92 ++++++++++++++++++------------------- src/bin/media.c | 48 +++++++++---------- src/bin/options.c | 22 ++++----- src/bin/options_behavior.c | 26 +++++------ src/bin/options_colors.c | 2 +- src/bin/options_font.c | 16 +++---- src/bin/options_helpers.c | 16 +++---- src/bin/options_theme.c | 4 +- src/bin/options_video.c | 6 +-- src/bin/options_wallpaper.c | 2 +- src/bin/sel.c | 20 ++++---- src/bin/termcmd.c | 8 ++-- src/bin/termio.c | 92 ++++++++++++++++++------------------- src/bin/termiolink.c | 4 +- src/bin/termpty.c | 10 ++-- src/bin/termptyesc.c | 2 +- src/bin/termptyext.c | 2 +- src/bin/termptysave.c | 4 +- src/bin/utils.c | 2 +- 24 files changed, 208 insertions(+), 208 deletions(-) diff --git a/src/bin/about.c b/src/bin/about.c index eb4b2a7f..c908bcdc 100644 --- a/src/bin/about.c +++ b/src/bin/about.c @@ -14,7 +14,7 @@ static void (*ab_donecb) (void *data) = NULL; static void *ab_donedata = NULL; static Eina_Bool -_cb_ab_del_delay(void *data __UNUSED__) +_cb_ab_del_delay(void *data EINA_UNUSED) { evas_object_del(ab_layout); ab_layout = NULL; @@ -24,7 +24,7 @@ _cb_ab_del_delay(void *data __UNUSED__) } static void -_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev __UNUSED__) +_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev EINA_UNUSED) { about_toggle(saved_win, saved_bg, data, ab_donecb, ab_donedata); } diff --git a/src/bin/config.c b/src/bin/config.c index eafa3da1..d9be869d 100644 --- a/src/bin/config.c +++ b/src/bin/config.c @@ -519,7 +519,7 @@ config_theme_path_get(const Config *config) } const char * -config_theme_path_default_get(const Config *config __UNUSED__) +config_theme_path_default_get(const Config *config EINA_UNUSED) { static char path[PATH_MAX] = ""; diff --git a/src/bin/controls.c b/src/bin/controls.c index 0b04bf39..ec697a34 100644 --- a/src/bin/controls.c +++ b/src/bin/controls.c @@ -16,7 +16,7 @@ static void (*ct_donecb) (void *data) = NULL; static void *ct_donedata = NULL; static Eina_Bool -_cb_ct_del_delay(void *data __UNUSED__) +_cb_ct_del_delay(void *data EINA_UNUSED) { if (ct_over) { @@ -34,77 +34,77 @@ _cb_ct_del_delay(void *data __UNUSED__) } static void -_cb_ct_copy(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_ct_copy(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { controls_toggle(ct_win, ct_bg, ct_term, ct_donecb, ct_donedata); termio_copy_clipboard(data); } static void -_cb_ct_paste(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_ct_paste(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { controls_toggle(ct_win, ct_bg, ct_term, ct_donecb, ct_donedata); termio_paste_clipboard(data); } static void -_cb_ct_new(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_ct_new(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { main_new(ct_win, ct_term); } static void -_cb_ct_split_v(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_ct_split_v(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { main_split_v(ct_win, ct_term); } static void -_cb_ct_split_h(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_ct_split_h(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { main_split_h(ct_win, ct_term); } static void -_cb_ct_close(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_ct_close(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { main_close(ct_win, ct_term); } static void -_cb_ct_options(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_ct_options(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { controls_toggle(ct_win, ct_bg, ct_term, ct_donecb, ct_donedata); options_toggle(ct_win, ct_bg, ct_term, ct_donecb, ct_donedata); } static void -_cb_ct_about(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_ct_about(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { controls_toggle(ct_win, ct_bg, ct_term, ct_donecb, ct_donedata); about_toggle(ct_win, ct_bg, ct_term, ct_donecb, ct_donedata); } static void -_cb_mouse_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev __UNUSED__) +_cb_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev EINA_UNUSED) { controls_toggle(ct_win, ct_bg, ct_term, ct_donecb, ct_donedata); } static void -_cb_frame_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev __UNUSED__) +_cb_frame_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev EINA_UNUSED) { ct_frame = NULL; } static void -_cb_over_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev __UNUSED__) +_cb_over_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev EINA_UNUSED) { ct_over = NULL; } static void -_cb_saved_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev __UNUSED__) +_cb_saved_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev EINA_UNUSED) { if ((obj == ct_win) || (obj == ct_term)) { diff --git a/src/bin/dbus.c b/src/bin/dbus.c index 119e6854..c1d060e3 100644 --- a/src/bin/dbus.c +++ b/src/bin/dbus.c @@ -95,8 +95,8 @@ ty_dbus_shutdown(void) #else void ty_dbus_link_hide(void) {} -void ty_dbus_link_mousein (int64_t win __UNUSED__, const char *url __UNUSED__, int x __UNUSED__, int y __UNUSED__) {} -void ty_dbus_link_mouseout(int64_t win __UNUSED__, const char *url __UNUSED__, int x __UNUSED__, int y __UNUSED__) {} +void ty_dbus_link_mousein (int64_t win EINA_UNUSED, const char *url EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED) {} +void ty_dbus_link_mouseout(int64_t win EINA_UNUSED, const char *url EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED) {} void ty_dbus_init(void) {} void ty_dbus_shutdown(void) {} diff --git a/src/bin/ipc.c b/src/bin/ipc.c index 5c2bb6ac..75719ab1 100644 --- a/src/bin/ipc.c +++ b/src/bin/ipc.c @@ -11,7 +11,7 @@ static void (*func_new_inst) (Ipc_Instance *inst) = NULL; static Eet_Data_Descriptor *new_inst_edd = NULL; static Eina_Bool -_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event) +_ipc_cb_client_data(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Ipc_Event_Client_Data *e = event; diff --git a/src/bin/main.c b/src/bin/main.c index 9f403633..184f9f26 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -194,7 +194,7 @@ _split_find(Evas_Object *win, Evas_Object *term) } static void -_cb_size_track(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event __UNUSED__) +_cb_size_track(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) { Split *sp = data; Eina_List *l; @@ -651,7 +651,7 @@ main_win_focused_term_get(Win *wn) } static void -_cb_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Win *wn = data; @@ -661,7 +661,7 @@ _cb_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event } static void -_cb_focus_in(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_focus_in(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Win *wn = data; Term *term; @@ -687,7 +687,7 @@ _cb_focus_in(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static void -_cb_focus_out(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_focus_out(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Win *wn = data; Term *term; @@ -704,7 +704,7 @@ _cb_focus_out(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static void -_cb_term_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event ) +_cb_term_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event ) { Evas_Event_Mouse_Down *ev = event; Term *term = data; @@ -721,7 +721,7 @@ _cb_term_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, } static void -_cb_term_mouse_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_term_mouse_up(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { /* Evas_Event_Mouse_Up *ev = event; @@ -860,7 +860,7 @@ main_win_sizing_handle(Win *wn) } static void -_cb_size_hint(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event __UNUSED__) +_cb_size_hint(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) { Term *term = data; Evas_Coord mw, mh, rw, rh, w = 0, h = 0; @@ -901,7 +901,7 @@ _cb_options_done(void *data) } static void -_cb_options(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_options(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Term *term = data; @@ -910,7 +910,7 @@ _cb_options(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static Eina_Bool -_cb_flush(void *data __UNUSED__) +_cb_flush(void *data EINA_UNUSED) { flush_timer = NULL; elm_cache_all_flush(); @@ -918,14 +918,14 @@ _cb_flush(void *data __UNUSED__) } static void -_cb_change(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_change(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { if (!flush_timer) flush_timer = ecore_timer_add(5.0, _cb_flush, NULL); else ecore_timer_delay(flush_timer, 5.0); } static void -_cb_exited(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_exited(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Term *term = data; @@ -933,7 +933,7 @@ _cb_exited(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static void -_cb_bell(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_bell(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Term *term = data; Config *config = termio_config_get(term->term); @@ -962,7 +962,7 @@ _cb_bell(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static void -_cb_popmedia_del(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info __UNUSED__) +_cb_popmedia_del(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED) { Term *term = data; @@ -970,7 +970,7 @@ _cb_popmedia_del(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void } static void -_cb_popmedia_done(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *src __UNUSED__) +_cb_popmedia_done(void *data, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED) { Term *term = data; @@ -986,7 +986,7 @@ _cb_popmedia_done(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNU } static void -_cb_media_loop(void *data, Evas_Object *obj __UNUSED__, void *info __UNUSED__) +_cb_media_loop(void *data, Evas_Object *obj EINA_UNUSED, void *info EINA_UNUSED) { Term *term = data; @@ -1058,7 +1058,7 @@ _popmedia_queue_add(Term *term, const char *src) } static void -_cb_popup(void *data, Evas_Object *obj __UNUSED__, void *event) +_cb_popup(void *data, Evas_Object *obj EINA_UNUSED, void *event) { Term *term = data; const char *src = event; @@ -1068,7 +1068,7 @@ _cb_popup(void *data, Evas_Object *obj __UNUSED__, void *event) } static void -_cb_popup_queue(void *data, Evas_Object *obj __UNUSED__, void *event) +_cb_popup_queue(void *data, Evas_Object *obj EINA_UNUSED, void *event) { Term *term = data; const char *src = event; @@ -1078,7 +1078,7 @@ _cb_popup_queue(void *data, Evas_Object *obj __UNUSED__, void *event) } static void -_cb_command(void *data, Evas_Object *obj __UNUSED__, void *event) +_cb_command(void *data, Evas_Object *obj EINA_UNUSED, void *event) { Term *term = data; const char *cmd = event; @@ -1192,7 +1192,7 @@ _sel_restore(Split *sp) } static void -_sel_cb_selected(void *data, Evas_Object *obj __UNUSED__, void *info) +_sel_cb_selected(void *data, Evas_Object *obj EINA_UNUSED, void *info) { Split *sp = data; Eina_List *l; @@ -1214,7 +1214,7 @@ _sel_cb_selected(void *data, Evas_Object *obj __UNUSED__, void *info) } static void -_sel_cb_exit(void *data, Evas_Object *obj __UNUSED__, void *info __UNUSED__) +_sel_cb_exit(void *data, Evas_Object *obj EINA_UNUSED, void *info EINA_UNUSED) { Split *sp = data; _sel_restore(sp); @@ -1223,7 +1223,7 @@ _sel_cb_exit(void *data, Evas_Object *obj __UNUSED__, void *info __UNUSED__) } static void -_sel_cb_ending(void *data, Evas_Object *obj __UNUSED__, void *info __UNUSED__) +_sel_cb_ending(void *data, Evas_Object *obj EINA_UNUSED, void *info EINA_UNUSED) { Split *sp = data; edje_object_signal_emit(sp->sel_bg, "end", "terminology"); @@ -1309,7 +1309,7 @@ _sel_go(Split *sp, Term *term) } static void -_cb_tabcount_go(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *src __UNUSED__) +_cb_tabcount_go(void *data, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED) { Term *term = data; Split *sp; @@ -1319,7 +1319,7 @@ _cb_tabcount_go(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSE } static void -_cb_prev(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_prev(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Term *term = data; Term *term2 = NULL; @@ -1342,7 +1342,7 @@ _cb_prev(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static void -_cb_next(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_next(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Term *term = data; Term *term2 = NULL; @@ -1365,7 +1365,7 @@ _cb_next(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static void -_cb_new(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_new(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Term *term = data; @@ -1373,7 +1373,7 @@ _cb_new(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED } static void -_cb_select(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_select(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Term *term = data; Split *sp; @@ -1384,7 +1384,7 @@ _cb_select(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) static void -_cb_split_h(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_split_h(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Term *term = data; @@ -1392,7 +1392,7 @@ _cb_split_h(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static void -_cb_split_v(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_split_v(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Term *term = data; @@ -1400,7 +1400,7 @@ _cb_split_v(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static void -_cb_title(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_title(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Term *term = data; if (term->focused) @@ -1408,7 +1408,7 @@ _cb_title(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static void -_cb_icon(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_icon(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Term *term = data; if (term->focused) @@ -1428,61 +1428,61 @@ _tab_go(Term *term, int tnum) } static void -_cb_tab_1(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_tab_1(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { _tab_go(data, 0); } static void -_cb_tab_2(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_tab_2(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { _tab_go(data, 1); } static void -_cb_tab_3(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_tab_3(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { _tab_go(data, 2); } static void -_cb_tab_4(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_tab_4(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { _tab_go(data, 3); } static void -_cb_tab_5(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_tab_5(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { _tab_go(data, 4); } static void -_cb_tab_6(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_tab_6(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { _tab_go(data, 5); } static void -_cb_tab_7(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_tab_7(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { _tab_go(data, 6); } static void -_cb_tab_8(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_tab_8(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { _tab_go(data, 7); } static void -_cb_tab_9(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_tab_9(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { _tab_go(data, 8); } static void -_cb_tab_0(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_tab_0(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { _tab_go(data, 9); } @@ -1515,7 +1515,7 @@ _cb_cmd_del(void *data) } static void -_cb_cmd_activated(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_cmd_activated(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Win *wn = data; char *cmd = NULL; @@ -1546,7 +1546,7 @@ _cb_cmd_activated(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED_ } static void -_cb_cmd_aborted(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_cmd_aborted(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Win *wn = data; Term *term; @@ -1566,7 +1566,7 @@ _cb_cmd_aborted(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static void -_cb_cmd_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_cmd_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Win *wn = data; char *cmd = NULL; @@ -1587,7 +1587,7 @@ _cb_cmd_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static void -_cb_cmd_hints_changed(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_cmd_hints_changed(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Win *wn = data; @@ -1599,7 +1599,7 @@ _cb_cmd_hints_changed(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_ } static void -_cb_cmdbox(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_cmdbox(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Term *term = data; @@ -1703,7 +1703,7 @@ main_trans_update(const Config *config) } static void -_cb_media_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_media_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Term *term = data; Config *config = NULL; diff --git a/src/bin/media.c b/src/bin/media.c index c0675183..c22d363e 100644 --- a/src/bin/media.c +++ b/src/bin/media.c @@ -73,7 +73,7 @@ static void _et_init(void); static void _type_thumb_init2(Evas_Object *obj); static void -_et_disconnect(void *data __UNUSED__, Ethumb_Client *c) +_et_disconnect(void *data EINA_UNUSED, Ethumb_Client *c) { if (c != et_client) return; ethumb_client_disconnect(et_client); @@ -83,7 +83,7 @@ _et_disconnect(void *data __UNUSED__, Ethumb_Client *c) } static void -_et_connect(void *data __UNUSED__, Ethumb_Client *c, Eina_Bool ok) +_et_connect(void *data EINA_UNUSED, Ethumb_Client *c, Eina_Bool ok) { if (ok) { @@ -146,7 +146,7 @@ _type_thumb_calc(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Eva } static void -_cb_thumb_preloaded(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_thumb_preloaded(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Media *sd = evas_object_smart_data_get(data); Evas_Coord ox, oy, ow, oh; @@ -159,7 +159,7 @@ _cb_thumb_preloaded(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, } static void -_et_done(Ethumb_Client *c __UNUSED__, const char *file, const char *key, void *data) +_et_done(Ethumb_Client *c EINA_UNUSED, const char *file, const char *key, void *data) { Evas_Object *obj = data; Media *sd = evas_object_smart_data_get(obj); @@ -175,7 +175,7 @@ _et_done(Ethumb_Client *c __UNUSED__, const char *file, const char *key, void *d } static void -_et_error(Ethumb_Client *c __UNUSED__, void *data) +_et_error(Ethumb_Client *c EINA_UNUSED, void *data) { Evas_Object *obj = data; Media *sd = evas_object_smart_data_get(obj); @@ -252,7 +252,7 @@ _type_thumb_init(Evas_Object *obj) //////////////////////// img static void -_cb_img_preloaded(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_img_preloaded(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Media *sd = evas_object_smart_data_get(data); if (!sd) return; @@ -386,7 +386,7 @@ _type_img_calc(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_ //////////////////////// scalable img static void -_cb_scale_preloaded(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_scale_preloaded(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Media *sd = evas_object_smart_data_get(data); if (!sd) return; @@ -504,7 +504,7 @@ _type_scale_calc(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Eva //////////////////////// edj static void -_cb_edje_preloaded(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *src __UNUSED__) +_cb_edje_preloaded(void *data, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED) { Media *sd = evas_object_smart_data_get(data); if (!sd) return; @@ -556,7 +556,7 @@ _type_edje_calc(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas static void _type_mov_calc(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); static void -_cb_mov_frame_decode(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_mov_frame_decode(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Media *sd = evas_object_smart_data_get(data); Evas_Coord ox, oy, ow, oh; @@ -575,7 +575,7 @@ _cb_mov_frame_decode(void *data, Evas_Object *obj __UNUSED__, void *event __UNUS } static void -_cb_mov_frame_resize(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_mov_frame_resize(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Media *sd = evas_object_smart_data_get(data); Evas_Coord ox, oy, ow, oh; @@ -586,7 +586,7 @@ _cb_mov_frame_resize(void *data, Evas_Object *obj __UNUSED__, void *event __UNUS } static void -_cb_mov_len_change(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_mov_len_change(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Media *sd = evas_object_smart_data_get(data); if (!sd) return; @@ -603,7 +603,7 @@ _cb_mov_restart(void *data) } static void -_cb_mov_decode_stop(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_mov_decode_stop(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Media *sd = evas_object_smart_data_get(data); if (!sd) return; @@ -613,7 +613,7 @@ _cb_mov_decode_stop(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSE } static void -_cb_mov_progress(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_mov_progress(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Media *sd = evas_object_smart_data_get(data); if (!sd) return; @@ -623,7 +623,7 @@ _cb_mov_progress(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__ } static void -_cb_mov_ref(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_mov_ref(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Media *sd = evas_object_smart_data_get(data); if (!sd) return; @@ -633,25 +633,25 @@ _cb_mov_ref(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static void -_cb_media_play(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_media_play(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { media_play_set(data, EINA_TRUE); } static void -_cb_media_pause(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_media_pause(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { media_play_set(data, EINA_FALSE); } static void -_cb_media_stop(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_media_stop(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { media_stop(data); } static void -_cb_media_vol(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_media_vol(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { double vx, vy; Media *sd = evas_object_smart_data_get(data); @@ -661,7 +661,7 @@ _cb_media_vol(void *data, Evas_Object *obj __UNUSED__, const char *emission __UN } static void -_cb_media_pos(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_media_pos(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { double vx, vy; Media *sd = evas_object_smart_data_get(data); @@ -974,7 +974,7 @@ _smart_calculate(Evas_Object *obj) } static void -_smart_move(Evas_Object *obj, Evas_Coord x __UNUSED__, Evas_Coord y __UNUSED__) +_smart_move(Evas_Object *obj, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED) { Media *sd = evas_object_smart_data_get(obj); if (!sd) return; @@ -982,7 +982,7 @@ _smart_move(Evas_Object *obj, Evas_Coord x __UNUSED__, Evas_Coord y __UNUSED__) } static Eina_Bool -_url_prog_cb(void *data, int type __UNUSED__, void *event_info) +_url_prog_cb(void *data, int type EINA_UNUSED, void *event_info) { Ecore_Con_Event_Url_Progress *ev = event_info; Evas_Object *obj = data; @@ -1010,7 +1010,7 @@ _url_prog_cb(void *data, int type __UNUSED__, void *event_info) } static Eina_Bool -_url_compl_cb(void *data, int type __UNUSED__, void *event_info) +_url_compl_cb(void *data, int type EINA_UNUSED, void *event_info) { Ecore_Con_Event_Url_Complete *ev = event_info; Evas_Object *obj = data; @@ -1046,7 +1046,7 @@ _url_compl_cb(void *data, int type __UNUSED__, void *event_info) } static void -_mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Mouse_Down *ev = event; Media *sd = evas_object_smart_data_get(data); @@ -1060,7 +1060,7 @@ _mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void } static void -_mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_mouse_up_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Mouse_Down *ev = event; Media *sd = evas_object_smart_data_get(data); diff --git a/src/bin/options.c b/src/bin/options.c index 02b769d9..f5042a81 100644 --- a/src/bin/options.c +++ b/src/bin/options.c @@ -24,7 +24,7 @@ static void *op_donedata = NULL; static int mode = -1; static void -_cb_op_font(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_op_font(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { if (mode == 1) return; mode = 1; @@ -32,7 +32,7 @@ _cb_op_font(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UN } static void -_cb_op_theme(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_op_theme(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { if (mode == 2) return; mode = 2; @@ -40,7 +40,7 @@ _cb_op_theme(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __U } static void -_cb_op_wallpaper(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_op_wallpaper(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { if (mode == 3) return; mode = 3; @@ -48,7 +48,7 @@ _cb_op_wallpaper(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event } static void -_cb_op_colors(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_op_colors(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { if (mode == 4) return; mode = 4; @@ -56,7 +56,7 @@ _cb_op_colors(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __ } static void -_cb_op_video(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_op_video(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { if (mode == 5) return; mode = 5; @@ -64,7 +64,7 @@ _cb_op_video(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __U } static void -_cb_op_behavior(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_op_behavior(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { if (mode == 6) return; mode = 6; @@ -72,7 +72,7 @@ _cb_op_behavior(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event } static void -_cb_op_helpers(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_op_helpers(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { if (mode == 7) return; mode = 7; @@ -80,14 +80,14 @@ _cb_op_helpers(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event _ } static void -_cb_op_tmp_chg(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_op_tmp_chg(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Config *config = data; config->temporary = elm_check_state_get(obj); } static Eina_Bool -_cb_op_del_delay(void *data __UNUSED__) +_cb_op_del_delay(void *data EINA_UNUSED) { evas_object_del(op_opbox); evas_object_del(op_frame); @@ -101,13 +101,13 @@ _cb_op_del_delay(void *data __UNUSED__) } static void -_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev __UNUSED__) +_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev EINA_UNUSED) { options_toggle(saved_win, saved_bg, data, op_donecb, op_donedata); } static void -_cb_opdt_hide_done(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *src __UNUSED__) +_cb_opdt_hide_done(void *data, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED) { elm_box_clear(op_opbox); switch (mode) diff --git a/src/bin/options_behavior.c b/src/bin/options_behavior.c index 022bf26d..996aa604 100644 --- a/src/bin/options_behavior.c +++ b/src/bin/options_behavior.c @@ -10,7 +10,7 @@ static Evas_Object *op_w, *op_h; static void -_cb_op_behavior_jump_keypress_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_behavior_jump_keypress_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -20,7 +20,7 @@ _cb_op_behavior_jump_keypress_chg(void *data, Evas_Object *obj, void *event __UN } static void -_cb_op_behavior_jump_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_behavior_jump_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -30,7 +30,7 @@ _cb_op_behavior_jump_chg(void *data, Evas_Object *obj, void *event __UNUSED__) } static void -_cb_op_behavior_cursor_blink_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_behavior_cursor_blink_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -40,7 +40,7 @@ _cb_op_behavior_cursor_blink_chg(void *data, Evas_Object *obj, void *event __UNU } static void -_cb_op_behavior_visual_bell_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_behavior_visual_bell_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -49,7 +49,7 @@ _cb_op_behavior_visual_bell_chg(void *data, Evas_Object *obj, void *event __UNUS } static void -_cb_op_behavior_flicker_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_behavior_flicker_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -59,7 +59,7 @@ _cb_op_behavior_flicker_chg(void *data, Evas_Object *obj, void *event __UNUSED__ } static void -_cb_op_behavior_urg_bell_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_behavior_urg_bell_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -68,7 +68,7 @@ _cb_op_behavior_urg_bell_chg(void *data, Evas_Object *obj, void *event __UNUSED_ } static void -_cb_op_behavior_multi_instance_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_behavior_multi_instance_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -77,7 +77,7 @@ _cb_op_behavior_multi_instance_chg(void *data, Evas_Object *obj, void *event __U } static void -_cb_op_behavior_wsep_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_behavior_wsep_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -99,7 +99,7 @@ _cb_op_behavior_wsep_chg(void *data, Evas_Object *obj, void *event __UNUSED__) } static void -_cb_op_behavior_sback_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_behavior_sback_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -111,7 +111,7 @@ _cb_op_behavior_sback_chg(void *data, Evas_Object *obj, void *event __UNUSED__) static void _cb_op_behavior_tab_zoom_slider_chg(void *data, Evas_Object *obj, - void *event __UNUSED__) + void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -122,7 +122,7 @@ _cb_op_behavior_tab_zoom_slider_chg(void *data, Evas_Object *obj, } static void -_cb_op_behavior_custom_geometry(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_behavior_custom_geometry(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -140,7 +140,7 @@ _cb_op_behavior_custom_geometry(void *data, Evas_Object *obj, void *event __UNUS } static void -_cb_op_behavior_cg_width(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_behavior_cg_width(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -153,7 +153,7 @@ _cb_op_behavior_cg_width(void *data, Evas_Object *obj, void *event __UNUSED__) } static void -_cb_op_behavior_cg_height(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_behavior_cg_height(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); diff --git a/src/bin/options_colors.c b/src/bin/options_colors.c index e1211904..62bc69f7 100644 --- a/src/bin/options_colors.c +++ b/src/bin/options_colors.c @@ -7,7 +7,7 @@ #include "options_colors.h" void -options_colors(Evas_Object *opbox, Evas_Object *term __UNUSED__) +options_colors(Evas_Object *opbox, Evas_Object *term EINA_UNUSED) { Evas_Object *o; diff --git a/src/bin/options_font.c b/src/bin/options_font.c index f4df0497..fe3ce0a8 100644 --- a/src/bin/options_font.c +++ b/src/bin/options_font.c @@ -44,7 +44,7 @@ _update_sizing(Evas_Object *term) } static void -_cb_op_font_sel(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_op_font_sel(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Font *f = data; Config *config = termio_config_get(f->term); @@ -61,7 +61,7 @@ _cb_op_font_sel(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static void -_cb_op_fontsize_sel(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_fontsize_sel(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -81,7 +81,7 @@ _cb_op_font_sort(const void *d1, const void *d2) } static void -_cb_op_font_preview_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event __UNUSED__) +_cb_op_font_preview_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *o; Ecore_Timer *timer = evas_object_data_get(obj, "delay"); @@ -143,7 +143,7 @@ done: } static void -_cb_op_font_preview_eval(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event __UNUSED__) +_cb_op_font_preview_eval(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) { Font *f = data; Evas_Coord ox, oy, ow, oh, vx, vy, vw, vh; @@ -197,7 +197,7 @@ _cb_op_font_content_get(void *data, Evas_Object *obj, const char *part) } static char * -_cb_op_font_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +_cb_op_font_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) { Font *f = data; char buf[4096], *p; @@ -210,13 +210,13 @@ _cb_op_font_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part _ } static char * -_cb_op_font_group_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +_cb_op_font_group_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) { return strdup(data); } static void -_cb_term_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_term_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Evas_Object *term = data; if (expecting_resize) @@ -228,7 +228,7 @@ _cb_term_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi } static void -_cb_font_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_font_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Evas_Object *term = data; evas_object_event_callback_del_full(term, EVAS_CALLBACK_RESIZE, diff --git a/src/bin/options_helpers.c b/src/bin/options_helpers.c index f20ee38c..27e3dcf6 100644 --- a/src/bin/options_helpers.c +++ b/src/bin/options_helpers.c @@ -8,7 +8,7 @@ #include "main.h" static void -_cb_op_helper_inline_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_helper_inline_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -17,7 +17,7 @@ _cb_op_helper_inline_chg(void *data, Evas_Object *obj, void *event __UNUSED__) } static void -_cb_op_helper_email_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_helper_email_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -38,7 +38,7 @@ _cb_op_helper_email_chg(void *data, Evas_Object *obj, void *event __UNUSED__) } static void -_cb_op_helper_url_image_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_helper_url_image_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -59,7 +59,7 @@ _cb_op_helper_url_image_chg(void *data, Evas_Object *obj, void *event __UNUSED__ } static void -_cb_op_helper_url_video_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_helper_url_video_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -80,7 +80,7 @@ _cb_op_helper_url_video_chg(void *data, Evas_Object *obj, void *event __UNUSED__ } static void -_cb_op_helper_url_general_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_helper_url_general_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -101,7 +101,7 @@ _cb_op_helper_url_general_chg(void *data, Evas_Object *obj, void *event __UNUSED } static void -_cb_op_helper_local_image_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_helper_local_image_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -122,7 +122,7 @@ _cb_op_helper_local_image_chg(void *data, Evas_Object *obj, void *event __UNUSED } static void -_cb_op_helper_local_video_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_helper_local_video_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -143,7 +143,7 @@ _cb_op_helper_local_video_chg(void *data, Evas_Object *obj, void *event __UNUSED } static void -_cb_op_helper_local_general_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_helper_local_general_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); diff --git a/src/bin/options_theme.c b/src/bin/options_theme.c index cc06be3f..56f62072 100644 --- a/src/bin/options_theme.c +++ b/src/bin/options_theme.c @@ -20,7 +20,7 @@ struct _Theme }; static char * -_cb_op_theme_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +_cb_op_theme_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) { Theme *t = data; char buf[4096], *p; @@ -56,7 +56,7 @@ _cb_op_theme_content_get(void *data, Evas_Object *obj, const char *part) } static void -_cb_op_theme_sel(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_op_theme_sel(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Theme *t = data; Config *config = termio_config_get(t->term); diff --git a/src/bin/options_video.c b/src/bin/options_video.c index a7eda87b..1bfa2797 100644 --- a/src/bin/options_video.c +++ b/src/bin/options_video.c @@ -10,7 +10,7 @@ static Evas_Object *op_trans, *op_mute, *op_vidmod; static void -_cb_op_video_trans_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_video_trans_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -20,7 +20,7 @@ _cb_op_video_trans_chg(void *data, Evas_Object *obj, void *event __UNUSED__) } static void -_cb_op_video_mute_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_video_mute_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); @@ -30,7 +30,7 @@ _cb_op_video_mute_chg(void *data, Evas_Object *obj, void *event __UNUSED__) } static void -_cb_op_video_vidmod_chg(void *data, Evas_Object *obj, void *event __UNUSED__) +_cb_op_video_vidmod_chg(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *term = data; Config *config = termio_config_get(term); diff --git a/src/bin/options_wallpaper.c b/src/bin/options_wallpaper.c index 89f15836..c2d4e590 100644 --- a/src/bin/options_wallpaper.c +++ b/src/bin/options_wallpaper.c @@ -7,7 +7,7 @@ #include "options_wallpaper.h" void -options_wallpaper(Evas_Object *opbox, Evas_Object *term __UNUSED__) +options_wallpaper(Evas_Object *opbox, Evas_Object *term EINA_UNUSED) { Evas_Object *o; diff --git a/src/bin/sel.c b/src/bin/sel.c index 92e669e2..8365dfca 100644 --- a/src/bin/sel.c +++ b/src/bin/sel.c @@ -55,7 +55,7 @@ static void _smart_calculate(Evas_Object *obj); static void _transit(Evas_Object *obj, double tim); static void -_mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Mouse_Down *ev = event; Sel *sd = evas_object_smart_data_get(data); @@ -69,7 +69,7 @@ _mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void } static void -_mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_mouse_up_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Mouse_Down *ev = event; Sel *sd = evas_object_smart_data_get(data); @@ -112,7 +112,7 @@ _mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void * } static void -_mouse_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Mouse_Move *ev = event; Sel *sd = evas_object_smart_data_get(data); @@ -170,7 +170,7 @@ _autozoom(Evas_Object *obj) } void -_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Key_Down *ev = event; Sel *sd = evas_object_smart_data_get(data); @@ -470,26 +470,26 @@ _label_redo(Entry *en) } static void -_title_cb(void *data, Evas_Object *obj __UNUSED__, void *info __UNUSED__) +_title_cb(void *data, Evas_Object *obj EINA_UNUSED, void *info EINA_UNUSED) { _label_redo(data); } static void -_icon_cb(void *data, Evas_Object *obj __UNUSED__, void *info __UNUSED__) +_icon_cb(void *data, Evas_Object *obj EINA_UNUSED, void *info EINA_UNUSED) { _label_redo(data); } static void -_bell_cb(void *data, Evas_Object *obj __UNUSED__, void *info __UNUSED__) +_bell_cb(void *data, Evas_Object *obj EINA_UNUSED, void *info EINA_UNUSED) { Entry *en = data; edje_object_signal_emit(en->bg, "bell", "terminology"); } static void -_entry_termio_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *info __UNUSED__) +_entry_termio_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *info EINA_UNUSED) { Entry *en = data; if (en->termio) evas_object_event_callback_add @@ -498,7 +498,7 @@ _entry_termio_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__ } static void -_entry_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *info __UNUSED__) +_entry_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *info EINA_UNUSED) { Entry *en = data; if (en->obj) evas_object_event_callback_del_full @@ -597,7 +597,7 @@ _smart_calculate(Evas_Object *obj) } static void -_smart_move(Evas_Object *obj, Evas_Coord x __UNUSED__, Evas_Coord y __UNUSED__) +_smart_move(Evas_Object *obj, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED) { Sel *sd = evas_object_smart_data_get(obj); if (!sd) return; diff --git a/src/bin/termcmd.c b/src/bin/termcmd.c index 8207d739..9505a561 100644 --- a/src/bin/termcmd.c +++ b/src/bin/termcmd.c @@ -11,7 +11,7 @@ #include "termcmd.h" static Eina_Bool -_termcmd_search(Evas_Object *obj __UNUSED__, Evas_Object *win __UNUSED__, Evas_Object *bg __UNUSED__, const char *cmd) +_termcmd_search(Evas_Object *obj EINA_UNUSED, Evas_Object *win EINA_UNUSED, Evas_Object *bg EINA_UNUSED, const char *cmd) { if (cmd[0] == 0) // clear search { @@ -23,7 +23,7 @@ _termcmd_search(Evas_Object *obj __UNUSED__, Evas_Object *win __UNUSED__, Evas_O } static Eina_Bool -_termcmd_font_size(Evas_Object *obj, Evas_Object *win __UNUSED__, Evas_Object *bg __UNUSED__, const char *cmd) +_termcmd_font_size(Evas_Object *obj, Evas_Object *win EINA_UNUSED, Evas_Object *bg EINA_UNUSED, const char *cmd) { Config *config = termio_config_get(obj); @@ -69,7 +69,7 @@ _termcmd_font_size(Evas_Object *obj, Evas_Object *win __UNUSED__, Evas_Object *b } static Eina_Bool -_termcmd_grid_size(Evas_Object *obj, Evas_Object *win __UNUSED__, Evas_Object *bg __UNUSED__, const char *cmd) +_termcmd_grid_size(Evas_Object *obj, Evas_Object *win EINA_UNUSED, Evas_Object *bg EINA_UNUSED, const char *cmd) { int w = -1, h = -1; int r = sscanf(cmd, "%ix%i", &w, &h); @@ -96,7 +96,7 @@ _termcmd_grid_size(Evas_Object *obj, Evas_Object *win __UNUSED__, Evas_Object *b } static Eina_Bool -_termcmd_background(Evas_Object *obj, Evas_Object *win __UNUSED__, Evas_Object *bg __UNUSED__, const char *cmd) +_termcmd_background(Evas_Object *obj, Evas_Object *win EINA_UNUSED, Evas_Object *bg EINA_UNUSED, const char *cmd) { Config *config = termio_config_get(obj); diff --git a/src/bin/termio.c b/src/bin/termio.c index 3dce8ad9..5e43f054 100644 --- a/src/bin/termio.c +++ b/src/bin/termio.c @@ -100,7 +100,7 @@ static Evas_Smart_Class _parent_sc = EVAS_SMART_CLASS_INIT_NULL; static Eina_List *terms = NULL; static void _smart_calculate(Evas_Object *obj); -static void _smart_mirror_del(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *info __UNUSED__); +static void _smart_mirror_del(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *info EINA_UNUSED); static void _lost_selection(void *data, Elm_Sel_Type selection); static inline Eina_Bool @@ -289,7 +289,7 @@ _activate_link(Evas_Object *obj) } static void -_cb_link_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_cb_link_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Mouse_Down *ev = event; Termio *sd = evas_object_smart_data_get(data); @@ -314,7 +314,7 @@ _cb_link_up_delay(void *data) } static void -_cb_link_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_cb_link_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Mouse_Up *ev = event; Termio *sd = evas_object_smart_data_get(data); @@ -356,7 +356,7 @@ _cb_link_drag_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y, Elm } static void -_cb_link_drag_accept(void *data, Evas_Object *obj __UNUSED__, Eina_Bool doaccept) +_cb_link_drag_accept(void *data, Evas_Object *obj EINA_UNUSED, Eina_Bool doaccept) { Termio *sd = evas_object_smart_data_get(data); if (!sd) return; @@ -365,7 +365,7 @@ _cb_link_drag_accept(void *data, Evas_Object *obj __UNUSED__, Eina_Bool doaccept } static void -_cb_link_drag_done(void *data, Evas_Object *obj __UNUSED__) +_cb_link_drag_done(void *data, Evas_Object *obj EINA_UNUSED) { Termio *sd = evas_object_smart_data_get(data); if (!sd) return; @@ -393,7 +393,7 @@ _cb_link_icon_new(void *data, Evas_Object *par, Evas_Coord *xoff, Evas_Coord *yo #endif static void -_cb_link_move(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event) +_cb_link_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event) { Evas_Event_Mouse_Move *ev = event; Termio *sd = evas_object_smart_data_get(data); @@ -605,7 +605,7 @@ _smart_mouseover_delay(void *data) } while (0) static void -_smart_media_clicked(void *data, Evas_Object *obj, void *info __UNUSED__) +_smart_media_clicked(void *data, Evas_Object *obj, void *info EINA_UNUSED) { // Termio *sd = evas_object_smart_data_get(data); Termblock *blk; @@ -648,7 +648,7 @@ _smart_media_clicked(void *data, Evas_Object *obj, void *info __UNUSED__) } static void -_smart_media_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *info __UNUSED__) +_smart_media_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *info EINA_UNUSED) { Termblock *blk = data; @@ -662,7 +662,7 @@ _smart_media_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *info __ } static void -_block_edje_signal_cb(void *data, Evas_Object *obj __UNUSED__, const char *sig, const char *src) +_block_edje_signal_cb(void *data, Evas_Object *obj EINA_UNUSED, const char *sig, const char *src) { Termblock *blk = data; Termio *sd = evas_object_smart_data_get(blk->pty->obj); @@ -705,7 +705,7 @@ _block_edje_signal_cb(void *data, Evas_Object *obj __UNUSED__, const char *sig, } static void -_block_edje_message_cb(void *data, Evas_Object *obj __UNUSED__, Edje_Message_Type type, int id, void *msg) +_block_edje_message_cb(void *data, Evas_Object *obj EINA_UNUSED, Edje_Message_Type type, int id, void *msg) { Termblock *blk = data; Termio *sd = evas_object_smart_data_get(blk->pty->obj); @@ -1737,7 +1737,7 @@ _take_selection(Evas_Object *obj, Elm_Sel_Type type) } static Eina_Bool -_getsel_cb(void *data, Evas_Object *obj __UNUSED__, Elm_Selection_Data *ev) +_getsel_cb(void *data, Evas_Object *obj EINA_UNUSED, Elm_Selection_Data *ev) { Termio *sd = evas_object_smart_data_get(data); if (!sd) return EINA_FALSE; @@ -1825,7 +1825,7 @@ termio_grid_size_set(Evas_Object *obj, int w, int h) } static void -_smart_cb_key_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_smart_cb_key_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Key_Up *ev = event; Termio *sd; @@ -1935,8 +1935,8 @@ _handle_shift(Evas_Event_Key_Down *ev, int by, Evas_Object *term, Termio *sd) } static void -_smart_cb_key_down(void *data, Evas *e __UNUSED__, - Evas_Object *obj __UNUSED__, void *event) +_smart_cb_key_down(void *data, Evas *e EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Key_Down *ev = event; Termio *sd; @@ -2182,8 +2182,8 @@ _imf_cursor_set(Termio *sd) } static void -_smart_cb_focus_in(void *data, Evas *e __UNUSED__, - Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_smart_cb_focus_in(void *data, Evas *e EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Termio *sd; @@ -2205,8 +2205,8 @@ _smart_cb_focus_in(void *data, Evas *e __UNUSED__, } static void -_smart_cb_focus_out(void *data, Evas *e __UNUSED__, Evas_Object *obj, - void *event __UNUSED__) +_smart_cb_focus_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, + void *event EINA_UNUSED) { Termio *sd; @@ -2248,7 +2248,7 @@ _smart_xy_to_cursor(Evas_Object *obj, Evas_Coord x, Evas_Coord y, int *cx, int * } static void -_sel_line(Evas_Object *obj, int cx __UNUSED__, int cy) +_sel_line(Evas_Object *obj, int cx EINA_UNUSED, int cy) { int y, w = 0; Termio *sd = evas_object_smart_data_get(obj); @@ -2669,7 +2669,7 @@ _rep_mouse_up(Termio *sd, Evas_Event_Mouse_Up *ev, int cx, int cy) } static Eina_Bool -_rep_mouse_move(Termio *sd, Evas_Event_Mouse_Move *ev, int cx __UNUSED__, int cy __UNUSED__, Eina_Bool change) +_rep_mouse_move(Termio *sd, Evas_Event_Mouse_Move *ev, int cx EINA_UNUSED, int cy EINA_UNUSED, Eina_Bool change) { char buf[64]; Eina_Bool ret = EINA_FALSE; @@ -2876,8 +2876,8 @@ _smart_cb_mouse_move_job(void *data) } static void -_edje_cb_bottom_right_in(void *data, Evas_Object *obj __UNUSED__, - const char *emission __UNUSED__, const char *source __UNUSED__) +_edje_cb_bottom_right_in(void *data, Evas_Object *obj EINA_UNUSED, + const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Termio *sd = data; @@ -2885,8 +2885,8 @@ _edje_cb_bottom_right_in(void *data, Evas_Object *obj __UNUSED__, } static void -_edje_cb_top_left_in(void *data, Evas_Object *obj __UNUSED__, - const char *emission __UNUSED__, const char *source __UNUSED__) +_edje_cb_top_left_in(void *data, Evas_Object *obj EINA_UNUSED, + const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Termio *sd = data; @@ -2894,8 +2894,8 @@ _edje_cb_top_left_in(void *data, Evas_Object *obj __UNUSED__, } static void -_edje_cb_bottom_right_out(void *data, Evas_Object *obj __UNUSED__, - const char *emission __UNUSED__, const char *source __UNUSED__) +_edje_cb_bottom_right_out(void *data, Evas_Object *obj EINA_UNUSED, + const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Termio *sd = data; @@ -2903,8 +2903,8 @@ _edje_cb_bottom_right_out(void *data, Evas_Object *obj __UNUSED__, } static void -_edje_cb_top_left_out(void *data, Evas_Object *obj __UNUSED__, - const char *emission __UNUSED__, const char *source __UNUSED__) +_edje_cb_top_left_out(void *data, Evas_Object *obj EINA_UNUSED, + const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Termio *sd = data; @@ -2912,7 +2912,7 @@ _edje_cb_top_left_out(void *data, Evas_Object *obj __UNUSED__, } static void -_smart_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_smart_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Mouse_Down *ev = event; Termio *sd; @@ -3035,7 +3035,7 @@ _smart_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__ } static void -_smart_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_smart_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Mouse_Up *ev = event; Termio *sd; @@ -3083,7 +3083,7 @@ _smart_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, } static void -_smart_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_smart_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Mouse_Move *ev = event; Termio *sd; @@ -3137,7 +3137,7 @@ _smart_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__ } static void -_smart_cb_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_smart_cb_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { int cx, cy; Evas_Event_Mouse_In *ev = event; @@ -3151,8 +3151,8 @@ _smart_cb_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, } static void -_smart_cb_mouse_out(void *data, Evas *e __UNUSED__, Evas_Object *obj, - void *event __UNUSED__) +_smart_cb_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, + void *event EINA_UNUSED) { Termio *sd; @@ -3166,7 +3166,7 @@ _smart_cb_mouse_out(void *data, Evas *e __UNUSED__, Evas_Object *obj, } static void -_smart_cb_mouse_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_smart_cb_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Mouse_Wheel *ev = event; Termio *sd; @@ -3262,7 +3262,7 @@ _smart_cb_mouse_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_ } static void -_win_obj_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event __UNUSED__) +_win_obj_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) { Termio *sd; @@ -3319,7 +3319,7 @@ _termio_config_set(Evas_Object *obj, Config *config) } static void -_cursor_cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cursor_cb_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Termio *sd; @@ -3329,7 +3329,7 @@ _cursor_cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi } static Evas_Event_Flags -_smart_cb_gest_long_move(void *data, void *event __UNUSED__) +_smart_cb_gest_long_move(void *data, void *event EINA_UNUSED) { // Elm_Gesture_Taps_Info *p = event; Termio *sd = evas_object_smart_data_get(data); @@ -3397,7 +3397,7 @@ _smart_cb_gest_zoom_end(void *data, void *event) } static Evas_Event_Flags -_smart_cb_gest_zoom_abort(void *data, void *event __UNUSED__) +_smart_cb_gest_zoom_abort(void *data, void *event EINA_UNUSED) { // Elm_Gesture_Zoom_Info *p = event; Termio *sd = evas_object_smart_data_get(data); @@ -3414,7 +3414,7 @@ _smart_cb_gest_zoom_abort(void *data, void *event __UNUSED__) } static void -_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx __UNUSED__, void *event) +_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event) { Termio *sd = data; char *str = event; @@ -3658,7 +3658,7 @@ _smart_calculate(Evas_Object *obj) } static void -_smart_move(Evas_Object *obj, Evas_Coord x __UNUSED__, Evas_Coord y __UNUSED__) +_smart_move(Evas_Object *obj, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED) { Termio *sd = evas_object_smart_data_get(obj); if (!sd) return; @@ -4026,25 +4026,25 @@ _smart_pty_command(void *data) #if !((ELM_VERSION_MAJOR == 1) && (ELM_VERSION_MINOR < 8)) static void -_smart_cb_drag_enter(void *data __UNUSED__, Evas_Object *o __UNUSED__) +_smart_cb_drag_enter(void *data EINA_UNUSED, Evas_Object *o EINA_UNUSED) { printf("dnd enter\n"); } static void -_smart_cb_drag_leave(void *data __UNUSED__, Evas_Object *o __UNUSED__) +_smart_cb_drag_leave(void *data EINA_UNUSED, Evas_Object *o EINA_UNUSED) { printf("dnd leave\n"); } static void -_smart_cb_drag_pos(void *data __UNUSED__, Evas_Object *o __UNUSED__, Evas_Coord x, Evas_Coord y, Elm_Xdnd_Action action) +_smart_cb_drag_pos(void *data EINA_UNUSED, Evas_Object *o EINA_UNUSED, Evas_Coord x, Evas_Coord y, Elm_Xdnd_Action action) { printf("dnd at %i %i act:%i\n", x, y, action); } static Eina_Bool -_smart_cb_drop(void *data, Evas_Object *o __UNUSED__, Elm_Selection_Data *ev) +_smart_cb_drop(void *data, Evas_Object *o EINA_UNUSED, Elm_Selection_Data *ev) { Evas_Object *obj = data; Termio *sd = evas_object_smart_data_get(obj); @@ -4522,7 +4522,7 @@ termio_win_get(Evas_Object *obj) static void -_smart_mirror_del(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *info __UNUSED__) +_smart_mirror_del(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *info EINA_UNUSED) { Termio *sd = evas_object_smart_data_get(data); if (!sd) return; diff --git a/src/bin/termiolink.c b/src/bin/termiolink.c index a36ea280..bd2433fe 100644 --- a/src/bin/termiolink.c +++ b/src/bin/termiolink.c @@ -4,7 +4,7 @@ #include "utils.h" static Eina_Bool -coord_back(int *x, int *y, int w, int h __UNUSED__) +coord_back(int *x, int *y, int w, int h EINA_UNUSED) { (*x)--; if ((*x) < 0) @@ -50,7 +50,7 @@ _cwd_path_get(const Evas_Object *obj, const char *relpath) } static char * -_home_path_get(const Evas_Object *obj __UNUSED__, const char *relpath) +_home_path_get(const Evas_Object *obj EINA_UNUSED, const char *relpath) { char tmppath[PATH_MAX], homepath[PATH_MAX]; diff --git a/src/bin/termpty.c b/src/bin/termpty.c index efed38b5..ab1f5482 100644 --- a/src/bin/termpty.c +++ b/src/bin/termpty.c @@ -145,7 +145,7 @@ _pty_size(Termpty *ty) } static Eina_Bool -_cb_exe_exit(void *data, int type __UNUSED__, void *event) +_cb_exe_exit(void *data, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Del *ev = event; Termpty *ty = data; @@ -170,7 +170,7 @@ _cb_exe_exit(void *data, int type __UNUSED__, void *event) } static Eina_Bool -_cb_fd_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__) +_cb_fd_read(void *data, Ecore_Fd_Handler *fd_handler EINA_UNUSED) { Termpty *ty = data; char buf[4097]; @@ -481,13 +481,13 @@ termpty_free(Termpty *ty) } void -termpty_cellcomp_freeze(Termpty *ty __UNUSED__) +termpty_cellcomp_freeze(Termpty *ty EINA_UNUSED) { termpty_save_freeze(); } void -termpty_cellcomp_thaw(Termpty *ty __UNUSED__) +termpty_cellcomp_thaw(Termpty *ty EINA_UNUSED) { termpty_save_thaw(); } @@ -1407,7 +1407,7 @@ termpty_cell_copy(Termpty *ty, Termcell *src, Termcell *dst, int n) } void -termpty_cell_swap(Termpty *ty __UNUSED__, Termcell *src, Termcell *dst, int n) +termpty_cell_swap(Termpty *ty EINA_UNUSED, Termcell *src, Termcell *dst, int n) { int i; Termcell t; diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c index 1398acda..7ab7e451 100644 --- a/src/bin/termptyesc.c +++ b/src/bin/termptyesc.c @@ -1134,7 +1134,7 @@ _handle_esc_terminology(Termpty *ty, const Eina_Unicode *c, const Eina_Unicode * } static int -_handle_esc_dcs(Termpty *ty __UNUSED__, const Eina_Unicode *c, const Eina_Unicode *ce) +_handle_esc_dcs(Termpty *ty EINA_UNUSED, const Eina_Unicode *c, const Eina_Unicode *ce) { const Eina_Unicode *cc, *be; Eina_Unicode buf[4096], *b; diff --git a/src/bin/termptyext.c b/src/bin/termptyext.c index aef259aa..82f8b7bc 100644 --- a/src/bin/termptyext.c +++ b/src/bin/termptyext.c @@ -32,7 +32,7 @@ // and 'BLAHBLAH' is an optional data payload string static Eina_Bool -_handle_op_a(Termpty *ty __UNUSED__, const char *txt, Eina_Unicode *utxt __UNUSED__) +_handle_op_a(Termpty *ty EINA_UNUSED, const char *txt, Eina_Unicode *utxt EINA_UNUSED) { switch (txt[1]) { diff --git a/src/bin/termptysave.c b/src/bin/termptysave.c index 04c2e704..75f032f8 100644 --- a/src/bin/termptysave.c +++ b/src/bin/termptysave.c @@ -262,7 +262,7 @@ _walk_pty(Termpty *ty) } static Eina_Bool -_idler(void *data __UNUSED__) +_idler(void *data EINA_UNUSED) { Eina_List *l; Termpty *ty; @@ -290,7 +290,7 @@ _idler(void *data __UNUSED__) } static Eina_Bool -_timer(void *data __UNUSED__) +_timer(void *data EINA_UNUSED) { if (!idler) idler = ecore_idler_add(_idler, NULL); timer = NULL; diff --git a/src/bin/utils.c b/src/bin/utils.c index 316c0f73..027254e9 100644 --- a/src/bin/utils.c +++ b/src/bin/utils.c @@ -41,7 +41,7 @@ theme_reload(Evas_Object *edje) } static void -theme_reload_cb(void *data __UNUSED__, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__) +theme_reload_cb(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { theme_reload(obj); }