diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-03-18 18:09:09 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-03-18 18:09:09 -0400 |
| commit | 471dcb24cb9964a3f25dd98628176533f4ba3751 (patch) | |
| tree | 2b7c631586578b2cf44079c19919bf75923eb660 | |
| parent | aefab90d52bc075d5cf5b576340d94e05139691f (diff) | |
| download | enlightenment-471dcb24cb9964a3f25dd98628176533f4ba3751.tar.gz | |
__UNUSED__ -> EINA_UNUSED
this has been bugging me forever. __UNUSED__ is no longer a valid macro here.
351 files changed, 2705 insertions, 2753 deletions
diff --git a/configure.ac b/configure.ac index c56e2e4832..580e4492b9 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,6 @@ AC_C_BIGENDIAN AC_PROG_CC_C99 AM_PROG_CC_C_O AC_FUNC_ALLOCA -AC_C___ATTRIBUTE__ LT_INIT([disable-static]) diff --git a/m4/ac_attribute.m4 b/m4/ac_attribute.m4 deleted file mode 100644 index 23479a92ac..0000000000 --- a/m4/ac_attribute.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl Copyright (C) 2004-2008 Kim Woelders -dnl Copyright (C) 2008 Vincent Torri <vtorri at univ-evry dot fr> -dnl That code is public domain and can be freely used or copied. -dnl Originally snatched from somewhere... - -dnl Macro for checking if the compiler supports __attribute__ - -dnl Usage: AC_C___ATTRIBUTE__ -dnl call AC_DEFINE for HAVE___ATTRIBUTE__ and __UNUSED__ -dnl if the compiler supports __attribute__, HAVE___ATTRIBUTE__ is -dnl defined to 1 and __UNUSED__ is defined to __attribute__((unused)) -dnl otherwise, HAVE___ATTRIBUTE__ is not defined and __UNUSED__ is -dnl defined to nothing. - -AC_DEFUN([AC_C___ATTRIBUTE__], -[ - -AC_MSG_CHECKING([for __attribute__]) - -AC_CACHE_VAL([ac_cv___attribute__], - [AC_TRY_COMPILE( - [ -#include <stdlib.h> - -int func(int x); -int foo(int x __attribute__ ((unused))) -{ - exit(1); -} - ], - [], - [ac_cv___attribute__="yes"], - [ac_cv___attribute__="no"] - )]) - -AC_MSG_RESULT($ac_cv___attribute__) - -if test "x${ac_cv___attribute__}" = "xyes" ; then - AC_DEFINE([HAVE___ATTRIBUTE__], [1], [Define to 1 if your compiler has __attribute__]) - AC_DEFINE([__UNUSED__], [__attribute__((unused))], [Macro declaring a function argument to be unused]) - else - AC_DEFINE([__UNUSED__], [], [Macro declaring a function argument to be unused]) -fi - -]) - -dnl End of ac_attribute.m4 diff --git a/src/bin/e_acpi.c b/src/bin/e_acpi.c index dc67a39f42..09379bca35 100644 --- a/src/bin/e_acpi.c +++ b/src/bin/e_acpi.c @@ -42,11 +42,11 @@ struct _E_ACPI_Device_Multiplexed }; /* local function prototypes */ -static Eina_Bool _e_acpi_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event); -static void _e_acpi_cb_event_free(void *data __UNUSED__, void *event); +static Eina_Bool _e_acpi_cb_server_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_acpi_cb_server_data(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static void _e_acpi_cb_event_free(void *data EINA_UNUSED, void *event); static int _e_acpi_lid_status_get(const char *device, const char *bus); -static Eina_Bool _e_acpi_cb_event(void *data __UNUSED__, int type __UNUSED__, void *event); +static Eina_Bool _e_acpi_cb_event(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); /* local variables */ static int _e_acpi_events_frozen = 0; @@ -206,7 +206,7 @@ e_acpi_events_thaw(void) /* local functions */ static Eina_Bool -_e_acpi_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_acpi_cb_server_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Con_Event_Server_Del *ev; Ecore_Event_Handler *hdl; @@ -228,7 +228,7 @@ _e_acpi_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_acpi_cb_server_data(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Con_Event_Server_Data *ev; E_Event_Acpi *acpi_event; @@ -366,7 +366,7 @@ done_event: } static void -_e_acpi_cb_event_free(void *data __UNUSED__, void *event) +_e_acpi_cb_event_free(void *data EINA_UNUSED, void *event) { E_Event_Acpi *ev; @@ -437,7 +437,7 @@ _e_acpi_lid_status_get(const char *device, const char *bus) } static Eina_Bool -_e_acpi_cb_event(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_acpi_cb_event(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Acpi *ev; diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index 2da334fb70..67d905ad12 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -7,7 +7,7 @@ if (act) act->func.go = _e_actions_act_##name##_go; \ } #define ACT_FN_GO(act, use) \ - static void _e_actions_act_##act##_go(E_Object * obj __UNUSED__, const char *params use) + static void _e_actions_act_##act##_go(E_Object * obj EINA_UNUSED, const char *params use) #define ACT_GO_MOUSE(name) \ { \ @@ -15,7 +15,7 @@ if (act) act->func.go_mouse = _e_actions_act_##name##_go_mouse; \ } #define ACT_FN_GO_MOUSE(act, use) \ - static void _e_actions_act_##act##_go_mouse(E_Object * obj __UNUSED__, const char *params use, E_Binding_Event_Mouse_Button * ev __UNUSED__) + static void _e_actions_act_##act##_go_mouse(E_Object * obj EINA_UNUSED, const char *params use, E_Binding_Event_Mouse_Button * ev EINA_UNUSED) #define ACT_GO_WHEEL(name) \ { \ @@ -23,7 +23,7 @@ if (act) act->func.go_wheel = _e_actions_act_##name##_go_wheel; \ } #define ACT_FN_GO_WHEEL(act, use) \ - static void _e_actions_act_##act##_go_wheel(E_Object * obj __UNUSED__, const char *params use, E_Binding_Event_Wheel * ev __UNUSED__) + static void _e_actions_act_##act##_go_wheel(E_Object * obj EINA_UNUSED, const char *params use, E_Binding_Event_Wheel * ev EINA_UNUSED) #define ACT_GO_EDGE(name) \ { \ @@ -31,7 +31,7 @@ if (act) act->func.go_edge = _e_actions_act_##name##_go_edge; \ } #define ACT_FN_GO_EDGE(act, use) \ - static void _e_actions_act_##act##_go_edge(E_Object * obj __UNUSED__, const char *params use, E_Event_Zone_Edge * ev __UNUSED__) + static void _e_actions_act_##act##_go_edge(E_Object * obj EINA_UNUSED, const char *params use, E_Event_Zone_Edge * ev EINA_UNUSED) #define ACT_GO_SIGNAL(name) \ { \ @@ -39,7 +39,7 @@ if (act) act->func.go_signal = _e_actions_act_##name##_go_signal; \ } #define ACT_FN_GO_SIGNAL(act, use) \ - static void _e_actions_act_##act##_go_signal(E_Object * obj __UNUSED__, const char *params use, const char *sig, const char *src) + static void _e_actions_act_##act##_go_signal(E_Object * obj EINA_UNUSED, const char *params use, const char *sig, const char *src) #define ACT_GO_KEY(name) \ { \ @@ -47,7 +47,7 @@ if (act) act->func.go_key = _e_actions_act_##name##_go_key; \ } #define ACT_FN_GO_KEY(act, use1, use2) \ - static void _e_actions_act_##act##_go_key(E_Object * obj __UNUSED__, const char *params use1, Ecore_Event_Key * ev use2) + static void _e_actions_act_##act##_go_key(E_Object * obj EINA_UNUSED, const char *params use1, Ecore_Event_Key * ev use2) #define ACT_END(name) \ { \ @@ -55,7 +55,7 @@ if (act) act->func.end = _e_actions_act_##name##_end; \ } #define ACT_FN_END(act, use) \ - static void _e_actions_act_##act##_end(E_Object * obj __UNUSED__, const char *params use) + static void _e_actions_act_##act##_end(E_Object * obj EINA_UNUSED, const char *params use) #define ACT_END_MOUSE(name) \ { \ @@ -63,7 +63,7 @@ if (act) act->func.end_mouse = _e_actions_act_##name##_end_mouse; \ } #define ACT_FN_END_MOUSE(act, use) \ - static void _e_actions_act_##act##_end_mouse(E_Object * obj __UNUSED__, const char *params use, E_Binding_Event_Mouse_Button * ev __UNUSED__) + static void _e_actions_act_##act##_end_mouse(E_Object * obj EINA_UNUSED, const char *params use, E_Binding_Event_Mouse_Button * ev EINA_UNUSED) #define ACT_END_KEY(name) \ { \ @@ -71,7 +71,7 @@ if (act) act->func.end_key = _e_actions_act_##name##_end_key; \ } #define ACT_FN_END_KEY(act, use) \ - static void _e_actions_act_##act##_end_key(E_Object * obj __UNUSED__, const char *params use, Ecore_Event_Key * ev __UNUSED__) + static void _e_actions_act_##act##_end_key(E_Object * obj EINA_UNUSED, const char *params use, Ecore_Event_Key * ev EINA_UNUSED) #define ACT_GO_ACPI(name) \ { \ @@ -79,7 +79,7 @@ if (act) act->func.go_acpi = _e_actions_act_##name##_go_acpi; \ } #define ACT_FN_GO_ACPI(act, use) \ - static void _e_actions_act_##act##_go_acpi(E_Object * obj __UNUSED__, const char *params use, E_Event_Acpi * ev __UNUSED__) + static void _e_actions_act_##act##_go_acpi(E_Object * obj EINA_UNUSED, const char *params use, E_Event_Acpi * ev EINA_UNUSED) /* local functions forward declarations (window_jump_to needs the definition of exec) */ ACT_FN_GO(exec, ); @@ -91,7 +91,7 @@ static int _action_groups_sort_cb(const void *d1, const void *d2); /* to save writing this in N places - the sections are defined here */ /***************************************************************************/ -ACT_FN_GO(window_move, __UNUSED__) +ACT_FN_GO(window_move, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -100,7 +100,7 @@ ACT_FN_GO(window_move, __UNUSED__) e_client_act_move_begin((E_Client *)obj, NULL); } -ACT_FN_GO_MOUSE(window_move, __UNUSED__) +ACT_FN_GO_MOUSE(window_move, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -125,7 +125,7 @@ ACT_FN_GO_SIGNAL(window_move, ) } } -ACT_FN_END(window_move, __UNUSED__) +ACT_FN_END(window_move, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -133,7 +133,7 @@ ACT_FN_END(window_move, __UNUSED__) e_client_act_move_end((E_Client *)obj, NULL); } -ACT_FN_END_MOUSE(window_move, __UNUSED__) +ACT_FN_END_MOUSE(window_move, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -141,7 +141,7 @@ ACT_FN_END_MOUSE(window_move, __UNUSED__) e_client_act_move_end((E_Client *)obj, ev); } -ACT_FN_GO_KEY(window_move, __UNUSED__, __UNUSED__) +ACT_FN_GO_KEY(window_move, EINA_UNUSED, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -155,7 +155,7 @@ ACT_FN_GO_KEY(window_move, __UNUSED__, __UNUSED__) } /***************************************************************************/ -ACT_FN_GO(window_resize, __UNUSED__) +ACT_FN_GO(window_resize, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -164,7 +164,7 @@ ACT_FN_GO(window_resize, __UNUSED__) e_client_act_resize_begin((E_Client *)obj, NULL); } -ACT_FN_GO_MOUSE(window_resize, __UNUSED__) +ACT_FN_GO_MOUSE(window_resize, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -193,7 +193,7 @@ ACT_FN_GO_SIGNAL(window_resize, ) } } -ACT_FN_END(window_resize, __UNUSED__) +ACT_FN_END(window_resize, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -201,7 +201,7 @@ ACT_FN_END(window_resize, __UNUSED__) e_client_act_resize_end((E_Client *)obj, NULL); } -ACT_FN_END_MOUSE(window_resize, __UNUSED__) +ACT_FN_END_MOUSE(window_resize, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -209,7 +209,7 @@ ACT_FN_END_MOUSE(window_resize, __UNUSED__) e_client_act_resize_end((E_Client *)obj, ev); } -ACT_FN_GO_KEY(window_resize, __UNUSED__, __UNUSED__) +ACT_FN_GO_KEY(window_resize, EINA_UNUSED, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -223,7 +223,7 @@ ACT_FN_GO_KEY(window_resize, __UNUSED__, __UNUSED__) } /***************************************************************************/ -ACT_FN_GO(window_menu, __UNUSED__) +ACT_FN_GO(window_menu, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -235,7 +235,7 @@ ACT_FN_GO(window_menu, __UNUSED__) e_client_act_menu_begin((E_Client *)obj, NULL, 0); } -ACT_FN_GO_MOUSE(window_menu, __UNUSED__) +ACT_FN_GO_MOUSE(window_menu, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -247,7 +247,7 @@ ACT_FN_GO_MOUSE(window_menu, __UNUSED__) e_client_act_menu_begin((E_Client *)obj, ev, 0); } -ACT_FN_GO_KEY(window_menu, __UNUSED__, __UNUSED__) +ACT_FN_GO_KEY(window_menu, EINA_UNUSED, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -260,7 +260,7 @@ ACT_FN_GO_KEY(window_menu, __UNUSED__, __UNUSED__) } /***************************************************************************/ -ACT_FN_GO(window_raise, __UNUSED__) +ACT_FN_GO(window_raise, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -274,7 +274,7 @@ ACT_FN_GO(window_raise, __UNUSED__) } /***************************************************************************/ -ACT_FN_GO(window_lower, __UNUSED__) +ACT_FN_GO(window_lower, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -288,7 +288,7 @@ ACT_FN_GO(window_lower, __UNUSED__) } /***************************************************************************/ -ACT_FN_GO(window_close, __UNUSED__) +ACT_FN_GO(window_close, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -320,7 +320,7 @@ _e_actions_cb_kill_dialog_ok(void *data, E_Dialog *dia) } static void -_e_actions_cb_kill_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED__) +_e_actions_cb_kill_dialog_cancel(void *data EINA_UNUSED, E_Dialog *dia EINA_UNUSED) { e_object_del(E_OBJECT(kill_dialog)); kill_dialog = NULL; @@ -332,7 +332,7 @@ _e_actions_cb_kill_dialog_delete(void *data, Evas *e EINA_UNUSED, Evas_Object *o _e_actions_cb_kill_dialog_cancel(NULL, data); } -ACT_FN_GO(window_kill, __UNUSED__) +ACT_FN_GO(window_kill, EINA_UNUSED) { E_Client *ec; char dialog_text[1024]; @@ -377,7 +377,7 @@ ACT_FN_GO(window_kill, __UNUSED__) } /***************************************************************************/ -ACT_FN_GO(window_sticky_toggle, __UNUSED__) +ACT_FN_GO(window_sticky_toggle, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -422,7 +422,7 @@ ACT_FN_GO(window_sticky, ) } /***************************************************************************/ -ACT_FN_GO(window_iconic_toggle, __UNUSED__) +ACT_FN_GO(window_iconic_toggle, EINA_UNUSED) { E_Client *ec; @@ -767,7 +767,7 @@ ACT_FN_GO(window_shaded, ) } /***************************************************************************/ -ACT_FN_GO(window_borderless_toggle, __UNUSED__) +ACT_FN_GO(window_borderless_toggle, EINA_UNUSED) { if ((!obj) || (obj->type != E_CLIENT_TYPE)) obj = E_OBJECT(e_client_focused_get()); @@ -785,7 +785,7 @@ ACT_FN_GO(window_borderless_toggle, __UNUSED__) } /***************************************************************************/ -ACT_FN_GO(window_border_set, __UNUSED__) +ACT_FN_GO(window_border_set, EINA_UNUSED) { if ((!obj) || (obj->type != E_CLIENT_TYPE)) obj = E_OBJECT(e_client_focused_get()); @@ -805,7 +805,7 @@ ACT_FN_GO(window_border_set, __UNUSED__) } /***************************************************************************/ -ACT_FN_GO(window_border_cycle, __UNUSED__) +ACT_FN_GO(window_border_cycle, EINA_UNUSED) { if ((!obj) || (obj->type != E_CLIENT_TYPE)) obj = E_OBJECT(e_client_focused_get()); @@ -863,7 +863,7 @@ ACT_FN_GO(window_border_cycle, __UNUSED__) } /***************************************************************************/ -ACT_FN_GO(window_pinned_toggle, __UNUSED__) +ACT_FN_GO(window_pinned_toggle, EINA_UNUSED) { if ((!obj) || (obj->type != E_CLIENT_TYPE)) obj = E_OBJECT(e_client_focused_get()); @@ -960,7 +960,7 @@ ACT_FN_GO(window_move_to, ) } /***************************************************************************/ -ACT_FN_GO(window_move_to_center, __UNUSED__) +ACT_FN_GO(window_move_to_center, EINA_UNUSED) { E_Client *ec; @@ -1194,7 +1194,7 @@ ACT_FN_GO(window_jump_to_or_start, ) } /***************************************************************************/ -ACT_FN_GO(window_drag_icon, __UNUSED__) +ACT_FN_GO(window_drag_icon, EINA_UNUSED) { if (!obj) obj = E_OBJECT(e_client_focused_get()); if (!obj) return; @@ -1403,7 +1403,7 @@ ACT_FN_GO(desk_flip_to, ) } /***************************************************************************/ -ACT_FN_GO(desk_flip_prev, __UNUSED__) +ACT_FN_GO(desk_flip_prev, EINA_UNUSED) { E_Zone *zone; @@ -1799,7 +1799,7 @@ ACT_FN_GO(zone_desk_linear_flip_to, ) /***************************************************************************/ static void -_e_actions_cb_menu_end(void *data __UNUSED__, E_Menu *m) +_e_actions_cb_menu_end(void *data EINA_UNUSED, E_Menu *m) { e_object_del(E_OBJECT(m)); } @@ -1883,7 +1883,7 @@ ACT_FN_GO_MOUSE(menu_show, ) } } -ACT_FN_GO_KEY(menu_show, , __UNUSED__) +ACT_FN_GO_KEY(menu_show, , EINA_UNUSED) { E_Zone *zone; @@ -2001,7 +2001,7 @@ ACT_FN_GO(app, ) } /***************************************************************************/ -ACT_FN_GO(app_new_instance, __UNUSED__) +ACT_FN_GO(app_new_instance, EINA_UNUSED) { E_Client *ec; E_Zone *zone; @@ -2024,7 +2024,7 @@ ACT_FN_GO(app_new_instance, __UNUSED__) } /***************************************************************************/ -ACT_FN_GO(desk_deskshow_toggle, __UNUSED__) +ACT_FN_GO(desk_deskshow_toggle, EINA_UNUSED) { E_Zone *zone; @@ -2033,7 +2033,7 @@ ACT_FN_GO(desk_deskshow_toggle, __UNUSED__) if (zone) e_desk_deskshow(zone); } -ACT_FN_GO(cleanup_windows, __UNUSED__) +ACT_FN_GO(cleanup_windows, EINA_UNUSED) { E_Zone *zone; @@ -2046,7 +2046,7 @@ ACT_FN_GO(cleanup_windows, __UNUSED__) static E_Dialog *exit_dialog = NULL; static void -_e_actions_cb_exit_dialog_ok(void *data __UNUSED__, E_Dialog *dia) +_e_actions_cb_exit_dialog_ok(void *data EINA_UNUSED, E_Dialog *dia) { if (dia) { @@ -2057,7 +2057,7 @@ _e_actions_cb_exit_dialog_ok(void *data __UNUSED__, E_Dialog *dia) } static void -_e_actions_cb_exit_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED__) +_e_actions_cb_exit_dialog_cancel(void *data EINA_UNUSED, E_Dialog *dia EINA_UNUSED) { e_object_del(E_OBJECT(exit_dialog)); exit_dialog = NULL; @@ -2100,25 +2100,25 @@ ACT_FN_GO(exit, ) } /***************************************************************************/ -ACT_FN_GO(restart, __UNUSED__) +ACT_FN_GO(restart, EINA_UNUSED) { e_sys_action_do(E_SYS_RESTART, NULL); } /***************************************************************************/ -ACT_FN_GO(exit_now, __UNUSED__) +ACT_FN_GO(exit_now, EINA_UNUSED) { e_sys_action_do(E_SYS_EXIT_NOW, NULL); } /***************************************************************************/ -ACT_FN_GO(halt_now, __UNUSED__) +ACT_FN_GO(halt_now, EINA_UNUSED) { e_sys_action_do(E_SYS_HALT_NOW, NULL); } /***************************************************************************/ -ACT_FN_GO(mode_presentation_toggle, __UNUSED__) +ACT_FN_GO(mode_presentation_toggle, EINA_UNUSED) { e_config->mode.presentation = !e_config->mode.presentation; e_config_mode_changed(); @@ -2126,7 +2126,7 @@ ACT_FN_GO(mode_presentation_toggle, __UNUSED__) } /***************************************************************************/ -ACT_FN_GO(mode_offline_toggle, __UNUSED__) +ACT_FN_GO(mode_offline_toggle, EINA_UNUSED) { e_config->mode.offline = !e_config->mode.offline; e_config_mode_changed(); @@ -2137,7 +2137,7 @@ ACT_FN_GO(mode_offline_toggle, __UNUSED__) static E_Dialog *logout_dialog = NULL; static void -_e_actions_cb_logout_dialog_ok(void *data __UNUSED__, E_Dialog *dia) +_e_actions_cb_logout_dialog_ok(void *data EINA_UNUSED, E_Dialog *dia) { if (dia) { @@ -2148,7 +2148,7 @@ _e_actions_cb_logout_dialog_ok(void *data __UNUSED__, E_Dialog *dia) } static void -_e_actions_cb_logout_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED__) +_e_actions_cb_logout_dialog_cancel(void *data EINA_UNUSED, E_Dialog *dia EINA_UNUSED) { e_object_del(E_OBJECT(logout_dialog)); logout_dialog = NULL; @@ -2194,7 +2194,7 @@ ACT_FN_GO(logout, ) static E_Dialog *halt_dialog = NULL; static void -_e_actions_cb_halt_dialog_ok(void *data __UNUSED__, E_Dialog *dia) +_e_actions_cb_halt_dialog_ok(void *data EINA_UNUSED, E_Dialog *dia) { if (dia) { @@ -2205,7 +2205,7 @@ _e_actions_cb_halt_dialog_ok(void *data __UNUSED__, E_Dialog *dia) } static void -_e_actions_cb_halt_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED__) +_e_actions_cb_halt_dialog_cancel(void *data EINA_UNUSED, E_Dialog *dia EINA_UNUSED) { e_object_del(E_OBJECT(halt_dialog)); halt_dialog = NULL; @@ -2254,7 +2254,7 @@ ACT_FN_GO(halt, ) static E_Dialog *reboot_dialog = NULL; static void -_e_actions_cb_reboot_dialog_ok(void *data __UNUSED__, E_Dialog *dia) +_e_actions_cb_reboot_dialog_ok(void *data EINA_UNUSED, E_Dialog *dia) { if (dia) { @@ -2265,7 +2265,7 @@ _e_actions_cb_reboot_dialog_ok(void *data __UNUSED__, E_Dialog *dia) } static void -_e_actions_cb_reboot_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED__) +_e_actions_cb_reboot_dialog_cancel(void *data EINA_UNUSED, E_Dialog *dia EINA_UNUSED) { e_object_del(E_OBJECT(reboot_dialog)); reboot_dialog = NULL; @@ -2311,7 +2311,7 @@ ACT_FN_GO(reboot, ) static E_Dialog *suspend_dialog = NULL; static void -_e_actions_cb_suspend_dialog_ok(void *data __UNUSED__, E_Dialog *dia) +_e_actions_cb_suspend_dialog_ok(void *data EINA_UNUSED, E_Dialog *dia) { if (dia) { @@ -2322,7 +2322,7 @@ _e_actions_cb_suspend_dialog_ok(void *data __UNUSED__, E_Dialog *dia) } static void -_e_actions_cb_suspend_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED__) +_e_actions_cb_suspend_dialog_cancel(void *data EINA_UNUSED, E_Dialog *dia EINA_UNUSED) { e_object_del(E_OBJECT(suspend_dialog)); suspend_dialog = NULL; @@ -2334,7 +2334,7 @@ _e_actions_cb_suspend_dialog_delete(void *data, Evas *e EINA_UNUSED, Evas_Object _e_actions_cb_suspend_dialog_cancel(NULL, data); } -ACT_FN_GO(suspend_now, __UNUSED__) +ACT_FN_GO(suspend_now, EINA_UNUSED) { e_sys_action_do(E_SYS_SUSPEND, NULL); } @@ -2391,7 +2391,7 @@ _have_lid_and_external_screens_on(void) return EINA_FALSE; } -ACT_FN_GO(suspend_smart, __UNUSED__) +ACT_FN_GO(suspend_smart, EINA_UNUSED) { if ((!_have_lid_and_external_screens_on()) && (ecore_power_state_get() != ECORE_POWER_STATE_MAINS)) @@ -2402,7 +2402,7 @@ ACT_FN_GO(suspend_smart, __UNUSED__) static E_Dialog *hibernate_dialog = NULL; static void -_e_actions_cb_hibernate_dialog_ok(void *data __UNUSED__, E_Dialog *dia) +_e_actions_cb_hibernate_dialog_ok(void *data EINA_UNUSED, E_Dialog *dia) { if (dia) { @@ -2413,7 +2413,7 @@ _e_actions_cb_hibernate_dialog_ok(void *data __UNUSED__, E_Dialog *dia) } static void -_e_actions_cb_hibernate_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED__) +_e_actions_cb_hibernate_dialog_cancel(void *data EINA_UNUSED, E_Dialog *dia EINA_UNUSED) { e_object_del(E_OBJECT(hibernate_dialog)); hibernate_dialog = NULL; @@ -2425,7 +2425,7 @@ _e_actions_cb_hibernate_dialog_delete(void *data, Evas *e EINA_UNUSED, Evas_Obje _e_actions_cb_hibernate_dialog_cancel(NULL, data); } -ACT_FN_GO(hibernate_now, __UNUSED__) +ACT_FN_GO(hibernate_now, EINA_UNUSED) { e_sys_action_do(E_SYS_HIBERNATE, NULL); } @@ -2460,7 +2460,7 @@ ACT_FN_GO(hibernate, ) e_dialog_show(hibernate_dialog); } -ACT_FN_GO(hibernate_smart, __UNUSED__) +ACT_FN_GO(hibernate_smart, EINA_UNUSED) { if ((!_have_lid_and_external_screens_on()) && (ecore_power_state_get() != ECORE_POWER_STATE_MAINS)) @@ -2500,7 +2500,7 @@ ACT_FN_GO(pointer_resize_pop, ) } /***************************************************************************/ -ACT_FN_GO(desk_lock, __UNUSED__) +ACT_FN_GO(desk_lock, EINA_UNUSED) { /* E_Zone *zone; @@ -2747,7 +2747,7 @@ _delayed_action_key_add(E_Object *obj, const char *params, Ecore_Event_Key *ev) } static void -_delayed_action_key_del(E_Object *obj, const char *params __UNUSED__, Ecore_Event_Key *ev) +_delayed_action_key_del(E_Object *obj, const char *params EINA_UNUSED, Ecore_Event_Key *ev) { Eina_List *l; Delayed_Action *da; @@ -2784,7 +2784,7 @@ _delayed_action_mouse_add(E_Object *obj, const char *params, E_Binding_Event_Mou } static void -_delayed_action_mouse_del(E_Object *obj, const char *params __UNUSED__, E_Binding_Event_Mouse_Button *ev) +_delayed_action_mouse_del(E_Object *obj, const char *params EINA_UNUSED, E_Binding_Event_Mouse_Button *ev) { Eina_List *l; Delayed_Action *da; @@ -2823,13 +2823,13 @@ ACT_FN_END_MOUSE(delayed_action, ) _delayed_action_mouse_del(obj, params, ev); } -ACT_FN_GO(dim_screen, __UNUSED__) +ACT_FN_GO(dim_screen, EINA_UNUSED) { E_Zone *zone = _e_actions_zone_get(obj); e_backlight_mode_set(zone, E_BACKLIGHT_MODE_DIM); } -ACT_FN_GO(undim_screen, __UNUSED__) +ACT_FN_GO(undim_screen, EINA_UNUSED) { E_Zone *zone = _e_actions_zone_get(obj); e_backlight_mode_set(zone, E_BACKLIGHT_MODE_NORMAL); @@ -2878,14 +2878,14 @@ ACT_FN_GO(kbd_layout, ) #endif } -ACT_FN_GO(kbd_layout_next, __UNUSED__) +ACT_FN_GO(kbd_layout_next, EINA_UNUSED) { #ifndef HAVE_WAYLAND_ONLY e_xkb_layout_next(); #endif } -ACT_FN_GO(kbd_layout_prev, __UNUSED__) +ACT_FN_GO(kbd_layout_prev, EINA_UNUSED) { #ifndef HAVE_WAYLAND_ONLY e_xkb_layout_prev(); @@ -2935,7 +2935,7 @@ ACT_FN_GO(module_toggle, ) else e_module_enable(m); } -ACT_FN_GO(screen_redo, __UNUSED__) +ACT_FN_GO(screen_redo, EINA_UNUSED) { printf("REDOOOOOOOOOOOOOOOOOOOOOOOOOOO\n"); #ifndef HAVE_WAYLAND_ONLY diff --git a/src/bin/e_backlight.c b/src/bin/e_backlight.c index c9e308aefe..83a229277a 100644 --- a/src/bin/e_backlight.c +++ b/src/bin/e_backlight.c @@ -35,7 +35,7 @@ static Eina_Bool bl_sys_set_exe_ready = EINA_TRUE; static void _bl_sys_find(void); static void _bl_sys_level_get(void); -static Eina_Bool _e_bl_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event); +static Eina_Bool _e_bl_cb_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); static void _bl_sys_level_set(double val); #endif @@ -144,7 +144,7 @@ e_backlight_level_set(E_Zone *zone, double val, double tim) } EAPI double -e_backlight_level_get(E_Zone *zone __UNUSED__) +e_backlight_level_get(E_Zone *zone EINA_UNUSED) { // zone == NULL == everything return e_bl_val; @@ -179,7 +179,7 @@ e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode) } EAPI E_Backlight_Mode -e_backlight_mode_get(E_Zone *zone __UNUSED__) +e_backlight_mode_get(E_Zone *zone EINA_UNUSED) { // zone == NULL == everything return e_config->backlight.mode; @@ -447,7 +447,7 @@ _bl_sys_level_get(void) } static Eina_Bool -_e_bl_cb_ext_delay(void *data __UNUSED__) +_e_bl_cb_ext_delay(void *data EINA_UNUSED) { bl_sys_set_exe_ready = EINA_TRUE; if (bl_sys_pending_set) @@ -460,7 +460,7 @@ _e_bl_cb_ext_delay(void *data __UNUSED__) } static Eina_Bool -_e_bl_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_bl_cb_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Del *ev; diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c index 2c72f4ab57..f8c740e5d9 100644 --- a/src/bin/e_bg.c +++ b/src/bin/e_bg.c @@ -3,8 +3,8 @@ /* local subsystem functions */ static void _e_bg_signal(void *data, Evas_Object *obj, const char *emission, const char *source); static void _e_bg_event_bg_update_free(void *data, void *event); -static void e_bg_handler_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *path); -static int e_bg_handler_test(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *path); +static void e_bg_handler_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *path); +static int e_bg_handler_test(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *path); static void _e_bg_handler_image_imported(const char *image_path, void *data); /* local subsystem globals */ @@ -416,7 +416,7 @@ e_bg_update(void) * Set background to image, as required in e_fm2_mime_handler_new() */ static void -e_bg_handler_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *path) +e_bg_handler_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *path) { char buf[4096]; int copy = 1; @@ -478,7 +478,7 @@ e_bg_handler_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char * Just edje files with "e/desktop/background" group are used. */ static int -e_bg_handler_test(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *path) +e_bg_handler_test(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *path) { if (!path) return 0; @@ -493,7 +493,7 @@ e_bg_handler_test(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char } static void -_e_bg_signal(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_bg_signal(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Zone *zone = data; @@ -507,13 +507,13 @@ _e_bg_signal(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNU } static void -_e_bg_event_bg_update_free(void *data __UNUSED__, void *event) +_e_bg_event_bg_update_free(void *data EINA_UNUSED, void *event) { free(event); } static void -_e_bg_handler_image_imported(const char *image_path, void *data __UNUSED__) +_e_bg_handler_image_imported(const char *image_path, void *data EINA_UNUSED) { e_bg_default_set(image_path); e_bg_update(); diff --git a/src/bin/e_color_dialog.c b/src/bin/e_color_dialog.c index 5c7754eaf5..0da0a06d76 100644 --- a/src/bin/e_color_dialog.c +++ b/src/bin/e_color_dialog.c @@ -88,7 +88,7 @@ e_color_dialog_change_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dia } static void -_e_color_dialog_cb_csel_change(void *data, Evas_Object *obj __UNUSED__) +_e_color_dialog_cb_csel_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Color_Dialog *dia; @@ -98,7 +98,7 @@ _e_color_dialog_cb_csel_change(void *data, Evas_Object *obj __UNUSED__) } static void -_e_color_dialog_button1_click(void *data, E_Dialog *edia __UNUSED__) +_e_color_dialog_button1_click(void *data, E_Dialog *edia EINA_UNUSED) { E_Color_Dialog *dia; @@ -109,7 +109,7 @@ _e_color_dialog_button1_click(void *data, E_Dialog *edia __UNUSED__) } static void -_e_color_dialog_button2_click(void *data, E_Dialog *edia __UNUSED__) +_e_color_dialog_button2_click(void *data, E_Dialog *edia EINA_UNUSED) { E_Color_Dialog *dia; diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 019e4703a3..e77f989249 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -930,7 +930,7 @@ _e_comp_act_opacity_change_go(E_Object *obj, const char *params) } static void -_e_comp_act_opacity_set_go(E_Object * obj __UNUSED__, const char *params) +_e_comp_act_opacity_set_go(E_Object * obj EINA_UNUSED, const char *params) { int opacity; Evas_Object *o; @@ -1121,10 +1121,10 @@ _style_demo(void *data) } static void -_style_selector_del(void *data __UNUSED__, +_style_selector_del(void *data EINA_UNUSED, Evas *e, Evas_Object *o, - void *event_info __UNUSED__) + void *event_info EINA_UNUSED) { Eina_List *style_shadows, *style_list; Ecore_Timer *timer; diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 4cb03a7bc1..75e6ed2617 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -4300,7 +4300,7 @@ _e_comp_x_cb_ping(void *data EINA_UNUSED, int ev_type EINA_UNUSED, Ecore_X_Event } static Eina_Bool -_e_comp_x_screensaver_idle_timer_cb(void *d __UNUSED__) +_e_comp_x_screensaver_idle_timer_cb(void *d EINA_UNUSED) { ecore_event_add(E_EVENT_SCREENSAVER_ON, NULL, NULL, NULL); screensaver_idle_timer = NULL; @@ -4311,7 +4311,7 @@ static Ecore_Timer *screensaver_eval_timer = NULL; static Eina_Bool saver_on = EINA_FALSE; static Eina_Bool -_e_comp_x_screensaver_eval_cb(void *d __UNUSED__) +_e_comp_x_screensaver_eval_cb(void *d EINA_UNUSED) { if (saver_on) { @@ -4365,7 +4365,7 @@ _e_comp_x_screensaver_eval_cb(void *d __UNUSED__) } static Eina_Bool -_e_comp_x_screensaver_notify_cb(void *data __UNUSED__, int type __UNUSED__, Ecore_X_Event_Screensaver_Notify *ev) +_e_comp_x_screensaver_notify_cb(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_Screensaver_Notify *ev) { if ((ev->on) && (!saver_on)) { diff --git a/src/bin/e_config.c b/src/bin/e_config.c index f15082a528..f45b8b3036 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -2114,7 +2114,7 @@ e_config_bindings_free(E_Config_Bindings *ecb) /* local subsystem functions */ static void -_e_config_save_cb(void *data __UNUSED__) +_e_config_save_cb(void *data EINA_UNUSED) { e_config_profile_save(); e_module_save_all(); diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c index b75f139436..04aa2c7a6b 100644 --- a/src/bin/e_config_dialog.c +++ b/src/bin/e_config_dialog.c @@ -333,7 +333,7 @@ _e_config_dialog_cb_dialog_del(void *obj) } static void -_e_config_dialog_cb_ok(void *data __UNUSED__, E_Dialog *dia) +_e_config_dialog_cb_ok(void *data EINA_UNUSED, E_Dialog *dia) { E_Config_Dialog *cfd; int ok = 0; @@ -354,7 +354,7 @@ _e_config_dialog_cb_ok(void *data __UNUSED__, E_Dialog *dia) } static void -_e_config_dialog_cb_apply(void *data __UNUSED__, E_Dialog *dia) +_e_config_dialog_cb_apply(void *data EINA_UNUSED, E_Dialog *dia) { E_Config_Dialog *cfd; int ok = 0; @@ -379,7 +379,7 @@ _e_config_dialog_cb_apply(void *data __UNUSED__, E_Dialog *dia) } static void -_e_config_dialog_cb_advanced(void *data, void *data2 __UNUSED__) +_e_config_dialog_cb_advanced(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog *cfd; @@ -389,7 +389,7 @@ _e_config_dialog_cb_advanced(void *data, void *data2 __UNUSED__) } static void -_e_config_dialog_cb_basic(void *data, void *data2 __UNUSED__) +_e_config_dialog_cb_basic(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog *cfd; @@ -458,7 +458,7 @@ _e_config_dialog_check_changed(E_Config_Dialog *cfd, unsigned char def) } static void -_e_config_dialog_cb_changed(void *data, Evas_Object *obj __UNUSED__) +_e_config_dialog_cb_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog *cfd; int changed; @@ -471,7 +471,7 @@ _e_config_dialog_cb_changed(void *data, Evas_Object *obj __UNUSED__) } static void -_e_config_dialog_cb_close(void *data __UNUSED__, E_Dialog *dia) +_e_config_dialog_cb_close(void *data EINA_UNUSED, E_Dialog *dia) { E_Config_Dialog *cfd; int ok = 1; diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c index dff6262575..ec7a85b137 100644 --- a/src/bin/e_configure.c +++ b/src/bin/e_configure.c @@ -271,13 +271,13 @@ e_configure_registry_exists(const char *path) } static void -_e_configure_menu_module_item_cb(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +_e_configure_menu_module_item_cb(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_int_config_modules(NULL, NULL); } static void -_e_configure_menu_add(void *data __UNUSED__, E_Menu *m) +_e_configure_menu_add(void *data EINA_UNUSED, E_Menu *m) { E_Menu_Item *mi; @@ -288,14 +288,14 @@ _e_configure_menu_add(void *data __UNUSED__, E_Menu *m) } static void -_configure_job(void *data __UNUSED__) +_configure_job(void *data EINA_UNUSED) { _e_configure_efreet_desktop_update(); update_job = NULL; } static Eina_Bool -_configure_init_timer(void *data __UNUSED__) +_configure_init_timer(void *data EINA_UNUSED) { handlers = eina_list_append (handlers, ecore_event_handler_add @@ -443,7 +443,7 @@ _e_configure_efreet_desktop_update(void) } static Eina_Bool -_e_configure_cb_efreet_desktop_cache_update(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_e_configure_cb_efreet_desktop_cache_update(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { _e_configure_efreet_desktop_cleanup(); if (update_job) ecore_job_del(update_job); diff --git a/src/bin/e_confirm_dialog.c b/src/bin/e_confirm_dialog.c index 67e0dbee58..6d1ac39be6 100644 --- a/src/bin/e_confirm_dialog.c +++ b/src/bin/e_confirm_dialog.c @@ -77,7 +77,7 @@ _e_confirm_dialog_free(E_Confirm_Dialog *cd) } static void -_e_confirm_dialog_yes(void *data, E_Dialog *dia __UNUSED__) +_e_confirm_dialog_yes(void *data, E_Dialog *dia EINA_UNUSED) { E_Confirm_Dialog *cd; @@ -90,7 +90,7 @@ _e_confirm_dialog_yes(void *data, E_Dialog *dia __UNUSED__) } static void -_e_confirm_dialog_no(void *data, E_Dialog *dia __UNUSED__) +_e_confirm_dialog_no(void *data, E_Dialog *dia EINA_UNUSED) { E_Confirm_Dialog *cd; diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c index 10bc1fca68..84a17184b5 100644 --- a/src/bin/e_desk.c +++ b/src/bin/e_desk.c @@ -733,7 +733,7 @@ _e_desk_free(E_Desk *desk) } static void -_e_desk_event_desk_show_free(void *data __UNUSED__, void *event) +_e_desk_event_desk_show_free(void *data EINA_UNUSED, void *event) { E_Event_Desk_Show *ev; @@ -743,7 +743,7 @@ _e_desk_event_desk_show_free(void *data __UNUSED__, void *event) } static void -_e_desk_event_desk_before_show_free(void *data __UNUSED__, void *event) +_e_desk_event_desk_before_show_free(void *data EINA_UNUSED, void *event) { E_Event_Desk_Before_Show *ev; @@ -753,7 +753,7 @@ _e_desk_event_desk_before_show_free(void *data __UNUSED__, void *event) } static void -_e_desk_event_desk_after_show_free(void *data __UNUSED__, void *event) +_e_desk_event_desk_after_show_free(void *data EINA_UNUSED, void *event) { E_Event_Desk_After_Show *ev; @@ -763,7 +763,7 @@ _e_desk_event_desk_after_show_free(void *data __UNUSED__, void *event) } static void -_e_desk_event_desk_deskshow_free(void *data __UNUSED__, void *event) +_e_desk_event_desk_deskshow_free(void *data EINA_UNUSED, void *event) { E_Event_Desk_Show *ev; @@ -773,7 +773,7 @@ _e_desk_event_desk_deskshow_free(void *data __UNUSED__, void *event) } static void -_e_desk_event_desk_name_change_free(void *data __UNUSED__, void *event) +_e_desk_event_desk_name_change_free(void *data EINA_UNUSED, void *event) { E_Event_Desk_Name_Change *ev = event; e_object_unref(E_OBJECT(ev->desk)); @@ -781,7 +781,7 @@ _e_desk_event_desk_name_change_free(void *data __UNUSED__, void *event) } static void -_e_desk_event_desk_window_profile_change_free(void *data __UNUSED__, void *event) +_e_desk_event_desk_window_profile_change_free(void *data EINA_UNUSED, void *event) { E_Event_Desk_Window_Profile_Change *ev = event; e_object_unref(E_OBJECT(ev->desk)); diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c index 42c8e6a21c..c3091fafa2 100644 --- a/src/bin/e_desklock.c +++ b/src/bin/e_desklock.c @@ -33,8 +33,8 @@ static Eina_List *desklock_ifaces = NULL; static E_Desklock_Interface *current_iface = NULL; /***********************************************************************/ -static Eina_Bool _e_desklock_cb_custom_desklock_exit(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_desklock_cb_idle_poller(void *data __UNUSED__); +static Eina_Bool _e_desklock_cb_custom_desklock_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_desklock_cb_idle_poller(void *data EINA_UNUSED); static Eina_Bool _e_desklock_cb_run(void *data, int type, void *event); static Eina_Bool _e_desklock_state = EINA_FALSE; @@ -397,7 +397,7 @@ e_desklock_state_get(void) } static Eina_Bool -_e_desklock_cb_custom_desklock_exit(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_desklock_cb_custom_desklock_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Del *ev = event; @@ -414,7 +414,7 @@ _e_desklock_cb_custom_desklock_exit(void *data __UNUSED__, int type __UNUSED__, } static Eina_Bool -_e_desklock_cb_idle_poller(void *data __UNUSED__) +_e_desklock_cb_idle_poller(void *data EINA_UNUSED) { if ((e_config->desklock_autolock_idle) && (!e_config->mode.presentation)) { @@ -467,7 +467,7 @@ _e_desklock_ask_presentation_del(void *data) } static void -_e_desklock_ask_presentation_yes(void *data __UNUSED__, E_Dialog *dia) +_e_desklock_ask_presentation_yes(void *data EINA_UNUSED, E_Dialog *dia) { e_config->mode.presentation = 1; e_config_mode_changed(); @@ -477,14 +477,14 @@ _e_desklock_ask_presentation_yes(void *data __UNUSED__, E_Dialog *dia) } static void -_e_desklock_ask_presentation_no(void *data __UNUSED__, E_Dialog *dia) +_e_desklock_ask_presentation_no(void *data EINA_UNUSED, E_Dialog *dia) { e_object_del(E_OBJECT(dia)); _e_desklock_ask_presentation_count = 0; } static void -_e_desklock_ask_presentation_no_increase(void *data __UNUSED__, E_Dialog *dia) +_e_desklock_ask_presentation_no_increase(void *data EINA_UNUSED, E_Dialog *dia) { #ifndef HAVE_WAYLAND_ONLY int timeout, interval, blanking, expose; @@ -501,7 +501,7 @@ _e_desklock_ask_presentation_no_increase(void *data __UNUSED__, E_Dialog *dia) } static void -_e_desklock_ask_presentation_no_forever(void *data __UNUSED__, E_Dialog *dia) +_e_desklock_ask_presentation_no_forever(void *data EINA_UNUSED, E_Dialog *dia) { e_config->desklock_ask_presentation = 0; e_config_save_queue(); @@ -510,7 +510,7 @@ _e_desklock_ask_presentation_no_forever(void *data __UNUSED__, E_Dialog *dia) } static void -_e_desklock_ask_presentation_key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event) +_e_desklock_ask_presentation_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event) { Evas_Event_Key_Down *ev = event; E_Dialog *dia = data; @@ -577,7 +577,7 @@ _e_desklock_run(E_Desklock_Run *task) } static void -_e_desklock_job(void *data __UNUSED__) +_e_desklock_job(void *data EINA_UNUSED) { E_Desklock_Run *task; @@ -592,7 +592,7 @@ _e_desklock_job(void *data __UNUSED__) } static Eina_Bool -_e_desklock_cb_run(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_desklock_cb_run(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Desklock_Run *task; E_Event_Desklock *ev = event; diff --git a/src/bin/e_desktop_editor.c b/src/bin/e_desktop_editor.c index 6665cfb438..4ec89ea6a2 100644 --- a/src/bin/e_desktop_editor.c +++ b/src/bin/e_desktop_editor.c @@ -379,7 +379,7 @@ _e_desktop_edit_create_data(E_Config_Dialog *cfd) * Frees the config dialog data */ static void -_e_desktop_edit_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_e_desktop_edit_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->editor->tmp_image_path) { @@ -477,7 +477,7 @@ _e_desktop_edit_update_orig_path(E_Config_Dialog_Data *cfdata) * Apply the basic config dialog */ static int -_e_desktop_edit_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_e_desktop_edit_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_FREE(cfdata->desktop->name); IFDUP(cfdata->name, cfdata->desktop->name); @@ -532,7 +532,7 @@ _e_desktop_edit_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialo } static int -_e_desktop_edit_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_e_desktop_edit_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { int ret; @@ -662,35 +662,35 @@ _e_desktop_edit_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Di } static void -_e_desktop_editor_name_changed(void *data, Evas_Object *obj __UNUSED__) +_e_desktop_editor_name_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; _e_desktop_edit_update_orig_path(cfdata); } static void -_e_desktop_editor_categories_changed(void *data, Evas_Object *obj __UNUSED__) +_e_desktop_editor_categories_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; cfdata->edited_categories = EINA_TRUE; } static void -_e_desktop_editor_icon_entry_changed(void *data, Evas_Object *obj __UNUSED__) +_e_desktop_editor_icon_entry_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; _e_desktop_editor_icon_update(cfdata); } static void -_e_desktop_editor_mimes_changed(void *data, Evas_Object *obj __UNUSED__) +_e_desktop_editor_mimes_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; cfdata->edited_mimes = EINA_TRUE; } static Evas_Object * -_e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { E_Desktop_Edit *editor = cfdata->editor; E_Radio_Group *rg; @@ -960,7 +960,7 @@ _e_desktop_editor_cb_exec_select(void *data1, void *data2) } static void -_e_desktop_edit_select_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__) +_e_desktop_edit_select_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED) { } diff --git a/src/bin/e_dialog.c b/src/bin/e_dialog.c index 873b24e1bc..8c1de989ad 100644 --- a/src/bin/e_dialog.c +++ b/src/bin/e_dialog.c @@ -285,13 +285,13 @@ _e_dialog_free(E_Dialog *dia) } static void -_e_dialog_del_func_cb(void *data __UNUSED__, E_Dialog *dia) +_e_dialog_del_func_cb(void *data EINA_UNUSED, E_Dialog *dia) { e_util_defer_object_del(E_OBJECT(dia)); } static void -_e_dialog_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_e_dialog_cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Key_Down *ev; E_Dialog *dia; diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c index 34a96f4b5a..61ddde2b65 100644 --- a/src/bin/e_dnd.c +++ b/src/bin/e_dnd.c @@ -1165,7 +1165,7 @@ _e_drag_free(E_Drag *drag) } static Eina_Bool -_e_dnd_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_dnd_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Key *ev = event; @@ -1180,7 +1180,7 @@ _e_dnd_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_dnd_cb_key_up(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_dnd_cb_key_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Key *ev = event; @@ -1195,7 +1195,7 @@ _e_dnd_cb_key_up(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_dnd_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_dnd_cb_mouse_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Button *ev = event; @@ -1207,7 +1207,7 @@ _e_dnd_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_dnd_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_dnd_cb_mouse_move(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Move *ev = event; @@ -1224,7 +1224,7 @@ _e_dnd_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event) #ifndef HAVE_WAYLAND_ONLY static Eina_Bool -_e_dnd_cb_event_dnd_enter(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_dnd_cb_event_dnd_enter(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_X_Event_Xdnd_Enter *ev = event; E_Drop_Handler *h; @@ -1260,7 +1260,7 @@ _e_dnd_cb_event_dnd_enter(void *data __UNUSED__, int type __UNUSED__, void *even } static Eina_Bool -_e_dnd_cb_event_dnd_leave(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_dnd_cb_event_dnd_leave(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_X_Event_Xdnd_Leave *ev = event; E_Event_Dnd_Leave leave_ev; @@ -1292,7 +1292,7 @@ _e_dnd_cb_event_dnd_leave(void *data __UNUSED__, int type __UNUSED__, void *even } static Eina_Bool -_e_dnd_cb_event_hide(void *data __UNUSED__, int type __UNUSED__, Ecore_X_Event_Window_Hide *ev) +_e_dnd_cb_event_hide(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_Window_Hide *ev) { E_Event_Dnd_Leave leave_ev; const char *id; @@ -1329,7 +1329,7 @@ _e_dnd_cb_event_hide(void *data __UNUSED__, int type __UNUSED__, Ecore_X_Event_W } static Eina_Bool -_e_dnd_cb_event_dnd_position(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_dnd_cb_event_dnd_position(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_X_Event_Xdnd_Position *ev = event; Ecore_X_Rectangle rect; @@ -1364,7 +1364,7 @@ _e_dnd_cb_event_dnd_position(void *data __UNUSED__, int type __UNUSED__, void *e } static Eina_Bool -_e_dnd_cb_event_dnd_status(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_dnd_cb_event_dnd_status(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_X_Event_Xdnd_Status *ev = event; @@ -1373,7 +1373,7 @@ _e_dnd_cb_event_dnd_status(void *data __UNUSED__, int type __UNUSED__, void *eve } static Eina_Bool -_e_dnd_cb_event_dnd_finished(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_e_dnd_cb_event_dnd_finished(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { /* * this is broken since the completed flag doesn't tell us anything with current @@ -1394,7 +1394,7 @@ _e_dnd_cb_event_dnd_finished(void *data __UNUSED__, int type __UNUSED__, void *e } static Eina_Bool -_e_dnd_cb_event_dnd_drop(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_dnd_cb_event_dnd_drop(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_X_Event_Xdnd_Drop *ev = event; @@ -1429,7 +1429,7 @@ _e_dnd_cb_event_dnd_drop(void *data __UNUSED__, int type __UNUSED__, void *event } static Eina_Bool -_e_dnd_cb_event_dnd_selection(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_dnd_cb_event_dnd_selection(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_X_Event_Selection_Notify *ev = event; int i; diff --git a/src/bin/e_dpms.c b/src/bin/e_dpms.c index f600a96dcc..fde8e4f2b9 100644 --- a/src/bin/e_dpms.c +++ b/src/bin/e_dpms.c @@ -94,28 +94,28 @@ e_dpms_force_update(void) } static Eina_Bool -_e_dpms_handler_config_mode_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_e_dpms_handler_config_mode_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { e_dpms_update(); return ECORE_CALLBACK_PASS_ON; } static Eina_Bool -_e_dpms_handler_border_fullscreen_check_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_e_dpms_handler_border_fullscreen_check_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { if (e_config->no_dpms_on_fullscreen) e_dpms_update(); return ECORE_CALLBACK_PASS_ON; } static Eina_Bool -_e_dpms_handler_border_desk_set_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_e_dpms_handler_border_desk_set_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { if (e_config->no_dpms_on_fullscreen) e_dpms_update(); return ECORE_CALLBACK_PASS_ON; } static Eina_Bool -_e_dpms_handler_desk_show_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_e_dpms_handler_desk_show_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { if (e_config->no_dpms_on_fullscreen) e_dpms_update(); return ECORE_CALLBACK_PASS_ON; diff --git a/src/bin/e_entry_dialog.c b/src/bin/e_entry_dialog.c index fad92c10da..4f8051fe1a 100644 --- a/src/bin/e_entry_dialog.c +++ b/src/bin/e_entry_dialog.c @@ -91,7 +91,7 @@ _e_entry_dialog_free(E_Entry_Dialog *ed) } static void -_e_entry_dialog_ok(void *data, E_Dialog *dia __UNUSED__) +_e_entry_dialog_ok(void *data, E_Dialog *dia EINA_UNUSED) { E_Entry_Dialog *ed; @@ -103,7 +103,7 @@ _e_entry_dialog_ok(void *data, E_Dialog *dia __UNUSED__) } static void -_e_entry_dialog_cancel(void *data, E_Dialog *dia __UNUSED__) +_e_entry_dialog_cancel(void *data, E_Dialog *dia EINA_UNUSED) { E_Entry_Dialog *ed; @@ -121,7 +121,7 @@ _e_entry_dialog_delete(E_Dialog *dia, Evas *e EINA_UNUSED, Evas_Object *obj EINA } static void -_e_entry_cb_key_down(void *data, Evas_Object *obj __UNUSED__, void *event_info) +_e_entry_cb_key_down(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Key_Down *ev; E_Entry_Dialog *ed; diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c index 83e7139f71..8fa1570915 100644 --- a/src/bin/e_exec.c +++ b/src/bin/e_exec.c @@ -54,7 +54,7 @@ static void _e_exec_cb_exec_new_free(void *data, void *event); static void _e_exec_cb_exec_new_client_free(void *data, void *ev); static void _e_exec_cb_exec_del_free(void *data, void *event); static void _e_exe_instance_watchers_call(E_Exec_Instance *inst, E_Exec_Watch_Type type); -static Eina_Bool _e_exec_startup_id_pid_find(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data); +static Eina_Bool _e_exec_startup_id_pid_find(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *value, void *data); static void _e_exec_error_dialog(Efreet_Desktop *desktop, const char *exec, Ecore_Exe_Event_Del *event, Ecore_Exe_Event_Data *error, Ecore_Exe_Event_Data *read); static void _fill_data(E_Config_Dialog_Data *cfdata); @@ -719,7 +719,7 @@ _e_exec_cb_exec_del_free(void *data, void *ev EINA_UNUSED) } static Eina_Bool -_e_exec_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_exec_cb_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Del *ev; E_Exec_Instance *inst; @@ -810,7 +810,7 @@ _e_exec_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_exec_startup_id_pid_find(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data) +_e_exec_startup_id_pid_find(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *value, void *data) { E_Exec_Search *search; E_Exec_Instance *inst; @@ -961,7 +961,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->error) ecore_exe_event_data_free(cfdata->error); if (cfdata->read) ecore_exe_event_data_free(cfdata->read); @@ -1023,7 +1023,7 @@ _dialog_scrolltext_create(Evas *evas, char *title, Ecore_Exe_Event_Data_Line *li } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { char buf[4096]; int error_length = 0; @@ -1066,7 +1066,7 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial } static Evas_Object * -_advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_advanced_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { char buf[4096]; int read_length = 0; @@ -1149,7 +1149,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D } static void -_dialog_save_cb(void *data __UNUSED__, void *data2) +_dialog_save_cb(void *data EINA_UNUSED, void *data2) { E_Config_Dialog_Data *cfdata; FILE *f; diff --git a/src/bin/e_exehist.c b/src/bin/e_exehist.c index b37114f9ed..488fd62567 100644 --- a/src/bin/e_exehist.c +++ b/src/bin/e_exehist.c @@ -524,7 +524,7 @@ _e_exehist_normalize_exe(const char *exe) } static void -_e_exehist_cb_unload(void *data __UNUSED__) +_e_exehist_cb_unload(void *data EINA_UNUSED) { if (_e_exehist_changes) { diff --git a/src/bin/e_filereg.c b/src/bin/e_filereg.c index d92b508be3..9443407305 100644 --- a/src/bin/e_filereg.c +++ b/src/bin/e_filereg.c @@ -14,9 +14,9 @@ struct _Filereg_Item int ref_count; }; -static Eina_Bool _filereg_hash_cb_free(const Eina_Hash *hash __UNUSED__, - const void *key __UNUSED__, - void *data, void *fdata __UNUSED__); +static Eina_Bool _filereg_hash_cb_free(const Eina_Hash *hash EINA_UNUSED, + const void *key EINA_UNUSED, + void *data, void *fdata EINA_UNUSED); /* Externally accessible functions */ EINTERN int @@ -82,8 +82,8 @@ e_filereg_file_protected(const char *path) /* Private Functions */ static Eina_Bool -_filereg_hash_cb_free(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, - void *data, void *fdata __UNUSED__) +_filereg_hash_cb_free(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, + void *data, void *fdata EINA_UNUSED) { Filereg_Item *fi; diff --git a/src/bin/e_flowlayout.c b/src/bin/e_flowlayout.c index 4e93e68e2b..0b576dd106 100644 --- a/src/bin/e_flowlayout.c +++ b/src/bin/e_flowlayout.c @@ -512,7 +512,7 @@ _e_flowlayout_smart_disown(Evas_Object *obj) } static void -_e_flowlayout_smart_item_del_hook(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_flowlayout_smart_item_del_hook(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { e_flowlayout_unpack(obj); } diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index bce1d58591..fe19ee8c3e 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -345,7 +345,7 @@ static void _e_fm2_cb_resize_job(void *data); static int _e_fm2_cb_icon_sort(const void *data1, const void *data2); static Eina_Bool _e_fm2_cb_scan_timer(void *data); static Eina_Bool _e_fm2_cb_sort_idler(void *data); -static Eina_Bool _e_fm2_cb_theme(void *data, int type __UNUSED__, void *event __UNUSED__); +static Eina_Bool _e_fm2_cb_theme(void *data, int type EINA_UNUSED, void *event EINA_UNUSED); static void _e_fm2_obj_icons_place(E_Fm2_Smart_Data *sd); @@ -388,7 +388,7 @@ static void _e_fm2_file_rename(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_fm2_file_rename_delete_cb(void *obj); static void _e_fm2_file_rename_yes_cb(void *data, char *text); static void _e_fm2_file_rename_no_cb(void *data); -static void _e_fm2_file_application_properties(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__); +static void _e_fm2_file_application_properties(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED); static void _e_fm2_file_properties(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_fm2_file_properties_delete_cb(void *obj); static int _e_fm2_file_do_rename(const char *text, E_Fm2_Icon *ic); @@ -666,14 +666,14 @@ _e_fm2_icon_mime_size_normalize(const E_Fm2_Icon *ic) } static Eina_Bool -_e_fm2_mime_flush_cb(void *data __UNUSED__) +_e_fm2_mime_flush_cb(void *data EINA_UNUSED) { efreet_mime_type_cache_flush(); return ECORE_CALLBACK_RENEW; } static Eina_Bool -_e_fm2_mime_clear_cb(void *data __UNUSED__) +_e_fm2_mime_clear_cb(void *data EINA_UNUSED) { efreet_mime_type_cache_clear(); return ECORE_CALLBACK_RENEW; @@ -750,7 +750,7 @@ _e_fm2_op_registry_entry_print(const E_Fm2_Op_Registry_Entry *ere) } static Eina_Bool -_e_fm2_op_registry_entry_add_cb(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_fm2_op_registry_entry_add_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { const E_Fm2_Op_Registry_Entry *ere = event; DBG("E FM OPERATION STARTED: id=%d, op=%d", ere->id, ere->op); @@ -758,7 +758,7 @@ _e_fm2_op_registry_entry_add_cb(void *data __UNUSED__, int type __UNUSED__, void } static Eina_Bool -_e_fm2_op_registry_entry_del_cb(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_fm2_op_registry_entry_del_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { const E_Fm2_Op_Registry_Entry *ere = event; puts("E FM OPERATION FINISHED:"); @@ -768,7 +768,7 @@ _e_fm2_op_registry_entry_del_cb(void *data __UNUSED__, int type __UNUSED__, void } static Eina_Bool -_e_fm2_op_registry_entry_changed_cb(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_fm2_op_registry_entry_changed_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { const E_Fm2_Op_Registry_Entry *ere = event; puts("E FM OPERATION CHANGED:"); @@ -1009,13 +1009,13 @@ _e_fm2_path_parent_set(Evas_Object *obj, const char *path) } static void -_e_fm2_favorites_thread_cb(void *d __UNUSED__, Ecore_Thread *et __UNUSED__) +_e_fm2_favorites_thread_cb(void *d EINA_UNUSED, Ecore_Thread *et EINA_UNUSED) { e_fm2_favorites_init(); } static void -_e_fm2_thread_cleanup_cb(void *d __UNUSED__, Ecore_Thread *et __UNUSED__) +_e_fm2_thread_cleanup_cb(void *d EINA_UNUSED, Ecore_Thread *et EINA_UNUSED) { _e_fm2_favorites_thread = NULL; } @@ -1832,7 +1832,7 @@ _e_fm2_path_join(char *buf, int buflen, const char *base, const char *component) * @see _e_fm2_icon_explicit_get() */ static Evas_Object * -_e_fm2_icon_explicit_edje_get(Evas *evas, const E_Fm2_Icon *ic __UNUSED__, const char *iconpath, const char **type_ret) +_e_fm2_icon_explicit_edje_get(Evas *evas, const E_Fm2_Icon *ic EINA_UNUSED, const char *iconpath, const char **type_ret) { Evas_Object *o = edje_object_add(evas); if (!o) @@ -1857,7 +1857,7 @@ _e_fm2_icon_explicit_edje_get(Evas *evas, const E_Fm2_Icon *ic __UNUSED__, const * @see _e_fm2_icon_explicit_get() */ static Evas_Object * -_e_fm2_icon_explicit_theme_icon_get(Evas *evas, const E_Fm2_Icon *ic __UNUSED__, const char *name, const char **type_ret) +_e_fm2_icon_explicit_theme_icon_get(Evas *evas, const E_Fm2_Icon *ic EINA_UNUSED, const char *name, const char **type_ret) { Evas_Object *o = e_icon_add(evas); @@ -2023,7 +2023,7 @@ _e_fm2_icon_thumb_edje_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb cb, v } static Eina_Bool -_e_fm2_icon_cache_update(void *data, int type __UNUSED__, void *event __UNUSED__) +_e_fm2_icon_cache_update(void *data, int type EINA_UNUSED, void *event EINA_UNUSED) { _e_fm2_icons_update_helper(data, EINA_TRUE); return ECORE_CALLBACK_RENEW; @@ -2103,7 +2103,7 @@ _e_fm2_icon_mime_fdo_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_ret } static Evas_Object * -_e_fm2_icon_mime_theme_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_ret __UNUSED__) +_e_fm2_icon_mime_theme_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_ret EINA_UNUSED) { char buf[1024]; const char *file; @@ -2132,7 +2132,7 @@ _e_fm2_icon_mime_theme_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_r * Use mime type information to set icon. */ static Evas_Object * -_e_fm2_icon_mime_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_func __UNUSED__, void *data __UNUSED__, int force_gen __UNUSED__, const char **type_ret) +_e_fm2_icon_mime_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_func EINA_UNUSED, void *data EINA_UNUSED, int force_gen EINA_UNUSED, const char **type_ret) { Evas_Object *o = NULL; @@ -2521,7 +2521,7 @@ _e_fm2_client_file_trash(const char *path, Evas_Object *e_fm) } static int -_e_fm2_client_file_mkdir(const char *path, const char *rel, int rel_to, int x, int y, int res_w __UNUSED__, int res_h __UNUSED__, Evas_Object *e_fm) +_e_fm2_client_file_mkdir(const char *path, const char *rel, int rel_to, int x, int y, int res_w EINA_UNUSED, int res_h EINA_UNUSED, Evas_Object *e_fm) { char *d; int l1, l2, l, id; @@ -3695,7 +3695,7 @@ _e_fm2_file_symlink(Evas_Object *obj) } static void -_e_fm2_file_cut_menu(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_file_cut_menu(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Smart_Data *sd = data; if (!sd) return; @@ -3703,7 +3703,7 @@ _e_fm2_file_cut_menu(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED_ } static void -_e_fm2_file_copy_menu(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_file_copy_menu(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Smart_Data *sd = data; if (!sd) return; @@ -3711,7 +3711,7 @@ _e_fm2_file_copy_menu(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED } static void -_e_fm2_file_paste_menu(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_file_paste_menu(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Smart_Data *sd = data; if (!sd) return; @@ -3719,7 +3719,7 @@ _e_fm2_file_paste_menu(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSE } static void -_e_fm2_file_symlink_menu(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_file_symlink_menu(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Smart_Data *sd = data; if (!sd) return; @@ -4562,7 +4562,7 @@ _e_fm2_icon_unfill(E_Fm2_Icon *ic) } static void -_e_fm2_icon_geom_adjust(E_Fm2_Icon *ic, int saved_x, int saved_y, int saved_w __UNUSED__, int saved_h __UNUSED__, int saved_res_w, int saved_res_h) +_e_fm2_icon_geom_adjust(E_Fm2_Icon *ic, int saved_x, int saved_y, int saved_w EINA_UNUSED, int saved_h EINA_UNUSED, int saved_res_w, int saved_res_h) { int qx, qy, rx, ry, x, y; @@ -4820,7 +4820,7 @@ _e_fm2_icon_free(E_Fm2_Icon *ic) } static void -_e_fm2_icon_label_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_fm2_icon_label_click(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Fm2_Icon *ic = data; if (ic->entry_widget || ic->entry_dialog) return; @@ -5139,7 +5139,7 @@ e_fm2_desktop_url_eval(const char *val) } static void -_e_fm2_cb_eio_stat(void *data, Eio_File *handler __UNUSED__, const Eina_Stat *st) +_e_fm2_cb_eio_stat(void *data, Eio_File *handler EINA_UNUSED, const Eina_Stat *st) { E_Fm2_Icon *ic = data; ic->eio = NULL; @@ -5162,7 +5162,7 @@ _e_fm2_cb_eio_stat(void *data, Eio_File *handler __UNUSED__, const Eina_Stat *st } static void -_e_fm2_cb_eio_err(void *data, Eio_File *handler __UNUSED__, int error __UNUSED__) +_e_fm2_cb_eio_err(void *data, Eio_File *handler EINA_UNUSED, int error EINA_UNUSED) { E_Fm2_Icon *ic = data; ic->eio = NULL; @@ -6451,7 +6451,7 @@ _e_fm2_cb_dnd_move(void *data, const char *type, void *event) } static void -_e_fm2_cb_dnd_leave(void *data, const char *type, void *event __UNUSED__) +_e_fm2_cb_dnd_leave(void *data, const char *type, void *event EINA_UNUSED) { E_Fm2_Smart_Data *sd; @@ -6564,7 +6564,7 @@ _e_fm_drop_menu_queue(Evas_Object *e_fm, void *args, int op) } static void -_e_fm_drop_menu_copy_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm_drop_menu_copy_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { char *args; @@ -6575,7 +6575,7 @@ _e_fm_drop_menu_copy_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUS } static void -_e_fm_drop_menu_move_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm_drop_menu_move_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { char *args; @@ -6586,7 +6586,7 @@ _e_fm_drop_menu_move_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUS } static void -_e_fm_drop_menu_symlink_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm_drop_menu_symlink_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { char *args; @@ -6597,7 +6597,7 @@ _e_fm_drop_menu_symlink_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __U } static void -_e_fm_drop_menu_abort_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm_drop_menu_abort_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { free(evas_object_data_del(data, "drop_menu_data")); } @@ -7290,7 +7290,7 @@ _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, void *evas_event) } static void -_e_fm2_cb_icon_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_fm2_cb_icon_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; E_Fm2_Icon *ic; @@ -7347,7 +7347,7 @@ _e_fm2_cb_icon_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU } static void -_e_fm2_cb_icon_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_fm2_cb_icon_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Up *ev = event_info; E_Fm2_Icon *ic = data; @@ -7384,7 +7384,7 @@ _e_fm2_cb_drag_finished_show(E_Fm2_Icon *ic) } static void -_e_fm2_cb_drag_finished(E_Drag *drag, int dropped __UNUSED__) +_e_fm2_cb_drag_finished(E_Drag *drag, int dropped EINA_UNUSED) { E_Fm2_Uri *uri; const char *p; @@ -7509,7 +7509,7 @@ _e_fm_drag_key_up_cb(E_Drag *drag, Ecore_Event_Key *e) } static void -_e_fm2_cb_icon_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_fm2_cb_icon_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_In *ev; E_Fm2_Icon *ic; @@ -7523,7 +7523,7 @@ _e_fm2_cb_icon_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE } static void -_e_fm2_cb_icon_mouse_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_fm2_cb_icon_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Out *ev; E_Fm2_Icon *ic; @@ -7536,7 +7536,7 @@ _e_fm2_cb_icon_mouse_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS } static void -_e_fm2_cb_icon_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_fm2_cb_icon_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev; E_Fm2_Icon *ic; @@ -7706,7 +7706,7 @@ _e_fm2_cb_icon_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU } static void -_e_fm2_cb_icon_thumb_dnd_gen(void *data, Evas_Object *obj, void *event_info __UNUSED__) +_e_fm2_cb_icon_thumb_dnd_gen(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) { Evas_Object *o; Evas_Coord w = 0, h = 0; @@ -7728,7 +7728,7 @@ _e_fm2_cb_icon_thumb_dnd_gen(void *data, Evas_Object *obj, void *event_info __UN } static void -_e_fm2_cb_icon_thumb_gen(void *data, Evas_Object *obj, void *event_info __UNUSED__) +_e_fm2_cb_icon_thumb_gen(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) { E_Fm2_Icon *ic; const char *file; @@ -7768,7 +7768,7 @@ _e_fm2_cb_icon_thumb_gen(void *data, Evas_Object *obj, void *event_info __UNUSED } static void -_e_fm2_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) +_e_fm2_cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info) { Evas_Event_Key_Down *ev = event_info; E_Fm2_Smart_Data *sd = data; @@ -7972,7 +7972,7 @@ _e_fm2_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event } static void -_e_fm2_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_fm2_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; E_Fm2_Smart_Data *sd; @@ -8040,7 +8040,7 @@ _e_fm2_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__ } static void -_e_fm2_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_fm2_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Fm2_Smart_Data *sd; @@ -8053,7 +8053,7 @@ _e_fm2_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, } static void -_e_fm2_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_fm2_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev; E_Fm2_Smart_Data *sd; @@ -8390,7 +8390,7 @@ _e_fm2_cb_sort_idler(void *data) } static Eina_Bool -_e_fm2_cb_theme(void *data, int type __UNUSED__, void *event __UNUSED__) +_e_fm2_cb_theme(void *data, int type EINA_UNUSED, void *event EINA_UNUSED) { e_fm2_refresh(data); return ECORE_CALLBACK_RENEW; @@ -8724,7 +8724,7 @@ _e_fm2_smart_clip_unset(Evas_Object *obj) } static void -_e_fm2_overlay_clip_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_fm2_overlay_clip_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { E_Fm2_Smart_Data *sd = data; int w, h; @@ -8734,7 +8734,7 @@ _e_fm2_overlay_clip_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, voi } static void -_e_fm2_overlay_clip_move(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_fm2_overlay_clip_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { E_Fm2_Smart_Data *sd = data; int x, y; @@ -8744,7 +8744,7 @@ _e_fm2_overlay_clip_move(void *data, Evas *e __UNUSED__, Evas_Object *obj, void } static void -_e_fm2_view_menu_sorting_change_case(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_fm2_view_menu_sorting_change_case(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Fm2_Smart_Data *sd = data; @@ -8753,7 +8753,7 @@ _e_fm2_view_menu_sorting_change_case(void *data, E_Menu *m __UNUSED__, E_Menu_It } static void -_e_fm2_view_menu_sorting_change_size(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_fm2_view_menu_sorting_change_size(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Fm2_Smart_Data *sd = data; @@ -8762,7 +8762,7 @@ _e_fm2_view_menu_sorting_change_size(void *data, E_Menu *m __UNUSED__, E_Menu_It } static void -_e_fm2_view_menu_sorting_change_mtime(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_fm2_view_menu_sorting_change_mtime(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Fm2_Smart_Data *sd = data; @@ -8771,7 +8771,7 @@ _e_fm2_view_menu_sorting_change_mtime(void *data, E_Menu *m __UNUSED__, E_Menu_I } static void -_e_fm2_view_menu_sorting_change_extension(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_fm2_view_menu_sorting_change_extension(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Fm2_Smart_Data *sd = data; @@ -8780,7 +8780,7 @@ _e_fm2_view_menu_sorting_change_extension(void *data, E_Menu *m __UNUSED__, E_Me } static void -_e_fm2_view_menu_sorting_change_dirs_first(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_fm2_view_menu_sorting_change_dirs_first(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Fm2_Smart_Data *sd = data; @@ -8791,7 +8791,7 @@ _e_fm2_view_menu_sorting_change_dirs_first(void *data, E_Menu *m __UNUSED__, E_M } static void -_e_fm2_view_menu_sorting_change_dirs_last(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_fm2_view_menu_sorting_change_dirs_last(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Fm2_Smart_Data *sd = data; @@ -8802,7 +8802,7 @@ _e_fm2_view_menu_sorting_change_dirs_last(void *data, E_Menu *m __UNUSED__, E_Me } static void -_e_fm2_view_menu_sorting_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_fm2_view_menu_sorting_pre(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Fm2_Smart_Data *sd = data; E_Menu *subm; @@ -8985,7 +8985,7 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp) } static void -_e_fm2_menu_post_cb(void *data, E_Menu *m __UNUSED__) +_e_fm2_menu_post_cb(void *data, E_Menu *m EINA_UNUSED) { E_Fm2_Smart_Data *sd; @@ -9371,7 +9371,7 @@ _e_fm2_context_list_sort(const void *data1, const void *data2) } static void -_e_fm2_icon_menu_post_cb(void *data, E_Menu *m __UNUSED__) +_e_fm2_icon_menu_post_cb(void *data, E_Menu *m EINA_UNUSED) { E_Fm2_Context_Menu_Data *md; E_Fm2_Icon *ic; @@ -9383,7 +9383,7 @@ _e_fm2_icon_menu_post_cb(void *data, E_Menu *m __UNUSED__) } static void -_e_fm2_icon_menu_item_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_icon_menu_item_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Context_Menu_Data *md = NULL; Evas_Object *obj = NULL; @@ -9451,7 +9451,7 @@ _e_fm2_view_menu_icon_size_use_default(void *data, E_Menu *m, E_Menu_Item *mi) } static void -_e_fm2_view_menu_icon_size_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_fm2_view_menu_icon_size_pre(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Fm2_Smart_Data *sd = data; E_Menu *subm; @@ -9591,7 +9591,7 @@ _e_fm2_icon_view_menu_pre(void *data, E_Menu *subm) } static void -_e_fm2_new_dir_notify(void *data, Ecore_Thread *eth __UNUSED__, char *filename) +_e_fm2_new_dir_notify(void *data, Ecore_Thread *eth EINA_UNUSED, char *filename) { E_Fm2_Smart_Data *sd = data; @@ -9606,7 +9606,7 @@ _e_fm2_new_dir_notify(void *data, Ecore_Thread *eth __UNUSED__, char *filename) } static void -_e_fm2_new_file_notify(void *data, Ecore_Thread *eth __UNUSED__, char *filename) +_e_fm2_new_file_notify(void *data, Ecore_Thread *eth EINA_UNUSED, char *filename) { E_Fm2_Smart_Data *sd = data; @@ -9711,19 +9711,19 @@ error: } static void -_e_fm2_new_file_thread(void *data __UNUSED__, Ecore_Thread *eth) +_e_fm2_new_file_thread(void *data EINA_UNUSED, Ecore_Thread *eth) { _e_fm2_new_thread_helper(eth, EINA_FALSE); } static void -_e_fm2_new_dir_thread(void *data __UNUSED__, Ecore_Thread *eth) +_e_fm2_new_dir_thread(void *data EINA_UNUSED, Ecore_Thread *eth) { _e_fm2_new_thread_helper(eth, EINA_TRUE); } static void -_e_fm2_new_file_end(void *data, Ecore_Thread *eth __UNUSED__) +_e_fm2_new_file_end(void *data, Ecore_Thread *eth EINA_UNUSED) { E_Fm2_Smart_Data *sd = data; sd->new_file.thread = NULL; @@ -9734,7 +9734,7 @@ _e_fm2_new_file_end(void *data, Ecore_Thread *eth __UNUSED__) } static void -_e_fm2_new_file_cancel(void *data, Ecore_Thread *eth __UNUSED__) +_e_fm2_new_file_cancel(void *data, Ecore_Thread *eth EINA_UNUSED) { E_Fm2_Smart_Data *sd = data; sd->new_file.thread = NULL; @@ -9744,7 +9744,7 @@ _e_fm2_new_file_cancel(void *data, Ecore_Thread *eth __UNUSED__) } static void -_e_fm2_new_file(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_new_file(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Smart_Data *sd = data; @@ -9765,7 +9765,7 @@ _e_fm2_new_file(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) } static void -_e_fm2_new_directory(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_new_directory(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Smart_Data *sd = data; @@ -9806,13 +9806,13 @@ _e_fm2_add_menu_pre(void *data, E_Menu *subm) } static void -_e_fm2_settings_icon_item(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_settings_icon_item(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_configure_registry_call("fileman/file_icons", NULL, NULL); } static void -_e_fm2_settings_item(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_settings_item(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_configure_registry_call("fileman/fileman", NULL, NULL); } @@ -9936,7 +9936,7 @@ _e_fm2_view_menu_del(void *data) } static void -_clear_background_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_clear_background_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Smart_Data *sd; @@ -9948,7 +9948,7 @@ _clear_background_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED_ } static void -_clear_overlay_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_clear_overlay_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Smart_Data *sd = data; @@ -10190,7 +10190,7 @@ _set_background_cb(void *data, E_Dialog *dia) } static void -_e_fm2_view_menu_set_background_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_view_menu_set_background_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Smart_Data *sd = data; @@ -10218,7 +10218,7 @@ _set_overlay_cb(void *data, E_Dialog *dia) } static void -_e_fm2_view_menu_set_overlay_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_view_menu_set_overlay_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Smart_Data *sd = data; @@ -10228,7 +10228,7 @@ _e_fm2_view_menu_set_overlay_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *m } static void -_e_fm2_refresh(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_refresh(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Smart_Data *sd; @@ -10253,7 +10253,7 @@ _e_fm2_toggle_hidden_files(void *data, E_Menu *m, E_Menu_Item *mi) } static void -_e_fm2_toggle_secure_rm(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_toggle_secure_rm(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Smart_Data *sd = data; @@ -10261,7 +10261,7 @@ _e_fm2_toggle_secure_rm(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUS } static void -_e_fm2_toggle_single_click(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_toggle_single_click(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Smart_Data *sd; @@ -10306,7 +10306,7 @@ _e_fm2_sort(void *data, E_Menu *m, E_Menu_Item *mi) } static void -_e_fm2_file_rename(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_file_rename(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Icon *ic; char text[PATH_MAX + 256]; @@ -10398,7 +10398,7 @@ _e_fm2_icon_entry_widget_del(E_Fm2_Icon *ic) } static void -_e_fm2_icon_entry_widget_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_fm2_icon_entry_widget_cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Key_Down *ev; E_Fm2_Icon *ic; @@ -10538,7 +10538,7 @@ _e_fm_retry_abort_dialog(int pid, const char *str) } static void -_e_fm_retry_abort_retry_cb(void *data __UNUSED__, E_Dialog *dialog) +_e_fm_retry_abort_retry_cb(void *data EINA_UNUSED, E_Dialog *dialog) { int id = (int)(intptr_t)E_OBJECT(dialog)->data; _e_fm2_op_registry_go_on(id); @@ -10547,7 +10547,7 @@ _e_fm_retry_abort_retry_cb(void *data __UNUSED__, E_Dialog *dialog) } static void -_e_fm_retry_abort_abort_cb(void *data __UNUSED__, E_Dialog *dialog) +_e_fm_retry_abort_abort_cb(void *data EINA_UNUSED, E_Dialog *dialog) { int id = (int)(intptr_t)E_OBJECT(dialog)->data; _e_fm2_op_registry_aborted(id); @@ -10600,7 +10600,7 @@ _e_fm_overwrite_dialog(int pid, const char *str) } static void -_e_fm_overwrite_no_cb(void *data __UNUSED__, E_Dialog *dialog) +_e_fm_overwrite_no_cb(void *data EINA_UNUSED, E_Dialog *dialog) { int id = (int)(intptr_t)E_OBJECT(dialog)->data; _e_fm2_op_registry_go_on(id); @@ -10609,7 +10609,7 @@ _e_fm_overwrite_no_cb(void *data __UNUSED__, E_Dialog *dialog) } static void -_e_fm_overwrite_no_all_cb(void *data __UNUSED__, E_Dialog *dialog) +_e_fm_overwrite_no_all_cb(void *data EINA_UNUSED, E_Dialog *dialog) { int id = (int)(intptr_t)E_OBJECT(dialog)->data; _e_fm2_op_registry_go_on(id); @@ -10666,7 +10666,7 @@ _e_fm_overwrite_rename_yes_cb(void *data, char *text) } static void -_e_fm_overwrite_rename(void *data __UNUSED__, E_Dialog *dialog) +_e_fm_overwrite_rename(void *data EINA_UNUSED, E_Dialog *dialog) { char text[PATH_MAX + 256]; int id = (int)(intptr_t)E_OBJECT(dialog)->data; @@ -10693,7 +10693,7 @@ _e_fm_overwrite_rename(void *data __UNUSED__, E_Dialog *dialog) } static void -_e_fm_overwrite_yes_cb(void *data __UNUSED__, E_Dialog *dialog) +_e_fm_overwrite_yes_cb(void *data EINA_UNUSED, E_Dialog *dialog) { int id = (int)(intptr_t)E_OBJECT(dialog)->data; _e_fm2_op_registry_go_on(id); @@ -10702,7 +10702,7 @@ _e_fm_overwrite_yes_cb(void *data __UNUSED__, E_Dialog *dialog) } static void -_e_fm_overwrite_yes_all_cb(void *data __UNUSED__, E_Dialog *dialog) +_e_fm_overwrite_yes_all_cb(void *data EINA_UNUSED, E_Dialog *dialog) { int id = (int)(intptr_t)E_OBJECT(dialog)->data; _e_fm2_op_registry_go_on(id); @@ -10768,7 +10768,7 @@ _e_fm_error_dialog(int pid, const char *str) } static void -_e_fm_error_retry_cb(void *data __UNUSED__, E_Dialog *dialog) +_e_fm_error_retry_cb(void *data EINA_UNUSED, E_Dialog *dialog) { int id = (int)(intptr_t)E_OBJECT(dialog)->data; _e_fm2_op_registry_go_on(id); @@ -10777,7 +10777,7 @@ _e_fm_error_retry_cb(void *data __UNUSED__, E_Dialog *dialog) } static void -_e_fm_error_abort_cb(void *data __UNUSED__, E_Dialog *dialog) +_e_fm_error_abort_cb(void *data EINA_UNUSED, E_Dialog *dialog) { int id = (int)(intptr_t)E_OBJECT(dialog)->data; _e_fm2_op_registry_aborted(id); @@ -10827,7 +10827,7 @@ _e_fm_error_link_source(void *data, E_Dialog *dialog) } static void -_e_fm_error_ignore_this_cb(void *data __UNUSED__, E_Dialog *dialog) +_e_fm_error_ignore_this_cb(void *data EINA_UNUSED, E_Dialog *dialog) { int id = (int)(intptr_t)E_OBJECT(dialog)->data; _e_fm2_op_registry_go_on(id); @@ -10836,7 +10836,7 @@ _e_fm_error_ignore_this_cb(void *data __UNUSED__, E_Dialog *dialog) } static void -_e_fm_error_ignore_all_cb(void *data __UNUSED__, E_Dialog *dialog) +_e_fm_error_ignore_all_cb(void *data EINA_UNUSED, E_Dialog *dialog) { int id = (int)(intptr_t)E_OBJECT(dialog)->data; _e_fm2_op_registry_go_on(id); @@ -10872,7 +10872,7 @@ _e_fm_device_error_dialog(const char *title, const char *msg, const char *pstr) } static void -_e_fm2_file_application_properties(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_file_application_properties(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { Efreet_Desktop *desktop; E_Fm2_Icon *ic; @@ -10887,7 +10887,7 @@ _e_fm2_file_application_properties(void *data, E_Menu *m __UNUSED__, E_Menu_Item } static void -_e_fm2_file_properties(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_file_properties(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Icon *ic; @@ -10910,7 +10910,7 @@ _e_fm2_file_properties_delete_cb(void *obj) } static void -_e_fm2_file_delete_menu(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_file_delete_menu(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fm2_Icon *ic = data; if ((!ic) || (!ic->sd)) return; @@ -11062,7 +11062,7 @@ _e_fm2_file_delete_no_cb(void *data, E_Dialog *dialog) } static Eina_Bool -_e_fm2_sys_suspend_hibernate(void *d __UNUSED__, int type __UNUSED__, void *ev __UNUSED__) +_e_fm2_sys_suspend_hibernate(void *d EINA_UNUSED, int type EINA_UNUSED, void *ev EINA_UNUSED) { Eina_List *l, *ll, *lll; E_Volume *v; @@ -11388,7 +11388,7 @@ _e_fm2_theme_edje_icon_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const ch } static void -_e_fm2_volume_mount(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_volume_mount(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Volume *v; const char *mp; @@ -11402,7 +11402,7 @@ _e_fm2_volume_mount(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__ } static void -_e_fm2_volume_unmount(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_volume_unmount(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Volume *v; @@ -11414,7 +11414,7 @@ _e_fm2_volume_unmount(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED } static void -_e_fm2_volume_eject(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fm2_volume_eject(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Volume *v; diff --git a/src/bin/e_fm/e_fm_ipc.c b/src/bin/e_fm/e_fm_ipc.c index 8348afdf38..b390d9c066 100644 --- a/src/bin/e_fm/e_fm_ipc.c +++ b/src/bin/e_fm/e_fm_ipc.c @@ -190,7 +190,7 @@ _e_fm_ipc_init(void) } static Eina_Bool -_e_fm_ipc_cb_server_add(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_fm_ipc_cb_server_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Ipc_Event_Server_Add *e; @@ -203,7 +203,7 @@ _e_fm_ipc_cb_server_add(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_fm_ipc_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_e_fm_ipc_cb_server_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { /* quit now */ ecore_main_loop_quit(); @@ -485,7 +485,7 @@ _e_fm_ipc_mkdir_try(E_Fm_Task *task) } static void -_e_fm_ipc_mkdir(int id, const char *src, const char *rel, int rel_to __UNUSED__, int x, int y) +_e_fm_ipc_mkdir(int id, const char *src, const char *rel, int rel_to EINA_UNUSED, int x, int y) { E_Fm_Task *task; @@ -540,7 +540,7 @@ _e_fm_ipc_handle_error_response(int id, E_Fm_Op_Type type) } static Eina_Bool -_e_fm_ipc_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_fm_ipc_cb_server_data(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Ipc_Event_Server_Data *e; @@ -821,7 +821,7 @@ _e_fm_ipc_slave_send(E_Fm_Slave *slave, E_Fm_Op_Type type, void *data, int size) } Eina_Bool -_e_fm_ipc_slave_data_cb(void *data, int type __UNUSED__, void *event) +_e_fm_ipc_slave_data_cb(void *data, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Data *e = event; E_Fm_Slave *slave; @@ -876,7 +876,7 @@ _e_fm_ipc_slave_data_cb(void *data, int type __UNUSED__, void *event) } Eina_Bool -_e_fm_ipc_slave_error_cb(void *data, int type __UNUSED__, void *event) +_e_fm_ipc_slave_error_cb(void *data, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Data *e = event; E_Fm_Slave *slave; @@ -894,7 +894,7 @@ _e_fm_ipc_slave_error_cb(void *data, int type __UNUSED__, void *event) } Eina_Bool -_e_fm_ipc_slave_del_cb(void *data, int type __UNUSED__, void *event) +_e_fm_ipc_slave_del_cb(void *data, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Del *e = event; E_Fm_Slave *slave; @@ -916,7 +916,7 @@ _e_fm_ipc_slave_del_cb(void *data, int type __UNUSED__, void *event) } static void -_e_fm_ipc_cb_file_monitor(void *data __UNUSED__, Ecore_File_Monitor *em __UNUSED__, Ecore_File_Event event, const char *path) +_e_fm_ipc_cb_file_monitor(void *data EINA_UNUSED, Ecore_File_Monitor *em EINA_UNUSED, Ecore_File_Event event, const char *path) { E_Dir *ed; char *dir, *rp, *drp; @@ -1368,7 +1368,7 @@ _e_fm_ipc_prepare_command(E_Fm_Op_Type type, const char *args) } static Eina_Bool -_e_fm_ipc_timer_cb(void *d __UNUSED__) +_e_fm_ipc_timer_cb(void *d EINA_UNUSED) { ecore_ipc_server_send(_e_fm_ipc_server, 6 /*E_IPC_DOMAIN_FM*/, diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c index 4841175f69..bc862465ce 100644 --- a/src/bin/e_fm/e_fm_main_eeze.c +++ b/src/bin/e_fm/e_fm_main_eeze.c @@ -162,8 +162,8 @@ _e_fm_main_eeze_vol_mount_timeout(E_Volume *v) } static Eina_Bool -_e_fm_main_eeze_cb_vol_mounted(void *user_data __UNUSED__, - int type __UNUSED__, +_e_fm_main_eeze_cb_vol_mounted(void *user_data EINA_UNUSED, + int type EINA_UNUSED, Eeze_Event_Disk_Mount *ev) { E_Volume *v; @@ -214,8 +214,8 @@ _e_fm_main_eeze_vol_unmount_timeout(E_Volume *v) } static Eina_Bool -_e_fm_main_eeze_cb_vol_error(void *user_data __UNUSED__, - int type __UNUSED__, +_e_fm_main_eeze_cb_vol_error(void *user_data EINA_UNUSED, + int type EINA_UNUSED, Eeze_Event_Disk_Error *ev) { E_Volume *v; @@ -242,8 +242,8 @@ _e_fm_main_eeze_cb_vol_error(void *user_data __UNUSED__, } static Eina_Bool -_e_fm_main_eeze_cb_vol_unmounted(void *user_data __UNUSED__, - int type __UNUSED__, +_e_fm_main_eeze_cb_vol_unmounted(void *user_data EINA_UNUSED, + int type EINA_UNUSED, Eeze_Event_Disk_Unmount *ev) { char *buf; @@ -291,8 +291,8 @@ _e_fm_main_eeze_vol_eject_timeout(E_Volume *v) } static Eina_Bool -_e_fm_main_eeze_cb_vol_ejected(void *user_data __UNUSED__, - int type __UNUSED__, +_e_fm_main_eeze_cb_vol_ejected(void *user_data EINA_UNUSED, + int type EINA_UNUSED, Eeze_Event_Disk_Eject *ev) { E_Volume *v; @@ -594,7 +594,7 @@ eet_setup(void) EEZE_SCANNER_EDD_SETUP(es_edd); } static Eina_Bool -_scanner_poll(void *data __UNUSED__) +_scanner_poll(void *data EINA_UNUSED) { if (svr) return EINA_FALSE; svr = ecore_con_server_connect(ECORE_CON_LOCAL_SYSTEM, "eeze_scanner", 0, NULL); @@ -603,7 +603,7 @@ _scanner_poll(void *data __UNUSED__) } static Eina_Bool -_scanner_add(void *data, int type __UNUSED__, Ecore_Exe_Event_Add *ev) +_scanner_add(void *data, int type EINA_UNUSED, Ecore_Exe_Event_Add *ev) { if (data != ecore_exe_data_get(ev->exe)) return ECORE_CALLBACK_PASS_ON; INF("Scanner started"); @@ -613,7 +613,7 @@ _scanner_add(void *data, int type __UNUSED__, Ecore_Exe_Event_Add *ev) } static Eina_Bool -_scanner_del(void *data, int type __UNUSED__, Ecore_Exe_Event_Del *ev) +_scanner_del(void *data, int type EINA_UNUSED, Ecore_Exe_Event_Del *ev) { if (data != ecore_exe_data_get(ev->exe)) return ECORE_CALLBACK_PASS_ON; if (!svr) @@ -633,7 +633,7 @@ _scanner_del(void *data, int type __UNUSED__, Ecore_Exe_Event_Del *ev) } static Eina_Bool -_scanner_read(const void *data, size_t size, void *d __UNUSED__) +_scanner_read(const void *data, size_t size, void *d EINA_UNUSED) { Eeze_Scanner_Event *ev = NULL; @@ -660,7 +660,7 @@ _scanner_read(const void *data, size_t size, void *d __UNUSED__) } static Eina_Bool -_scanner_write(const void *eet_data __UNUSED__, size_t size __UNUSED__, void *user_data __UNUSED__) +_scanner_write(const void *eet_data EINA_UNUSED, size_t size EINA_UNUSED, void *user_data EINA_UNUSED) { return EINA_TRUE; } @@ -678,7 +678,7 @@ _scanner_run(void) static Eina_Bool -_scanner_con(void *data __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Server_Del *ev __UNUSED__) +_scanner_con(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Server_Del *ev EINA_UNUSED) { _e_fm_main_catch(EFM_MODE_USING_EEZE_MOUNT); E_FREE_FUNC(scanner_poller, ecore_poller_del); @@ -688,7 +688,7 @@ _scanner_con(void *data __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Server_ } static Eina_Bool -_scanner_disc(void *data __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Server_Del *ev __UNUSED__) +_scanner_disc(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Server_Del *ev EINA_UNUSED) { INF("Scanner disconnected"); if (!_scanner_poll(NULL)) @@ -697,14 +697,14 @@ _scanner_disc(void *data __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Server } static Eina_Bool -_scanner_err(void *data __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Server_Error *ev __UNUSED__) +_scanner_err(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Server_Error *ev EINA_UNUSED) { INF("Scanner connection error"); return ECORE_CALLBACK_RENEW; } static Eina_Bool -_scanner_data(void *data __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Server_Data *ev) +_scanner_data(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Con_Event_Server_Data *ev) { eet_connection_received(es_con, ev->data, ev->size); return ECORE_CALLBACK_RENEW; diff --git a/src/bin/e_fm/e_fm_main_udisks.c b/src/bin/e_fm/e_fm_main_udisks.c index 0665685706..a4592bf3f5 100644 --- a/src/bin/e_fm/e_fm_main_udisks.c +++ b/src/bin/e_fm/e_fm_main_udisks.c @@ -95,8 +95,8 @@ static E_Volume *_volume_find_by_dbus_path(const char *path); static void _volume_del(E_Volume *v); static void -_e_fm_main_udisks_name_start(void *data __UNUSED__, const Eldbus_Message *msg, - Eldbus_Pending *pending __UNUSED__) +_e_fm_main_udisks_name_start(void *data EINA_UNUSED, const Eldbus_Message *msg, + Eldbus_Pending *pending EINA_UNUSED) { unsigned flag = 0; Eldbus_Object *obj; @@ -120,8 +120,8 @@ _e_fm_main_udisks_name_start(void *data __UNUSED__, const Eldbus_Message *msg, } static void -_e_fm_main_udisks_cb_dev_all(void *data __UNUSED__, const Eldbus_Message *msg, - Eldbus_Pending *pending __UNUSED__) +_e_fm_main_udisks_cb_dev_all(void *data EINA_UNUSED, const Eldbus_Message *msg, + Eldbus_Pending *pending EINA_UNUSED) { const char *name, *txt, *path; Eldbus_Message_Iter *array; @@ -154,7 +154,7 @@ _e_fm_main_udisks_cb_dev_all(void *data __UNUSED__, const Eldbus_Message *msg, static void _e_fm_main_udisks_cb_dev_verify(void *data, const Eldbus_Message *msg, - Eldbus_Pending *pending __UNUSED__) + Eldbus_Pending *pending EINA_UNUSED) { const char *name, *txt, *id_usage, *path = data; Eldbus_Message_Iter *variant; @@ -190,7 +190,7 @@ error: static void _e_fm_main_udisks_cb_dev_verify_added(void *data, const Eldbus_Message *msg, - Eldbus_Pending *pending __UNUSED__) + Eldbus_Pending *pending EINA_UNUSED) { const char *name, *txt, *id_usage, *path = data; Eldbus_Message_Iter *variant; @@ -242,7 +242,7 @@ error: } static void -_e_fm_main_udisks_cb_dev_add(void *data __UNUSED__, const Eldbus_Message *msg) +_e_fm_main_udisks_cb_dev_add(void *data EINA_UNUSED, const Eldbus_Message *msg) { Eldbus_Message *new; E_Volume *v; @@ -267,7 +267,7 @@ _e_fm_main_udisks_cb_dev_add(void *data __UNUSED__, const Eldbus_Message *msg) } static void -_e_fm_main_udisks_cb_dev_del(void *data __UNUSED__, const Eldbus_Message *msg) +_e_fm_main_udisks_cb_dev_del(void *data EINA_UNUSED, const Eldbus_Message *msg) { char *path; E_Volume *v; @@ -286,7 +286,7 @@ _e_fm_main_udisks_cb_dev_del(void *data __UNUSED__, const Eldbus_Message *msg) static void _e_fm_main_udisks_cb_prop_modified(void *data, - const Eldbus_Message *msg __UNUSED__) + const Eldbus_Message *msg EINA_UNUSED) { E_Volume *v = data; eldbus_proxy_property_get_all(v->proxy, _e_fm_main_udisks_cb_vol_prop, v); @@ -302,7 +302,7 @@ _storage_del(void *data) static void _e_fm_main_udisks_cb_store_prop(void *data, const Eldbus_Message *msg, - Eldbus_Pending *pending __UNUSED__) + Eldbus_Pending *pending EINA_UNUSED) { E_Storage *s = data; const char *name, *txt; @@ -451,7 +451,7 @@ _idler_volume_del(void *data) static void _e_fm_main_udisks_cb_vol_prop(void *data, const Eldbus_Message *msg, - Eldbus_Pending *pending __UNUSED__) + Eldbus_Pending *pending EINA_UNUSED) { E_Volume *v = data; E_Storage *s = NULL; @@ -821,8 +821,8 @@ _e_fm_main_udisks_vol_eject_timeout(E_Volume *v) } static void -_volume_task_cb(void *data __UNUSED__, const Eldbus_Message *msg __UNUSED__, - Eldbus_Pending *pending __UNUSED__) +_volume_task_cb(void *data EINA_UNUSED, const Eldbus_Message *msg EINA_UNUSED, + Eldbus_Pending *pending EINA_UNUSED) { /** * if eldbus_proxy_send has callback == NULL it will return a NULL diff --git a/src/bin/e_fm/e_fm_main_udisks2.c b/src/bin/e_fm/e_fm_main_udisks2.c index 2a10a6ff54..5431bc3d75 100644 --- a/src/bin/e_fm/e_fm_main_udisks2.c +++ b/src/bin/e_fm/e_fm_main_udisks2.c @@ -128,8 +128,8 @@ _util_fuckyouglib_convert(Eldbus_Message_Iter *fuckyouglib) } static void -_e_fm_main_udisks2_name_start(void *data __UNUSED__, const Eldbus_Message *msg, - Eldbus_Pending *pending __UNUSED__) +_e_fm_main_udisks2_name_start(void *data EINA_UNUSED, const Eldbus_Message *msg, + Eldbus_Pending *pending EINA_UNUSED) { unsigned flag = 0; Eldbus_Object *obj; @@ -410,8 +410,8 @@ out: } static void -_e_fm_main_udisks2_cb_dev_all(void *data __UNUSED__, const Eldbus_Message *msg, - Eldbus_Pending *pending __UNUSED__) +_e_fm_main_udisks2_cb_dev_all(void *data EINA_UNUSED, const Eldbus_Message *msg, + Eldbus_Pending *pending EINA_UNUSED) { const char *name, *txt; Eldbus_Message_Iter *arr1, *dict1; @@ -461,7 +461,7 @@ _e_fm_main_udisks2_cb_vol_props(void *data, const Eldbus_Message *msg, Eldbus_Pe } static void -_e_fm_main_udisks2_cb_dev_add(void *data __UNUSED__, const Eldbus_Message *msg) +_e_fm_main_udisks2_cb_dev_add(void *data EINA_UNUSED, const Eldbus_Message *msg) { const char *interface; @@ -539,7 +539,7 @@ _e_fm_main_udisks2_cb_dev_add(void *data __UNUSED__, const Eldbus_Message *msg) } static void -_e_fm_main_udisks2_cb_dev_del(void *data __UNUSED__, const Eldbus_Message *msg) +_e_fm_main_udisks2_cb_dev_del(void *data EINA_UNUSED, const Eldbus_Message *msg) { char *path, *interface; Eldbus_Message_Iter *arr; diff --git a/src/bin/e_fm_cmdline.c b/src/bin/e_fm_cmdline.c index f2c77f0e7b..0d51faa2c4 100644 --- a/src/bin/e_fm_cmdline.c +++ b/src/bin/e_fm_cmdline.c @@ -17,8 +17,8 @@ static int retval = EXIT_SUCCESS; static int pending = 0; static void -fm_open_reply(void *data __UNUSED__, const Eldbus_Message *msg, - Eldbus_Pending *dbus_pending __UNUSED__) +fm_open_reply(void *data EINA_UNUSED, const Eldbus_Message *msg, + Eldbus_Pending *dbus_pending EINA_UNUSED) { const char *name, *txt; if (eldbus_message_error_get(msg, &name, &txt)) @@ -32,7 +32,7 @@ fm_open_reply(void *data __UNUSED__, const Eldbus_Message *msg, } static Eina_Bool -fm_error_quit_last(void *data __UNUSED__) +fm_error_quit_last(void *data EINA_UNUSED) { if (!pending) ecore_main_loop_quit(); return EINA_FALSE; diff --git a/src/bin/e_fm_custom.c b/src/bin/e_fm_custom.c index fd9db85fec..f4b0270128 100644 --- a/src/bin/e_fm_custom.c +++ b/src/bin/e_fm_custom.c @@ -281,7 +281,7 @@ struct _E_Custom_List }; static Eina_Bool -_e_fm2_custom_file_hash_foreach_list(const Eina_Hash *hash __UNUSED__, const void *key, void *data __UNUSED__, void *fdata) +_e_fm2_custom_file_hash_foreach_list(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data EINA_UNUSED, void *fdata) { struct _E_Custom_List *cl; @@ -331,14 +331,14 @@ _e_fm2_custom_hash_key_base_list(Eina_Hash *hash, const char *str) */ static Eina_Bool -_e_fm2_custom_file_hash_foreach(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) +_e_fm2_custom_file_hash_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED) { _e_fm2_custom_file_del(data); return 1; } static Eina_Bool -_e_fm2_custom_file_hash_foreach_save(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata) +_e_fm2_custom_file_hash_foreach_save(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata) { Eet_File *ef; E_Fm2_Custom_File *cf; @@ -432,7 +432,7 @@ _e_fm2_custom_file_info_free(void) } static void -_e_fm2_custom_file_cb_defer_save(void *data __UNUSED__) +_e_fm2_custom_file_cb_defer_save(void *data EINA_UNUSED) { _e_fm2_custom_file_info_save(); _e_fm2_custom_file_info_free(); diff --git a/src/bin/e_fm_device.c b/src/bin/e_fm_device.c index 8e96a3d09d..92b1f53190 100644 --- a/src/bin/e_fm_device.c +++ b/src/bin/e_fm_device.c @@ -650,7 +650,7 @@ _e_fm2_device_unmount_fail(E_Fm2_Mount *m) } static void -_e_fm2_device_check_desktop_icons_cb_end(void *data __UNUSED__, Ecore_Thread *eth __UNUSED__) +_e_fm2_device_check_desktop_icons_cb_end(void *data EINA_UNUSED, Ecore_Thread *eth EINA_UNUSED) { _check_vols = NULL; if (_check_run_show) @@ -681,7 +681,7 @@ _e_fm2_device_check_desktop_icons_list_cb(const char *name, const char *path, vo } static void -_e_fm2_device_check_desktop_icons_cb(void *data, Ecore_Thread *eth __UNUSED__) +_e_fm2_device_check_desktop_icons_cb(void *data, Ecore_Thread *eth EINA_UNUSED) { eina_file_dir_list(efreet_desktop_dir_get(), EINA_FALSE, _e_fm2_device_check_desktop_icons_list_cb, data); diff --git a/src/bin/e_fm_mime.c b/src/bin/e_fm_mime.c index 7ea2f63149..501819e540 100644 --- a/src/bin/e_fm_mime.c +++ b/src/bin/e_fm_mime.c @@ -9,8 +9,8 @@ struct _E_Fm2_Mime_Handler_Tuple }; /* local subsystem functions */ -static Eina_Bool _e_fm2_mime_handler_glob_match_foreach(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata); -static Eina_Bool _e_fm_mime_icon_foreach(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata); +static Eina_Bool _e_fm2_mime_handler_glob_match_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata); +static Eina_Bool _e_fm_mime_icon_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata); static Eina_Hash *icon_map = NULL; static Eina_Hash *_mime_handlers = NULL; @@ -371,7 +371,7 @@ e_fm2_mime_handler_test(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const cha /* local subsystem functions */ /* used to loop a glob hash and determine if the glob handler matches the filename */ static Eina_Bool -_e_fm2_mime_handler_glob_match_foreach(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata) +_e_fm2_mime_handler_glob_match_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata) { E_Fm2_Mime_Handler_Tuple *tuple; Eina_List *handlers = NULL; @@ -393,7 +393,7 @@ _e_fm2_mime_handler_glob_match_foreach(const Eina_Hash *hash __UNUSED__, const v } static Eina_Bool -_e_fm_mime_icon_foreach(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) +_e_fm_mime_icon_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata) { Eina_List **freelist; diff --git a/src/bin/e_fm_op.c b/src/bin/e_fm_op.c index d0bc6bffd1..4f7f5a7ce4 100644 --- a/src/bin/e_fm_op.c +++ b/src/bin/e_fm_op.c @@ -521,7 +521,7 @@ _e_fm_op_remove_link_task(E_Fm_Op_Task *task) * did not actually read enough data. */ static Eina_Bool -_e_fm_op_stdin_data(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler) +_e_fm_op_stdin_data(void *data EINA_UNUSED, Ecore_Fd_Handler *fd_handler) { int fd; static char *buf = NULL; @@ -730,7 +730,7 @@ _e_fm_op_idler_handle_error(int *mark, Eina_List **queue, Eina_List **node, E_Fm * After this, just finish everything. */ static Eina_Bool -_e_fm_op_work_idler(void *data __UNUSED__) +_e_fm_op_work_idler(void *data EINA_UNUSED) { /* E_Fm_Op_Task is marked static here because _e_fm_op_work_queue can be populated with another * tasks between calls. So it is possible when a part of file is copied and then @@ -820,7 +820,7 @@ _e_fm_op_work_idler(void *data __UNUSED__) * for those files. And we don't have _e_fm_op_separator here. */ Eina_Bool -_e_fm_op_scan_idler(void *data __UNUSED__) +_e_fm_op_scan_idler(void *data EINA_UNUSED) { static Eina_List *node = NULL; E_Fm_Op_Task *task = NULL; diff --git a/src/bin/e_fm_op_registry.c b/src/bin/e_fm_op_registry.c index 00ece41737..8b5832ad87 100644 --- a/src/bin/e_fm_op_registry.c +++ b/src/bin/e_fm_op_registry.c @@ -27,7 +27,7 @@ struct _E_Fm2_Op_Registry_Entry_Internal }; static void -_e_fm2_op_registry_entry_e_fm_deleted(void *data, Evas *evas __UNUSED__, Evas_Object *e_fm __UNUSED__, void *event __UNUSED__) +_e_fm2_op_registry_entry_e_fm_deleted(void *data, Evas *evas EINA_UNUSED, Evas_Object *e_fm EINA_UNUSED, void *event EINA_UNUSED) { E_Fm2_Op_Registry_Entry *entry = data; @@ -112,7 +112,7 @@ _e_fm2_op_registry_entry_listeners_call(const E_Fm2_Op_Registry_Entry_Internal * } static void -_e_fm2_op_registry_entry_internal_unref_on_event(void *data, void *event __UNUSED__) +_e_fm2_op_registry_entry_internal_unref_on_event(void *data, void *event EINA_UNUSED) { E_Fm2_Op_Registry_Entry_Internal *e = data; _e_fm2_op_registry_entry_internal_unref(e); @@ -170,7 +170,7 @@ e_fm2_op_registry_entry_del(int id) } static void -_e_fm2_op_registry_entry_internal_unref_on_changed_event(void *data, void *event __UNUSED__) +_e_fm2_op_registry_entry_internal_unref_on_changed_event(void *data, void *event EINA_UNUSED) { E_Fm2_Op_Registry_Entry_Internal *e = data; e->changed_event = NULL; diff --git a/src/bin/e_fm_prop.c b/src/bin/e_fm_prop.c index bf6f4b417f..c71c21cb5c 100644 --- a/src/bin/e_fm_prop.c +++ b/src/bin/e_fm_prop.c @@ -171,7 +171,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->gui.fsel) e_object_del(E_OBJECT(cfdata->gui.fsel)); @@ -192,7 +192,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) /**--APPLY--**/ static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { char buf[PATH_MAX]; Eina_Bool fperm = EINA_FALSE; @@ -633,7 +633,7 @@ _cb_icon_sel(void *data, void *data2) } static void -_cb_type(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_type(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -645,7 +645,7 @@ _cb_type(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) } static void -_cb_preview_update(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_preview_update(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -656,7 +656,7 @@ _cb_preview_update(void *data, Evas_Object *obj __UNUSED__, void *event_info __U } static void -_cb_fsel_sel(void *data, Evas_Object *obj __UNUSED__) +_cb_fsel_sel(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c index 72bbf8f8ac..171d1adfbb 100644 --- a/src/bin/e_focus.c +++ b/src/bin/e_focus.c @@ -55,7 +55,7 @@ e_focus_event_mouse_down(E_Client *ec) } EAPI void -e_focus_event_mouse_up(E_Client *ec __UNUSED__) +e_focus_event_mouse_up(E_Client *ec EINA_UNUSED) { } diff --git a/src/bin/e_font.c b/src/bin/e_font.c index 27eb0d6bd3..d1952d0aad 100644 --- a/src/bin/e_font.c +++ b/src/bin/e_font.c @@ -2,7 +2,7 @@ #define E_TOK_STYLE ":style=" -static Eina_Bool _font_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__); +static Eina_Bool _font_hash_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED); static Eina_Hash *_e_font_available_hash_add(Eina_Hash *font_hash, const char *full_name); static E_Font_Properties *_e_font_fontconfig_name_parse(Eina_Hash **font_hash, E_Font_Properties *efp, const char *font); static char _fn_buf[1024]; @@ -128,7 +128,7 @@ e_font_properties_free(E_Font_Properties *efp) } static Eina_Bool -_font_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) +_font_hash_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED) { E_Font_Properties *efp; diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index 07a71a92cd..2f9fb05eb1 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -23,7 +23,7 @@ static void _e_gadcon_client_inject(E_Gadcon *gc, E_Gadcon_C static void _e_gadcon_cb_min_size_request(void *data, Evas_Object *obj, void *event_info); static void _e_gadcon_cb_size_request(void *data, Evas_Object *obj, void *event_info); static void _e_gadcon_cb_moveresize(void *data, Evas *evas, Evas_Object *obj, void *event_info); -static void _e_gadcon_parent_resize_cb(E_Gadcon *gc, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__); +static void _e_gadcon_parent_resize_cb(E_Gadcon *gc, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); static void _e_gadcon_cb_client_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info); static void _e_gadcon_cb_client_mouse_in(void *data, Evas *evas, Evas_Object *obj, void *event_info); static void _e_gadcon_cb_client_mouse_out(void *data, Evas *evas, Evas_Object *obj, void *event_info); @@ -81,7 +81,7 @@ static void e_gadcon_layout_unpack(Evas_Object *obj); static void _e_gadcon_provider_populate_request(E_Gadcon *gc, const E_Gadcon_Client_Class *cc); static void _e_gadcon_provider_populate_unrequest(const E_Gadcon_Client_Class *cc); static void _e_gadcon_provider_populate_job(void *data); -static void _e_gadcon_event_populate_free(void *data __UNUSED__, void *event); +static void _e_gadcon_event_populate_free(void *data EINA_UNUSED, void *event); static void _e_gadcon_custom_populate_job(void *data); static int _e_gadcon_location_change(E_Gadcon_Client *gcc, E_Gadcon_Location *src, E_Gadcon_Location *dst); @@ -210,7 +210,7 @@ _e_gadcon_provider_list_sort_cb(E_Gadcon_Client_Class *a, E_Gadcon_Client_Class } static Eina_Bool -_module_init_end_cb(void *d __UNUSED__, int type __UNUSED__, void *ev __UNUSED__) +_module_init_end_cb(void *d EINA_UNUSED, int type EINA_UNUSED, void *ev EINA_UNUSED) { _modules_loaded = EINA_TRUE; return ECORE_CALLBACK_RENEW; @@ -989,20 +989,20 @@ e_gadcon_client_find(E_Gadcon *gc, E_Config_Gadcon_Client *cf_gcc) } static void -_e_gadcon_client_box_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_gadcon_client_box_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Gadcon_Client *gcc = data; gcc->o_box = NULL; } static void -_e_gadcon_client_box_hints_changed(void *data EINA_UNUSED, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_gadcon_client_box_hints_changed(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { evas_object_size_hint_min_set(obj, 0, 0); } static void -_e_gadcon_client_frame_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_gadcon_client_frame_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Gadcon_Client *gcc = data; gcc->o_frame = NULL; @@ -1040,7 +1040,7 @@ e_gadcon_drag_finished_cb(E_Drag *drag, int dropped) * @return returns pointer to created gadget, on failure returns null */ EAPI E_Gadcon_Client * -e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id __UNUSED__, const char *style, Evas_Object *base_obj) +e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id EINA_UNUSED, const char *style, Evas_Object *base_obj) { E_Gadcon_Client *gcc; @@ -1452,7 +1452,7 @@ e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int autoscroll) } EAPI void -e_gadcon_client_resizable_set(E_Gadcon_Client *gcc __UNUSED__, int resizable __UNUSED__) +e_gadcon_client_resizable_set(E_Gadcon_Client *gcc EINA_UNUSED, int resizable EINA_UNUSED) { E_OBJECT_CHECK(gcc); E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE); @@ -1607,7 +1607,7 @@ _e_gadcon_client_unpopulate(E_Gadcon_Client *gcc) } static void -_e_gadcon_client_change_gadcon(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_gadcon_client_change_gadcon(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Gadcon_Location *src, *dst; E_Gadcon_Client *gcc; @@ -1709,7 +1709,7 @@ e_gadcon_client_menu_set(E_Gadcon_Client *gcc, E_Menu *m) } EAPI E_Menu * -e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget, int flags __UNUSED__) +e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget, int flags EINA_UNUSED) { E_Menu *mo, *menu_main = NULL; E_Menu_Item *mi; @@ -2035,7 +2035,7 @@ _e_gadcon_free(E_Gadcon *gc) } static void -_e_gadcon_client_event_free(void *d __UNUSED__, void *e) +_e_gadcon_client_event_free(void *d EINA_UNUSED, void *e) { E_Event_Gadcon_Client_Del *ev = e; @@ -2055,7 +2055,7 @@ _e_gadcon_event_populate(E_Gadcon *gc) } static void -_e_gadcon_client_delfn(void *d __UNUSED__, void *o) +_e_gadcon_client_delfn(void *d EINA_UNUSED, void *o) { E_Gadcon_Client *gcc = o; E_Event_Gadcon_Client_Add *ev; @@ -2169,7 +2169,7 @@ _e_gadcon_moveresize_handle(E_Gadcon_Client *gcc) } static void -_e_gadcon_parent_resize_cb(E_Gadcon *gc, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_gadcon_parent_resize_cb(E_Gadcon *gc, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Eina_List *l; E_Gadcon_Client *gcc; @@ -2221,7 +2221,7 @@ _e_gadcon_cb_client_scroll_animator(void *data) } static void -_e_gadcon_cb_client_frame_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_gadcon_cb_client_frame_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev; E_Gadcon_Client *gcc; @@ -2235,7 +2235,7 @@ _e_gadcon_cb_client_frame_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object } static void -_e_gadcon_cb_client_frame_moveresize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_gadcon_cb_client_frame_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Gadcon_Client *gcc; @@ -2401,7 +2401,7 @@ _e_gadcon_client_inject(E_Gadcon *gc, E_Gadcon_Client *gcc, int x, int y) } static void -_e_gadcon_cb_min_size_request(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_gadcon_cb_min_size_request(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Gadcon *gc; @@ -2416,7 +2416,7 @@ _e_gadcon_cb_min_size_request(void *data, Evas_Object *obj __UNUSED__, void *eve } static void -_e_gadcon_cb_size_request(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_gadcon_cb_size_request(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Gadcon *gc; @@ -2431,7 +2431,7 @@ _e_gadcon_cb_size_request(void *data, Evas_Object *obj __UNUSED__, void *event_i } static void -_e_gadcon_cb_moveresize(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_gadcon_cb_moveresize(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Gadcon *gc; Evas_Coord x, y, w, h; @@ -2443,7 +2443,7 @@ _e_gadcon_cb_moveresize(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UN } static void -_e_gadcon_cb_client_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_gadcon_cb_client_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; E_Gadcon_Client *gcc; @@ -2494,7 +2494,7 @@ _e_gadcon_cb_client_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *o } static void -_e_gadcon_cb_client_mouse_in(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_gadcon_cb_client_mouse_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Gadcon_Client *gcc; @@ -2503,7 +2503,7 @@ _e_gadcon_cb_client_mouse_in(void *data, Evas *evas __UNUSED__, Evas_Object *obj } static void -_e_gadcon_cb_client_mouse_out(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_gadcon_cb_client_mouse_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Gadcon_Client *gcc; @@ -2512,7 +2512,7 @@ _e_gadcon_cb_client_mouse_out(void *data, Evas *evas __UNUSED__, Evas_Object *ob } static void -_e_gadcon_cb_client_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_gadcon_cb_client_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { E_Gadcon_Client *gcc; Evas_Coord x, y; @@ -2524,7 +2524,7 @@ _e_gadcon_cb_client_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, vo } static void -_e_gadcon_cb_client_resize(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_gadcon_cb_client_resize(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { E_Gadcon_Client *gcc; Evas_Coord w, h; @@ -2687,19 +2687,19 @@ _e_gadcon_client_move_go(E_Gadcon_Client *gcc) } static void -_e_gadcon_cb_signal_move_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_gadcon_cb_signal_move_start(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { _e_gadcon_client_move_start(data); } static void -_e_gadcon_cb_signal_move_stop(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_gadcon_cb_signal_move_stop(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { _e_gadcon_client_move_stop(data); } static void -_e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { _e_gadcon_client_move_go(data); } @@ -2723,19 +2723,19 @@ _e_gadconclient_resize_stop(E_Gadcon_Client *gcc) } static void -_e_gadcon_cb_signal_resize_left_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_gadcon_cb_signal_resize_left_start(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { _e_gadcon_client_resize_start(data); } static void -_e_gadcon_cb_signal_resize_left_stop(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_gadcon_cb_signal_resize_left_stop(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { _e_gadconclient_resize_stop(data); } static void -_e_gadcon_cb_signal_resize_left_go(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_gadcon_cb_signal_resize_left_go(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Gadcon_Client *gcc; Evas_Coord x, y, w, h; @@ -2795,19 +2795,19 @@ _e_gadcon_cb_signal_resize_left_go(void *data, Evas_Object *obj __UNUSED__, cons } static void -_e_gadcon_cb_signal_resize_right_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_gadcon_cb_signal_resize_right_start(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { _e_gadcon_client_resize_start(data); } static void -_e_gadcon_cb_signal_resize_right_stop(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_gadcon_cb_signal_resize_right_stop(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { _e_gadconclient_resize_stop(data); } static void -_e_gadcon_cb_signal_resize_right_go(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_gadcon_cb_signal_resize_right_go(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Gadcon_Client *gcc; Evas_Coord x, y, w, h; @@ -2867,7 +2867,7 @@ _e_gadcon_cb_signal_resize_right_go(void *data, Evas_Object *obj __UNUSED__, con } static void -_e_gadcon_cb_dnd_enter(void *data, const char *type __UNUSED__, void *event) +_e_gadcon_cb_dnd_enter(void *data, const char *type EINA_UNUSED, void *event) { E_Event_Dnd_Enter *ev; E_Gadcon *gc; @@ -2987,7 +2987,7 @@ _e_gadcon_cb_dnd_enter(void *data, const char *type __UNUSED__, void *event) } static void -_e_gadcon_cb_dnd_move(void *data, const char *type __UNUSED__, void *event) +_e_gadcon_cb_dnd_move(void *data, const char *type EINA_UNUSED, void *event) { E_Event_Dnd_Move *ev; E_Gadcon *gc; @@ -3034,7 +3034,7 @@ _e_gadcon_cb_dnd_move(void *data, const char *type __UNUSED__, void *event) } static void -_e_gadcon_cb_dnd_leave(void *data, const char *type __UNUSED__, void *event __UNUSED__) +_e_gadcon_cb_dnd_leave(void *data, const char *type EINA_UNUSED, void *event EINA_UNUSED) { E_Gadcon *gc; @@ -3059,7 +3059,7 @@ _e_gadcon_cb_dnd_leave(void *data, const char *type __UNUSED__, void *event __UN } static void -_e_gadcon_cb_dnd_drop(void *data, const char *type __UNUSED__, void *event __UNUSED__) +_e_gadcon_cb_dnd_drop(void *data, const char *type EINA_UNUSED, void *event EINA_UNUSED) { E_Gadcon *gc; E_Gadcon_Client *gcc = NULL; @@ -3150,7 +3150,7 @@ _e_gadcon_client_cb_instant_edit_timer(void *data) } static void -_e_gadcon_client_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_gadcon_client_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; E_Gadcon_Client *gcc; @@ -3203,7 +3203,7 @@ _e_gadcon_client_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj } static void -_e_gadcon_client_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_gadcon_client_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Up *ev; E_Gadcon_Client *gcc; @@ -3234,7 +3234,7 @@ _e_gadcon_client_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __ } static void -_e_gadcon_client_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_gadcon_client_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Gadcon_Client *gcc; @@ -3246,7 +3246,7 @@ _e_gadcon_client_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj } static void -_e_gadcon_client_cb_menu_style_plain(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_gadcon_client_cb_menu_style_plain(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Gadcon_Client *gcc; E_Gadcon *gc; @@ -3260,7 +3260,7 @@ _e_gadcon_client_cb_menu_style_plain(void *data, E_Menu *m __UNUSED__, E_Menu_It } static void -_e_gadcon_client_cb_menu_style_inset(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_gadcon_client_cb_menu_style_inset(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Gadcon_Client *gcc; E_Gadcon *gc; @@ -3274,7 +3274,7 @@ _e_gadcon_client_cb_menu_style_inset(void *data, E_Menu *m __UNUSED__, E_Menu_It } static void -_e_gadcon_client_cb_menu_autoscroll(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_gadcon_client_cb_menu_autoscroll(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Gadcon_Client *gcc; @@ -3289,7 +3289,7 @@ _e_gadcon_client_cb_menu_autoscroll(void *data, E_Menu *m __UNUSED__, E_Menu_Ite /* static void - _e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) + _e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Gadcon_Client *gcc; @@ -3303,7 +3303,7 @@ _e_gadcon_client_cb_menu_autoscroll(void *data, E_Menu *m __UNUSED__, E_Menu_Ite } */ static void -_e_gadcon_client_cb_menu_edit(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_gadcon_client_cb_menu_edit(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Gadcon_Client *gcc; @@ -3315,7 +3315,7 @@ _e_gadcon_client_cb_menu_edit(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi } static void -_e_gadcon_client_cb_menu_remove(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_gadcon_client_cb_menu_remove(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Gadcon *gc; E_Gadcon_Client *gcc; @@ -3335,7 +3335,7 @@ _e_gadcon_client_cb_menu_remove(void *data, E_Menu *m __UNUSED__, E_Menu_Item *m } static void -_e_gadcon_client_cb_menu_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_gadcon_client_cb_menu_pre(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Gadcon_Client *gcc; @@ -3353,7 +3353,7 @@ _e_gadcon_client_cb_menu_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) } static void -_e_gadcon_client_del_hook(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_gadcon_client_del_hook(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Gadcon_Client *gcc; @@ -3822,7 +3822,7 @@ _e_gadcon_layout_smart_disown(Evas_Object *obj) } static void -_e_gadcon_layout_smart_item_del_hook(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_gadcon_layout_smart_item_del_hook(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { if (!obj) return; e_gadcon_layout_unpack(obj); @@ -5345,7 +5345,7 @@ _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Ite } static void -_e_gadcon_layout_smart_position_items_inside_container(E_Smart_Data *sd __UNUSED__, E_Layout_Item_Container *lc) +_e_gadcon_layout_smart_position_items_inside_container(E_Smart_Data *sd EINA_UNUSED, E_Layout_Item_Container *lc) { int shift; Eina_List *l; @@ -5371,7 +5371,7 @@ _e_gadcon_layout_smart_position_items_inside_container(E_Smart_Data *sd __UNUSED } static void -_e_gadcon_layout_smart_containers_merge(E_Smart_Data *sd __UNUSED__, E_Layout_Item_Container *lc, E_Layout_Item_Container *lc2) +_e_gadcon_layout_smart_containers_merge(E_Smart_Data *sd EINA_UNUSED, E_Layout_Item_Container *lc, E_Layout_Item_Container *lc2) { int start = 0, size = 0, next = 0, min_seq = 0, max_seq = 0; Eina_List *l, *nl = NULL; @@ -5551,7 +5551,7 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_ } static void -_e_gadcon_event_populate_free(void *data __UNUSED__, void *event) +_e_gadcon_event_populate_free(void *data EINA_UNUSED, void *event) { E_Event_Gadcon_Populate *ev = event; @@ -5560,7 +5560,7 @@ _e_gadcon_event_populate_free(void *data __UNUSED__, void *event) } static void -_e_gadcon_custom_populate_job(void *data __UNUSED__) +_e_gadcon_custom_populate_job(void *data EINA_UNUSED) { const E_Gadcon_Client_Class *cc; E_Config_Gadcon_Client *cf_gcc; @@ -5608,7 +5608,7 @@ _e_gadcon_custom_populate_job(void *data __UNUSED__) } static void -_e_gadcon_provider_populate_job(void *data __UNUSED__) +_e_gadcon_provider_populate_job(void *data EINA_UNUSED) { E_Gadcon_Client_Class *cc; Eina_List *l; diff --git a/src/bin/e_gadcon_popup.c b/src/bin/e_gadcon_popup.c index 24f5dd9331..836f061805 100644 --- a/src/bin/e_gadcon_popup.c +++ b/src/bin/e_gadcon_popup.c @@ -2,8 +2,8 @@ /* local subsystem functions */ -static void _e_gadcon_popup_changed_size_hints_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__); -static void _e_gadcon_popup_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__); +static void _e_gadcon_popup_changed_size_hints_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED); +static void _e_gadcon_popup_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED); static Eina_Bool _e_popup_autoclose_deskafter_show_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) @@ -180,7 +180,7 @@ _e_gadcon_popup_size_recalc(E_Gadcon_Popup *pop, Evas_Object *obj) } static void -_e_gadcon_popup_changed_size_hints_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_gadcon_popup_changed_size_hints_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { E_Gadcon_Popup *pop = data; @@ -191,7 +191,7 @@ _e_gadcon_popup_changed_size_hints_cb(void *data, Evas *e __UNUSED__, Evas_Objec } static void -_e_gadcon_popup_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_gadcon_popup_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { E_Gadcon_Popup *pop = data; diff --git a/src/bin/e_grab_dialog.c b/src/bin/e_grab_dialog.c index 8c3546ffa5..57fcf19c9b 100644 --- a/src/bin/e_grab_dialog.c +++ b/src/bin/e_grab_dialog.c @@ -8,7 +8,7 @@ "<br>Press <hilight>Escape</hilight> to abort.") static Eina_Bool -_e_grab_dialog_key_handler(void *data, int type __UNUSED__, Ecore_Event_Key *ev) +_e_grab_dialog_key_handler(void *data, int type EINA_UNUSED, Ecore_Event_Key *ev) { E_Grab_Dialog *eg = data; @@ -33,7 +33,7 @@ _e_grab_dialog_key_handler(void *data, int type __UNUSED__, Ecore_Event_Key *ev) } static Eina_Bool -_e_grab_dialog_wheel_handler(void *data, int type __UNUSED__, Ecore_Event_Mouse_Wheel *ev) +_e_grab_dialog_wheel_handler(void *data, int type EINA_UNUSED, Ecore_Event_Mouse_Wheel *ev) { E_Grab_Dialog *eg = data; @@ -49,7 +49,7 @@ _e_grab_dialog_wheel_handler(void *data, int type __UNUSED__, Ecore_Event_Mouse_ } static Eina_Bool -_e_grab_dialog_mouse_handler(void *data, int type __UNUSED__, Ecore_Event_Mouse_Button *ev) +_e_grab_dialog_mouse_handler(void *data, int type EINA_UNUSED, Ecore_Event_Mouse_Button *ev) { E_Grab_Dialog *eg = data; diff --git a/src/bin/e_grabinput.c b/src/bin/e_grabinput.c index 08d9c71f32..2f2feb520b 100644 --- a/src/bin/e_grabinput.c +++ b/src/bin/e_grabinput.c @@ -190,7 +190,7 @@ e_grabinput_key_win_get(void) #ifndef HAVE_WAYLAND_ONLY static Eina_Bool -_e_grabinput_focus_check(void *data __UNUSED__) +_e_grabinput_focus_check(void *data EINA_UNUSED) { if (ecore_x_window_focus_get() != focus_fix_win) { diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c index 0420387bb1..51fe3298c5 100644 --- a/src/bin/e_hints.c +++ b/src/bin/e_hints.c @@ -1566,7 +1566,7 @@ e_hints_window_e_state_get(E_Client *ec) } EAPI void -e_hints_window_e_state_set(E_Client *ec __UNUSED__) +e_hints_window_e_state_set(E_Client *ec EINA_UNUSED) { /* TODO */ } diff --git a/src/bin/e_icon.c b/src/bin/e_icon.c index ca347943d9..5fc446addb 100644 --- a/src/bin/e_icon.c +++ b/src/bin/e_icon.c @@ -806,7 +806,7 @@ _e_icon_smart_init(void) } static void -_e_icon_preloaded(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_icon_preloaded(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Smart_Data *sd; @@ -1157,7 +1157,7 @@ __try_next: } static void -_e_icon_obj_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_icon_obj_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { E_Smart_Data *sd; diff --git a/src/bin/e_ilist.c b/src/bin/e_ilist.c index c3d3c66c5b..c1c20ac0bf 100644 --- a/src/bin/e_ilist.c +++ b/src/bin/e_ilist.c @@ -49,7 +49,7 @@ static void _e_typebuf_clean(Evas_Object *obj); static E_Ilist_Item *_e_ilist_item_new(E_Smart_Data *sd, Evas_Object *icon, Evas_Object *end, const char *label, int header, Ecore_End_Cb func, Ecore_End_Cb func_hilight, void *data, void *data2); static void _e_ilist_item_theme_set(E_Ilist_Item *si, Eina_Bool custom, Eina_Bool header, Eina_Bool even); -static void _e_ilist_widget_hack_cb(E_Smart_Data *sd, Evas_Object *obj __UNUSED__, Evas_Object *scr); +static void _e_ilist_widget_hack_cb(E_Smart_Data *sd, Evas_Object *obj EINA_UNUSED, Evas_Object *scr); static void _item_select(E_Ilist_Item *si); static void _item_unselect(E_Ilist_Item *si); @@ -875,7 +875,7 @@ _e_smart_reconfigure(E_Smart_Data *sd) } static void -_e_smart_event_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_smart_event_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { E_Smart_Data *sd; Evas_Event_Mouse_Down *ev; @@ -896,7 +896,7 @@ _e_smart_event_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __ } static void -_e_smart_event_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_smart_event_mouse_up(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { E_Smart_Data *sd; Evas_Event_Mouse_Up *ev; @@ -949,7 +949,7 @@ _e_smart_event_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UN } static void -_e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info) +_e_smart_event_key_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event_info) { Evas_Event_Key_Down *ev; E_Smart_Data *sd; @@ -1089,7 +1089,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi } static void -_e_ilist_widget_hack_cb(E_Smart_Data *sd, Evas_Object *obj __UNUSED__, Evas_Object *scr) +_e_ilist_widget_hack_cb(E_Smart_Data *sd, Evas_Object *obj EINA_UNUSED, Evas_Object *scr) { int w, h; e_scrollframe_child_viewport_size_get(scr, &w, &h); diff --git a/src/bin/e_import_config_dialog.c b/src/bin/e_import_config_dialog.c index 5575d30655..10646ad777 100644 --- a/src/bin/e_import_config_dialog.c +++ b/src/bin/e_import_config_dialog.c @@ -276,7 +276,7 @@ _import_edj_gen(E_Import_Config_Dialog *import) } static Eina_Bool -_import_cb_edje_cc_exit(void *data, __UNUSED__ int type, void *event) +_import_cb_edje_cc_exit(void *data, EINA_UNUSED int type, void *event) { E_Import_Config_Dialog *import; Ecore_Exe_Event_Del *ev; @@ -308,7 +308,7 @@ _import_cb_edje_cc_exit(void *data, __UNUSED__ int type, void *event) } static void -_import_cb_close(void *data, E_Dialog *dia __UNUSED__) +_import_cb_close(void *data, E_Dialog *dia EINA_UNUSED) { E_Import_Config_Dialog *import = data; @@ -319,7 +319,7 @@ _import_cb_close(void *data, E_Dialog *dia __UNUSED__) } static void -_import_cb_ok(void *data, E_Dialog *dia __UNUSED__) +_import_cb_ok(void *data, E_Dialog *dia EINA_UNUSED) { E_Import_Config_Dialog *import = data; const char *file; diff --git a/src/bin/e_import_dialog.c b/src/bin/e_import_dialog.c index 5e4ea87952..057e7cfab2 100644 --- a/src/bin/e_import_dialog.c +++ b/src/bin/e_import_dialog.c @@ -15,7 +15,7 @@ _fsel_path_save(E_Import_Dialog *id) } static void -_fsel_cb_close(void *data, E_Dialog *dia __UNUSED__) +_fsel_cb_close(void *data, E_Dialog *dia EINA_UNUSED) { E_Import_Dialog *id = data; @@ -38,7 +38,7 @@ _import_ok(void *data, void *data2) } static void -_fsel_cb_ok(void *data, E_Dialog *dia __UNUSED__) +_fsel_cb_ok(void *data, E_Dialog *dia EINA_UNUSED) { E_Import_Dialog *id; const char *path, *p; diff --git a/src/bin/e_init.c b/src/bin/e_init.c index 9bd3e8824e..2ab6f6140a 100644 --- a/src/bin/e_init.c +++ b/src/bin/e_init.c @@ -10,7 +10,7 @@ static Eina_List *splash_objs = NULL; static Ecore_Timer *_e_init_timeout_timer = NULL; static Eina_Bool -_e_init_cb_timeout(void *data __UNUSED__) +_e_init_cb_timeout(void *data EINA_UNUSED) { _e_init_timeout_timer = NULL; e_init_hide(); @@ -18,7 +18,7 @@ _e_init_cb_timeout(void *data __UNUSED__) } static void -_e_init_cb_signal_done_ok(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_init_cb_signal_done_ok(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { e_init_hide(); } diff --git a/src/bin/e_int_client_locks.c b/src/bin/e_int_client_locks.c index c9bc0c1d55..42ae508483 100644 --- a/src/bin/e_int_client_locks.c +++ b/src/bin/e_int_client_locks.c @@ -137,7 +137,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { /* Free the cfdata */ cfdata->client->border_locks_dialog = NULL; @@ -146,7 +146,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) /**--APPLY--**/ static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { int flag; /* Actually take our cfdata settings and apply them in real life */ @@ -213,7 +213,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_advanced_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { /* Actually take our cfdata settings and apply them in real life */ cfdata->client->lock_user_location = cfdata->lock.user.location; @@ -274,7 +274,7 @@ _advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda /**--GUI--**/ static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { /* generate the core widget layout for a basic dialog */ Evas_Object *o, *ob, *of; @@ -297,7 +297,7 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial } static Evas_Object * -_advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_advanced_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { /* generate the core widget layout for an advanced dialog */ Evas_Object *o, *ob, *of, *ol; diff --git a/src/bin/e_int_client_menu.c b/src/bin/e_int_client_menu.c index 5d5a1139db..422b75009e 100644 --- a/src/bin/e_int_client_menu.c +++ b/src/bin/e_int_client_menu.c @@ -5,7 +5,7 @@ static void _e_client_menu_cb_locks(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_client_menu_cb_remember(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_client_menu_cb_borderless(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_client_menu_cb_border(void *data, E_Menu *m, E_Menu_Item *mi); -static void _e_client_menu_cb_redirect_set(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi EINA_UNUSED); +static void _e_client_menu_cb_redirect_set(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED); static void _e_client_menu_cb_close(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_client_menu_cb_iconify(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_client_menu_cb_kill(void *data, E_Menu *m, E_Menu_Item *mi); @@ -22,7 +22,7 @@ static void _e_client_menu_cb_shade(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_client_menu_cb_resistance(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_client_menu_cb_icon_edit(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_client_menu_cb_application_pre(void *data, E_Menu *m, E_Menu_Item *mi); -static void _e_client_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi); +static void _e_client_menu_cb_window_pre(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi); static void _e_client_menu_cb_prop(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_client_menu_cb_stick(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_client_menu_cb_stacking_pre(void *data, E_Menu *m, E_Menu_Item *mi); @@ -267,7 +267,7 @@ e_int_client_menu_del(E_Client *ec) } static void -_e_client_cb_border_menu_end(void *data __UNUSED__, E_Menu *m) +_e_client_cb_border_menu_end(void *data EINA_UNUSED, E_Menu *m) { E_Client *ec; @@ -285,7 +285,7 @@ _e_client_cb_border_menu_end(void *data __UNUSED__, E_Menu *m) } static void -_e_client_menu_cb_locks(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_locks(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -297,7 +297,7 @@ _e_client_menu_cb_locks(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUS } static void -_e_client_menu_cb_remember(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_remember(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -309,7 +309,7 @@ _e_client_menu_cb_remember(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __U } static void -_e_client_menu_cb_border(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_border(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; char buf[256]; @@ -325,7 +325,7 @@ _e_client_menu_cb_border(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNU } static void -_e_client_menu_cb_borderless(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_client_menu_cb_borderless(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Client *ec = data; @@ -336,13 +336,13 @@ _e_client_menu_cb_borderless(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) static void -_e_client_menu_cb_redirect_set(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi EINA_UNUSED) +_e_client_menu_cb_redirect_set(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_comp_client_redirect_toggle(data); } static void -_e_client_menu_cb_close(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_close(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -351,7 +351,7 @@ _e_client_menu_cb_close(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUS } static void -_e_client_menu_cb_iconify(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_iconify(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -366,7 +366,7 @@ _e_client_menu_cb_iconify(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UN } static void -_e_client_menu_cb_kill(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_kill(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Action *a; E_Client *ec; @@ -379,7 +379,7 @@ _e_client_menu_cb_kill(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSE } static void -_e_client_menu_cb_move(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_move(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -390,7 +390,7 @@ _e_client_menu_cb_move(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSE } static void -_e_client_menu_cb_resize(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_resize(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -401,7 +401,7 @@ _e_client_menu_cb_resize(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNU } static void -_e_client_menu_cb_maximize_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_client_menu_cb_maximize_pre(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Menu *subm; E_Menu_Item *submi; @@ -498,7 +498,7 @@ _e_client_menu_cb_maximize_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi } static void -_e_client_menu_cb_maximize(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_maximize(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -509,7 +509,7 @@ _e_client_menu_cb_maximize(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __U } static void -_e_client_menu_cb_maximize_vertically(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_maximize_vertically(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -524,7 +524,7 @@ _e_client_menu_cb_maximize_vertically(void *data, E_Menu *m __UNUSED__, E_Menu_I } static void -_e_client_menu_cb_maximize_horizontally(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_maximize_horizontally(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -539,7 +539,7 @@ _e_client_menu_cb_maximize_horizontally(void *data, E_Menu *m __UNUSED__, E_Menu } static void -_e_client_menu_cb_maximize_left(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_maximize_left(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -554,7 +554,7 @@ _e_client_menu_cb_maximize_left(void *data, E_Menu *m __UNUSED__, E_Menu_Item *m } static void -_e_client_menu_cb_maximize_right(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_maximize_right(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -569,7 +569,7 @@ _e_client_menu_cb_maximize_right(void *data, E_Menu *m __UNUSED__, E_Menu_Item * } static void -_e_client_menu_cb_unmaximize(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_unmaximize(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -578,7 +578,7 @@ _e_client_menu_cb_unmaximize(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi _ } static void -_e_client_menu_cb_shade(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_shade(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -593,7 +593,7 @@ _e_client_menu_cb_shade(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUS } static void -_e_client_menu_cb_resistance(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_resistance(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -602,7 +602,7 @@ _e_client_menu_cb_resistance(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi _ } static void -_e_client_menu_cb_icon_edit(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_icon_edit(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -611,7 +611,7 @@ _e_client_menu_cb_icon_edit(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi _ } static void -_e_client_menu_cb_application_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_client_menu_cb_application_pre(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Menu *subm; E_Menu_Item *submi; @@ -663,7 +663,7 @@ _e_client_menu_cb_application_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item } static void -_e_client_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_client_menu_cb_window_pre(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Menu *subm; E_Menu_Item *submi; @@ -813,7 +813,7 @@ _e_client_menu_cb_window_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) } static void -_e_client_menu_cb_prop(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_prop(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -822,7 +822,7 @@ _e_client_menu_cb_prop(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSE } static void -_e_client_menu_cb_stick(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_stick(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -837,7 +837,7 @@ _e_client_menu_cb_stick(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUS } static void -_e_client_menu_cb_on_top(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_on_top(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -847,7 +847,7 @@ _e_client_menu_cb_on_top(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNU } static void -_e_client_menu_cb_below(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_below(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -857,7 +857,7 @@ _e_client_menu_cb_below(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUS } static void -_e_client_menu_cb_normal(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_normal(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -867,7 +867,7 @@ _e_client_menu_cb_normal(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNU } static void -_e_client_menu_cb_fullscreen(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_client_menu_cb_fullscreen(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Client *ec; int toggle; @@ -885,7 +885,7 @@ _e_client_menu_cb_fullscreen(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) } static void -_e_client_menu_cb_skip_winlist(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_client_menu_cb_skip_winlist(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Client *ec; @@ -901,7 +901,7 @@ _e_client_menu_cb_skip_winlist(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi } static void -_e_client_menu_cb_skip_pager(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_client_menu_cb_skip_pager(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Client *ec; @@ -916,7 +916,7 @@ _e_client_menu_cb_skip_pager(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) } static void -_e_client_menu_cb_skip_taskbar(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_client_menu_cb_skip_taskbar(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Client *ec; @@ -1184,7 +1184,7 @@ _e_client_menu_cb_align_pre(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) } static void -_e_client_menu_cb_sendto_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_client_menu_cb_sendto_pre(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Menu *subm; E_Menu_Item *submi; @@ -1246,7 +1246,7 @@ _e_client_menu_cb_sendto_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) } static void -_e_client_menu_cb_sendto(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_sendto(void *data, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) { E_Desk *desk; E_Client *ec; @@ -1261,7 +1261,7 @@ _e_client_menu_cb_sendto(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__) } static void -_e_client_menu_cb_pin(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_pin(void *data EINA_UNUSED, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -1270,7 +1270,7 @@ _e_client_menu_cb_pin(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED } static void -_e_client_menu_cb_unpin(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_unpin(void *data EINA_UNUSED, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -1279,7 +1279,7 @@ _e_client_menu_cb_unpin(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUS } static void -_e_client_menu_cb_stacking_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_client_menu_cb_stacking_pre(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Menu *subm; E_Menu_Item *submi; @@ -1385,7 +1385,7 @@ _e_client_menu_cb_stacking_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi } static void -_e_client_menu_cb_raise(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_raise(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec = data; @@ -1397,7 +1397,7 @@ _e_client_menu_cb_raise(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUS } static void -_e_client_menu_cb_lower(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_lower(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec = data; @@ -1446,7 +1446,7 @@ _e_client_menu_cb_netwm_icon(void *data, E_Menu *m, E_Menu_Item *mi) } static void -_e_client_menu_cb_border_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_client_menu_cb_border_pre(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Menu *subm; E_Menu_Item *submi; @@ -1510,7 +1510,7 @@ _e_client_menu_cb_border_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) } static void -_e_client_menu_cb_iconpref_e(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_iconpref_e(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -1522,7 +1522,7 @@ _e_client_menu_cb_iconpref_e(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi _ } static void -_e_client_menu_cb_iconpref_user(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_iconpref_user(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -1534,7 +1534,7 @@ _e_client_menu_cb_iconpref_user(void *data, E_Menu *m __UNUSED__, E_Menu_Item *m } static void -_e_client_menu_cb_iconpref_netwm(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_iconpref_netwm(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -1546,7 +1546,7 @@ _e_client_menu_cb_iconpref_netwm(void *data, E_Menu *m __UNUSED__, E_Menu_Item * } static void -_e_client_menu_cb_skip_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_client_menu_cb_skip_pre(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Client *ec; E_Menu *subm; @@ -1591,7 +1591,7 @@ _e_client_menu_cb_skip_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) } static void -_e_client_menu_cb_fav_add(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_fav_add(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; Efreet_Menu *menu; @@ -1609,7 +1609,7 @@ _e_client_menu_cb_fav_add(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UN } static void -_e_client_menu_cb_kbdshrtct_add(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_kbdshrtct_add(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; E_Zone *zone; @@ -1622,7 +1622,7 @@ _e_client_menu_cb_kbdshrtct_add(void *data, E_Menu *m __UNUSED__, E_Menu_Item *m } static void -_e_client_menu_cb_ibar_add_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_client_menu_cb_ibar_add_pre(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Menu *sm; E_Client *ec; @@ -1661,7 +1661,7 @@ _e_client_menu_cb_ibar_add_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi } static void -_e_client_menu_cb_ibar_add(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__) +_e_client_menu_cb_ibar_add(void *data, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) { E_Order *od; E_Client *ec; diff --git a/src/bin/e_int_client_prop.c b/src/bin/e_int_client_prop.c index 7ef85f02aa..0905748e42 100644 --- a/src/bin/e_int_client_prop.c +++ b/src/bin/e_int_client_prop.c @@ -361,7 +361,7 @@ _ec_cb_dialog_del(void *obj) } static void -_ec_cb_dialog_close(void *data __UNUSED__, E_Dialog *dia) +_ec_cb_dialog_close(void *data EINA_UNUSED, E_Dialog *dia) { if (dia->data) _free_data(dia, dia->data); @@ -429,7 +429,7 @@ _ec_go(void *data, void *data2) } static Evas_Object * -_ec_icccm_create(E_Dialog *dia, void *data __UNUSED__) +_ec_icccm_create(E_Dialog *dia, void *data EINA_UNUSED) { Evas *evas; Evas_Object *o, *ob, *otb; @@ -485,7 +485,7 @@ _ec_icccm_create(E_Dialog *dia, void *data __UNUSED__) } static Evas_Object * -_ec_netwm_create(E_Dialog *dia, void *data __UNUSED__) +_ec_netwm_create(E_Dialog *dia, void *data EINA_UNUSED) { Evas *evas; Evas_Object *o, *ob, *otb; diff --git a/src/bin/e_int_client_remember.c b/src/bin/e_int_client_remember.c index 75f37a05d8..87dced408a 100644 --- a/src/bin/e_int_client_remember.c +++ b/src/bin/e_int_client_remember.c @@ -303,7 +303,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { /* Free the cfdata */ free(cfdata->name); @@ -635,7 +635,7 @@ _advanced_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd /**--GUI--**/ static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { /* generate the core widget layout for a basic dialog */ Evas_Object *o, *ob; diff --git a/src/bin/e_int_config_comp.c b/src/bin/e_int_config_comp.c index c436f522ac..f53f24a1e8 100644 --- a/src/bin/e_int_config_comp.c +++ b/src/bin/e_int_config_comp.c @@ -68,7 +68,7 @@ static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); EAPI E_Config_Dialog * -e_int_config_comp(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_comp(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -157,7 +157,7 @@ _advanced_features_changed(E_Comp_Config *conf) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { eina_stringshare_del(cfdata->shadow_style); @@ -428,7 +428,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data } static int -_advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, +_advanced_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Comp_Config *conf = e_comp_config_get(); @@ -626,7 +626,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Comp_Config *conf = e_comp_config_get(); diff --git a/src/bin/e_int_config_comp_match.c b/src/bin/e_int_config_comp_match.c index 31dedabce7..f5d80c2368 100644 --- a/src/bin/e_int_config_comp_match.c +++ b/src/bin/e_int_config_comp_match.c @@ -869,7 +869,7 @@ _create_data(E_Config_Dialog *cfd) } EAPI E_Config_Dialog * -e_int_config_comp_match(Evas_Object *parent, const char *params __UNUSED__) +e_int_config_comp_match(Evas_Object *parent, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c index 7ebf166f02..fa9687c394 100644 --- a/src/bin/e_int_config_modules.c +++ b/src/bin/e_int_config_modules.c @@ -63,7 +63,7 @@ static const CFTypes _types[] = /* local function protos */ static void _cftype_free(CFType *cft); -static void _widget_list_selection_changed(void *data, Evas_Object *obj __UNUSED__); +static void _widget_list_selection_changed(void *data, Evas_Object *obj EINA_UNUSED); static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); @@ -76,14 +76,14 @@ static void _toolbar_select_cb(void *data, void *data2); static CFType *_cftype_find(E_Config_Dialog_Data *cfdata, const char *key, const char *name, const char *icon); static CFType *_cftype_new(const char *key, const char *name, const char *icon); static void _load_module(E_Module_Desktop *md, Eina_Hash *types_hash); -static Eina_Bool _types_list_create_foreach_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata); +static Eina_Bool _types_list_create_foreach_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata); static int _types_list_sort(const void *data1, const void *data2); static void _btn_cb_unload(void *data, void *data2); static void _btn_cb_load(void *data, void *data2); EAPI E_Config_Dialog * -e_int_config_modules(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_modules(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd = NULL; E_Config_Dialog_View *v = NULL; @@ -102,7 +102,7 @@ e_int_config_modules(Evas_Object *parent EINA_UNUSED, const char *params __UNUSE } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { Eina_Hash *types_hash; Eina_List *mods; @@ -133,7 +133,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { CFType *cft; @@ -147,7 +147,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Eina_Bool -_module_update(E_Config_Dialog_Data *cfdata, int type __UNUSED__, E_Event_Module_Update *ev) +_module_update(E_Config_Dialog_Data *cfdata, int type EINA_UNUSED, E_Event_Module_Update *ev) { CFType *cft; Eina_List *l, *ll; @@ -526,7 +526,7 @@ _modules_list_sort(const void *data1, const void *data2) } static Eina_Bool -_types_list_create_foreach_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) +_types_list_create_foreach_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata) { E_Config_Dialog_Data *cfdata = fdata; CFType *cft = data; @@ -552,7 +552,7 @@ _types_list_sort(const void *data1, const void *data2) } static void -_widget_list_selection_changed(void *data, Evas_Object *obj __UNUSED__) +_widget_list_selection_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; const Eina_List *l; @@ -594,7 +594,7 @@ _widget_list_selection_changed(void *data, Evas_Object *obj __UNUSED__) } static void -_btn_cb_unload(void *data, void *data2 __UNUSED__) +_btn_cb_unload(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; CFModule *cfm; @@ -619,7 +619,7 @@ _btn_cb_unload(void *data, void *data2 __UNUSED__) } static void -_btn_cb_load(void *data, void *data2 __UNUSED__) +_btn_cb_load(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; CFModule *cfm; diff --git a/src/bin/e_int_gadcon_config.c b/src/bin/e_int_gadcon_config.c index 6251c11b84..79d6d29524 100644 --- a/src/bin/e_int_gadcon_config.c +++ b/src/bin/e_int_gadcon_config.c @@ -31,15 +31,15 @@ struct _E_Config_Dialog_Data static void *_create_data(E_Config_Dialog *cfd); static void _fill_data(E_Config_Dialog_Data *cfdata); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Eina_Bool _free_gadgets(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__); +static Eina_Bool _free_gadgets(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED); static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *_advanced_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Eina_Bool _cb_load_timer(void *data); static void _fill_list(E_Config_Dialog_Data *cfdata); static void _fill_list_advanced(E_Config_Dialog_Data *cfdata, Eina_Bool, Eina_Bool); static void _cb_list_selected(void *data); -static void _cb_add(void *data, void *data2 __UNUSED__); -static void _cb_del(void *data, void *data2 __UNUSED__); +static void _cb_add(void *data, void *data2 EINA_UNUSED); +static void _cb_del(void *data, void *data2 EINA_UNUSED); static CFGadget *_search_hash(E_Config_Dialog_Data *cfdata, const char *name); static Eina_Bool _cb_cc_add(E_Config_Dialog_Data *cfdata, int type, E_Event_Gadcon_Client_Class_Add *ev); static Eina_Bool _cb_cc_del(E_Config_Dialog_Data *cfdata, int type, E_Event_Gadcon_Client_Class_Add *ev); @@ -118,7 +118,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->gcc_add) ecore_event_handler_del(cfdata->gcc_add); if (cfdata->gcc_del) ecore_event_handler_del(cfdata->gcc_del); @@ -138,7 +138,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Eina_Bool -_free_gadgets(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) +_free_gadgets(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED) { CFGadget *gadget; @@ -199,7 +199,7 @@ _list_item_del_advanced(E_Config_Dialog_Data *cfdata, E_Gadcon_Client *gcc) } static void -_list_item_del(E_Config_Dialog_Data *cfdata __UNUSED__, Evas_Object *list, const E_Gadcon_Client_Class *cc) +_list_item_del(E_Config_Dialog_Data *cfdata EINA_UNUSED, Evas_Object *list, const E_Gadcon_Client_Class *cc) { E_Ilist_Item *ili; const Eina_List *l; @@ -409,7 +409,7 @@ _fill_list(E_Config_Dialog_Data *cfdata) } static void -_cb_add_advanced(void *data, void *data2 __UNUSED__) +_cb_add_advanced(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; E_Config_Gadcon_Client *cf_gcc; @@ -433,7 +433,7 @@ _cb_add_advanced(void *data, void *data2 __UNUSED__) } static void -_cb_add(void *data, void *data2 __UNUSED__) +_cb_add(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; const E_Ilist_Item *it; @@ -478,7 +478,7 @@ _cb_add(void *data, void *data2 __UNUSED__) } static void -_cb_del_advanced(void *data, void *data2 __UNUSED__) +_cb_del_advanced(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; E_Config_Gadcon_Client *cf_gcc; @@ -533,7 +533,7 @@ _cb_del_advanced(void *data, void *data2 __UNUSED__) } static void -_cb_del(void *data, void *data2 __UNUSED__) +_cb_del(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; const E_Ilist_Item *it; @@ -629,7 +629,7 @@ _search_hash(E_Config_Dialog_Data *cfdata, const char *name) } static Eina_Bool -_cb_gcc_del(E_Config_Dialog_Data *cfdata, int type __UNUSED__, E_Event_Gadcon_Client_Del *ev) +_cb_gcc_del(E_Config_Dialog_Data *cfdata, int type EINA_UNUSED, E_Event_Gadcon_Client_Del *ev) { if (cfdata->advanced.o_list) _list_item_del_advanced(cfdata, ev->gcc); @@ -645,7 +645,7 @@ _cb_gcc_del(E_Config_Dialog_Data *cfdata, int type __UNUSED__, E_Event_Gadcon_Cl } static Eina_Bool -_cb_gcc_add(E_Config_Dialog_Data *cfdata, int type __UNUSED__, E_Event_Gadcon_Client_Add *ev) +_cb_gcc_add(E_Config_Dialog_Data *cfdata, int type EINA_UNUSED, E_Event_Gadcon_Client_Add *ev) { if (cfdata->advanced.o_list) _list_item_add_advanced(cfdata, ev->gcc, ev->gcc->cf); @@ -653,7 +653,7 @@ _cb_gcc_add(E_Config_Dialog_Data *cfdata, int type __UNUSED__, E_Event_Gadcon_Cl } static Eina_Bool -_cb_cc_del(E_Config_Dialog_Data *cfdata, int type __UNUSED__, E_Event_Gadcon_Client_Class_Add *ev) +_cb_cc_del(E_Config_Dialog_Data *cfdata, int type EINA_UNUSED, E_Event_Gadcon_Client_Class_Add *ev) { if (cfdata->basic.o_list) _list_item_del(cfdata, cfdata->basic.o_list, ev->cc); @@ -663,7 +663,7 @@ _cb_cc_del(E_Config_Dialog_Data *cfdata, int type __UNUSED__, E_Event_Gadcon_Cli } static Eina_Bool -_cb_cc_add(E_Config_Dialog_Data *cfdata, int type __UNUSED__, E_Event_Gadcon_Client_Class_Add *ev) +_cb_cc_add(E_Config_Dialog_Data *cfdata, int type EINA_UNUSED, E_Event_Gadcon_Client_Class_Add *ev) { if (cfdata->basic.o_list) _list_item_add(cfdata, ev->cc); diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index b4fccc12a9..c44cde1690 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -62,7 +62,7 @@ static void _e_int_menus_desk_item_cb(void *data, E_Menu *m, E_Menu_Item static void _e_int_menus_item_label_set(Efreet_Menu *entry, E_Menu_Item *mi); static Efreet_Menu *_e_int_menus_apps_thread_new(E_Menu *m, const char *dir); static Eina_Bool _e_int_menus_efreet_desktop_cache_update(void *d, int type, void *e); -//static void _e_int_menus_apps_drag_finished(E_Drag *drag, int dropped __UNUSED__); +//static void _e_int_menus_apps_drag_finished(E_Drag *drag, int dropped EINA_UNUSED); /* local subsystem globals */ static Eina_Hash *_e_int_menus_augmentation = NULL; @@ -88,7 +88,7 @@ _e_int_menus_augmentation_find(const char *key) #ifdef ISCOMFITOR static void -_TEST_ADD(void *data, E_Dialog *dia __UNUSED__) +_TEST_ADD(void *data, E_Dialog *dia EINA_UNUSED) { char buf[4096]; @@ -97,13 +97,13 @@ _TEST_ADD(void *data, E_Dialog *dia __UNUSED__) } static void -_TEST_DEL(void *data, E_Dialog *dia __UNUSED__) +_TEST_DEL(void *data, E_Dialog *dia EINA_UNUSED) { e_widget_ilist_remove_num(data, e_widget_ilist_selected_get(data)); } static void -_TEST(void *d __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) +_TEST(void *d EINA_UNUSED, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) { E_Dialog *dia; Evas_Object *o_list; @@ -544,7 +544,7 @@ e_int_menus_shutdown(void) /* local subsystem functions */ static Eina_Bool -_e_int_menus_efreet_desktop_cache_update(void *d __UNUSED__, int type __UNUSED__, void *e __UNUSED__) +_e_int_menus_efreet_desktop_cache_update(void *d EINA_UNUSED, int type EINA_UNUSED, void *e EINA_UNUSED) { e_int_menus_shutdown(); e_int_menus_init(); @@ -583,7 +583,7 @@ _e_int_menus_main_del_hook(void *obj) } static void -_e_int_menus_main_about(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_int_menus_main_about(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_About *about; @@ -592,7 +592,7 @@ _e_int_menus_main_about(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item } static void -_e_int_menus_themes_about(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_int_menus_themes_about(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Theme_About *about; @@ -609,7 +609,7 @@ _e_int_menus_themes_about(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_It */ static void -_e_int_menus_config_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) +_e_int_menus_config_cb(void *data EINA_UNUSED, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) { E_Action *act; @@ -618,7 +618,7 @@ _e_int_menus_config_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSE } static void -_e_int_menus_main_showhide(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) +_e_int_menus_main_showhide(void *data EINA_UNUSED, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) { E_Action *act; @@ -627,7 +627,7 @@ _e_int_menus_main_showhide(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __U } static void -_e_int_menus_main_restart(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_int_menus_main_restart(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Action *a; @@ -636,7 +636,7 @@ _e_int_menus_main_restart(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_It } static void -_e_int_menus_main_exit(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_int_menus_main_exit(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Action *a; @@ -823,7 +823,7 @@ _e_int_menus_apps_scan(E_Menu *m, Efreet_Menu *menu) } static Eina_Bool -_e_int_menus_app_cleaner_cb(void *d __UNUSED__) +_e_int_menus_app_cleaner_cb(void *d EINA_UNUSED) { eina_hash_free_buckets(_e_int_menus_app_menus); return EINA_TRUE; @@ -965,7 +965,7 @@ _e_int_menus_apps_free_hook2(void *obj) } static void -_e_int_menus_apps_run(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__) +_e_int_menus_apps_run(void *data, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) { Efreet_Desktop *desktop; @@ -975,7 +975,7 @@ _e_int_menus_apps_run(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__) /* static void - _e_int_menus_apps_drag_finished(E_Drag *drag, int dropped __UNUSED__) + _e_int_menus_apps_drag_finished(E_Drag *drag, int dropped EINA_UNUSED) { Efreet_Desktop *desktop; @@ -1014,7 +1014,7 @@ _e_int_menus_apps_drag(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) } static void -_e_int_menus_virtuals_pre_cb(void *data __UNUSED__, E_Menu *m) +_e_int_menus_virtuals_pre_cb(void *data EINA_UNUSED, E_Menu *m) { E_Menu_Item *mi; E_Menu *root; @@ -1074,13 +1074,13 @@ _e_int_menus_desktops_free_hook(void *obj) } static void -_e_int_menus_desk_item_cb(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +_e_int_menus_desk_item_cb(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_configure_registry_call("screen/virtual_desktops", NULL, NULL); } static void -_e_int_menus_virtuals_item_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_int_menus_virtuals_item_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Desk *desk; @@ -1118,7 +1118,7 @@ _e_e_int_menus_conf_comp_cb(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Men } static void -_e_int_menus_config_pre_cb(void *data __UNUSED__, E_Menu *m) +_e_int_menus_config_pre_cb(void *data EINA_UNUSED, E_Menu *m) { E_Menu_Item *mi; Eina_List *l = NULL; @@ -1402,7 +1402,7 @@ _e_int_menus_clients_add_by_none(Eina_List *clients, E_Menu *m) } static void -_e_int_menus_clients_pre_cb(void *data __UNUSED__, E_Menu *m) +_e_int_menus_clients_pre_cb(void *data EINA_UNUSED, E_Menu *m) { E_Menu *subm; E_Menu_Item *mi = NULL; @@ -1565,7 +1565,7 @@ _e_int_menus_clients_free_hook(void *obj) } static void -_e_int_menus_clients_item_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_int_menus_clients_item_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec; @@ -1600,7 +1600,7 @@ _e_int_menus_clients_icon_cb(void *data, E_Menu *m, E_Menu_Item *mi) } static void -_e_int_menus_clients_cleanup_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) +_e_int_menus_clients_cleanup_cb(void *data EINA_UNUSED, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) { E_Action *act; @@ -1609,7 +1609,7 @@ _e_int_menus_clients_cleanup_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *m } static void -_e_int_menus_lost_clients_pre_cb(void *data __UNUSED__, E_Menu *m) +_e_int_menus_lost_clients_pre_cb(void *data EINA_UNUSED, E_Menu *m) { E_Menu_Item *mi; Eina_List *l, *clients = NULL; @@ -1666,7 +1666,7 @@ _e_int_menus_lost_clients_free_hook(void *obj) } static void -_e_int_menus_lost_clients_item_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_int_menus_lost_clients_item_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec = data; @@ -1712,7 +1712,7 @@ _e_int_menus_augmentation_del(E_Menu *m, Eina_List *augmentation) } static void -_e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m) +_e_int_menus_shelves_pre_cb(void *data EINA_UNUSED, E_Menu *m) { E_Menu_Item *mi; Eina_List *l, *shelves = NULL; @@ -1819,7 +1819,7 @@ _e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m) } static void -_e_int_menus_shelves_item_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_int_menus_shelves_item_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Shelf *s = data; @@ -1828,7 +1828,7 @@ _e_int_menus_shelves_item_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi _ } static void -_e_int_menus_shelves_add_cb(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_int_menus_shelves_add_cb(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Zone *zone; @@ -1837,7 +1837,7 @@ _e_int_menus_shelves_add_cb(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_ } static void -_e_int_menus_shelves_del_cb(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +_e_int_menus_shelves_del_cb(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_configure_registry_call("extensions/shelves", NULL, NULL); } diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c index c8ab81ba87..3043ed2c64 100644 --- a/src/bin/e_int_shelf_config.c +++ b/src/bin/e_int_shelf_config.c @@ -21,12 +21,12 @@ struct _E_Config_Dialog_Data /* local function prototypes */ static void *_create_data(E_Config_Dialog *cfd); static void _fill_data(E_Config_Dialog_Data *cfdata); -static int _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static void _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata); static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static void _fill_styles(E_Config_Dialog_Data *cfdata, Evas_Object *obj); -static void _cb_autohide_change(void *data, Evas_Object *obj __UNUSED__); +static void _cb_autohide_change(void *data, Evas_Object *obj EINA_UNUSED); static void _fill_desks(E_Config_Dialog_Data *cfdata); EAPI void @@ -51,7 +51,7 @@ e_int_shelf_config(E_Shelf *es) /* local functions */ static Eina_Bool -_shelf_event_add(E_Config_Dialog_Data *cfdata, int type __UNUSED__, E_Event_Shelf *ev) +_shelf_event_add(E_Config_Dialog_Data *cfdata, int type EINA_UNUSED, E_Event_Shelf *ev) { if (ev->shelf->cfg == cfdata->escfg) cfdata->es = ev->shelf; @@ -59,7 +59,7 @@ _shelf_event_add(E_Config_Dialog_Data *cfdata, int type __UNUSED__, E_Event_Shel } static Eina_Bool -_shelf_event_del(E_Config_Dialog_Data *cfdata, int type __UNUSED__, E_Event_Shelf *ev) +_shelf_event_del(E_Config_Dialog_Data *cfdata, int type EINA_UNUSED, E_Event_Shelf *ev) { if (ev->shelf == cfdata->es) cfdata->es = NULL; @@ -112,7 +112,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { #define CHECK(X) if (cfdata->X != cfdata->escfg->X) return 1 CHECK(layer); @@ -131,7 +131,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { eina_list_free(cfdata->autohide_list); @@ -144,7 +144,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *otb, *ol, *ow; E_Radio_Group *rg; @@ -454,7 +454,7 @@ _fill_styles(E_Config_Dialog_Data *cfdata, Evas_Object *obj) } static void -_cb_autohide_change(void *data, Evas_Object *obj __UNUSED__) +_cb_autohide_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Eina_List *l; diff --git a/src/bin/e_int_toolbar_config.c b/src/bin/e_int_toolbar_config.c index 57928b6f25..e82874dd37 100644 --- a/src/bin/e_int_toolbar_config.c +++ b/src/bin/e_int_toolbar_config.c @@ -50,14 +50,14 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { cfdata->tbar->cfg_dlg = NULL; E_FREE(cfdata); } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Toolbar *tbar; @@ -68,7 +68,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *ot, *ow; E_Radio_Group *rg; diff --git a/src/bin/e_intl.c b/src/bin/e_intl.c index b7f808e417..1609228f79 100644 --- a/src/bin/e_intl.c +++ b/src/bin/e_intl.c @@ -410,7 +410,7 @@ e_intl_imc_system_path_get(void) } static Eina_Bool -_e_intl_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_intl_cb_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Del *ev; @@ -430,7 +430,7 @@ _e_intl_locale_hash_free(Eina_Hash *locale_hash) } static Eina_Bool -_e_intl_locale_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) +_e_intl_locale_hash_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED) { free(data); return 1; diff --git a/src/bin/e_ipc.c b/src/bin/e_ipc.c index 5af2f69c43..d5fddd9d9f 100644 --- a/src/bin/e_ipc.c +++ b/src/bin/e_ipc.c @@ -4,9 +4,9 @@ EINTERN char *e_ipc_socket = NULL; #ifdef USE_IPC /* local subsystem functions */ -static Eina_Bool _e_ipc_cb_client_add(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_ipc_cb_client_del(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event); +static Eina_Bool _e_ipc_cb_client_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_ipc_cb_client_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_ipc_cb_client_data(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); /* local subsystem globals */ static Ecore_Ipc_Server *_e_ipc_server = NULL; @@ -143,7 +143,7 @@ e_ipc_shutdown(void) #ifdef USE_IPC /* local subsystem globals */ static Eina_Bool -_e_ipc_cb_client_add(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_ipc_cb_client_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Ipc_Event_Client_Add *e; @@ -154,7 +154,7 @@ _e_ipc_cb_client_add(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_ipc_cb_client_del(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_ipc_cb_client_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Ipc_Event_Client_Del *e; @@ -169,7 +169,7 @@ _e_ipc_cb_client_del(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_ipc_cb_client_data(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Ipc_Event_Client_Data *e; diff --git a/src/bin/e_layout.c b/src/bin/e_layout.c index 5026e08061..7820a96cdd 100644 --- a/src/bin/e_layout.c +++ b/src/bin/e_layout.c @@ -369,7 +369,7 @@ _e_layout_smart_disown(Evas_Object *obj) } static void -_e_layout_smart_item_del_hook(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_layout_smart_item_del_hook(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { e_layout_unpack(obj); } diff --git a/src/bin/e_log.c b/src/bin/e_log.c index 56e5500be8..6e694dba5b 100644 --- a/src/bin/e_log.c +++ b/src/bin/e_log.c @@ -11,7 +11,7 @@ static const char *_names[] = { }; static void -_e_log_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc __UNUSED__, int line, const char *fmt, void *data __UNUSED__, va_list args) +_e_log_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc EINA_UNUSED, int line, const char *fmt, void *data EINA_UNUSED, va_list args) { const char *color; diff --git a/src/bin/e_main.c b/src/bin/e_main.c index 385f90d7af..10fe41e74f 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -70,9 +70,9 @@ static double t0, t1, t2; static void _e_main_shutdown(int errcode); static void _e_main_shutdown_push(int (*func)(void)); static void _e_main_parse_arguments(int argc, char **argv); -static Eina_Bool _e_main_cb_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__); -static Eina_Bool _e_main_cb_signal_hup(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__); -static Eina_Bool _e_main_cb_signal_user(void *data __UNUSED__, int ev_type __UNUSED__, void *ev); +static Eina_Bool _e_main_cb_signal_exit(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev EINA_UNUSED); +static Eina_Bool _e_main_cb_signal_hup(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev EINA_UNUSED); +static Eina_Bool _e_main_cb_signal_user(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev); static int _e_main_dirs_init(void); static int _e_main_dirs_shutdown(void); static int _e_main_path_init(void); @@ -84,10 +84,10 @@ static void _e_main_desk_save(void); static void _e_main_desk_restore(void); static void _e_main_efreet_paths_init(void); static void _e_main_modules_load(Eina_Bool safe_mode); -static Eina_Bool _e_main_cb_x_flusher(void *data __UNUSED__); -static Eina_Bool _e_main_cb_idle_before(void *data __UNUSED__); -static Eina_Bool _e_main_cb_idle_after(void *data __UNUSED__); -static Eina_Bool _e_main_cb_startup_fake_end(void *data __UNUSED__); +static Eina_Bool _e_main_cb_x_flusher(void *data EINA_UNUSED); +static Eina_Bool _e_main_cb_idle_before(void *data EINA_UNUSED); +static Eina_Bool _e_main_cb_idle_after(void *data EINA_UNUSED); +static Eina_Bool _e_main_cb_startup_fake_end(void *data EINA_UNUSED); /* local variables */ static Eina_Bool really_know = EINA_FALSE; @@ -1252,7 +1252,7 @@ _e_main_parse_arguments(int argc, char **argv) } EINTERN void -_e_main_cb_x_fatal(void *data __UNUSED__) +_e_main_cb_x_fatal(void *data EINA_UNUSED) { e_error_message_show("Lost X Connection.\n"); ecore_main_loop_quit(); @@ -1264,7 +1264,7 @@ _e_main_cb_x_fatal(void *data __UNUSED__) } static Eina_Bool -_e_main_cb_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__) +_e_main_cb_signal_exit(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev EINA_UNUSED) { /* called on ctrl-c, kill (pid) (also SIGINT, SIGTERM and SIGQIT) */ e_sys_action_do(E_SYS_EXIT, NULL); @@ -1272,14 +1272,14 @@ _e_main_cb_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev _ } static Eina_Bool -_e_main_cb_signal_hup(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__) +_e_main_cb_signal_hup(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev EINA_UNUSED) { e_sys_action_do(E_SYS_RESTART, NULL); return ECORE_CALLBACK_RENEW; } static Eina_Bool -_e_main_cb_signal_user(void *data __UNUSED__, int ev_type __UNUSED__, void *ev) +_e_main_cb_signal_user(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev) { Ecore_Event_Signal_User *e = ev; @@ -1738,7 +1738,7 @@ _e_main_modules_load(Eina_Bool safe_mode) } static Eina_Bool -_e_main_cb_idle_before(void *data __UNUSED__) +_e_main_cb_idle_before(void *data EINA_UNUSED) { e_menu_idler_before(); e_client_idler_before(); @@ -1748,7 +1748,7 @@ _e_main_cb_idle_before(void *data __UNUSED__) } static Eina_Bool -_e_main_cb_idle_after(void *data __UNUSED__) +_e_main_cb_idle_after(void *data EINA_UNUSED) { static int first_idle = 1; @@ -1774,7 +1774,7 @@ _e_main_cb_idle_after(void *data __UNUSED__) } static Eina_Bool -_e_main_cb_x_flusher(void *data __UNUSED__) +_e_main_cb_x_flusher(void *data EINA_UNUSED) { eet_clearcache(); #ifndef HAVE_WAYLAND_ONLY @@ -1785,7 +1785,7 @@ _e_main_cb_x_flusher(void *data __UNUSED__) } static Eina_Bool -_e_main_cb_startup_fake_end(void *data __UNUSED__) +_e_main_cb_startup_fake_end(void *data EINA_UNUSED) { e_init_hide(); return ECORE_CALLBACK_CANCEL; diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index bd0ea2317d..2f084994c3 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -484,7 +484,7 @@ e_menu_title_set(E_Menu *m, const char *title) } EAPI void -e_menu_icon_file_set(E_Menu *m __UNUSED__, const char *icon __UNUSED__) +e_menu_icon_file_set(E_Menu *m EINA_UNUSED, const char *icon EINA_UNUSED) { /* FIXME: support menu icons E_OBJECT_CHECK(m); @@ -2643,7 +2643,7 @@ _e_menu_auto_place(E_Menu *m, int x, int y, int w, int h) } static void -_e_menu_cb_item_in(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_menu_cb_item_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Menu_Item *mi = data; @@ -2654,7 +2654,7 @@ _e_menu_cb_item_in(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED_ } static void -_e_menu_cb_item_out(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info EINA_UNUSED) +_e_menu_cb_item_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Menu_Item *mi = data; /* this can be triggered when creating menus if the new menu is on top of its parent */ @@ -2723,7 +2723,7 @@ _e_menu_cb_mouse_evas_down(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED) } static Eina_Bool -_e_menu_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_menu_cb_mouse_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Button *ev; @@ -2747,7 +2747,7 @@ _e_menu_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_menu_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_menu_cb_mouse_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Button *ev; unsigned int t; @@ -2798,7 +2798,7 @@ _e_menu_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_menu_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_menu_cb_mouse_move(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Move *ev; Eina_List *l, *tmp; @@ -2872,7 +2872,7 @@ _e_menu_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_menu_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_menu_cb_mouse_wheel(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Wheel *ev; @@ -2896,7 +2896,7 @@ _e_menu_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_menu_cb_scroll_animator(void *data __UNUSED__) +_e_menu_cb_scroll_animator(void *data EINA_UNUSED) { double t, dt; double dx, dy; @@ -2946,7 +2946,7 @@ _e_menu_cb_scroll_animator(void *data __UNUSED__) } static void -_e_menu_cb_item_submenu_post_default(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_menu_cb_item_submenu_post_default(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Menu *subm; diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 8940c242dd..108bf089ad 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -782,7 +782,7 @@ _e_module_cb_dialog_disable(void *data, E_Dialog *dia) } static Eina_Bool -_e_module_cb_idler(void *data __UNUSED__) +_e_module_cb_idler(void *data EINA_UNUSED) { while (_e_modules_delayed) { @@ -837,7 +837,7 @@ _e_module_sort_priority(const void *d1, const void *d2) } static void -_e_module_event_update_free(void *data __UNUSED__, void *event) +_e_module_event_update_free(void *data EINA_UNUSED, void *event) { E_Event_Module_Update *ev; diff --git a/src/bin/e_moveresize.c b/src/bin/e_moveresize.c index 8d82dcabf5..b5a844d70b 100644 --- a/src/bin/e_moveresize.c +++ b/src/bin/e_moveresize.c @@ -82,7 +82,7 @@ e_moveresize_client_extents(const E_Client *ec, int *w, int *h) } static void -_e_resize_begin(void *data __UNUSED__, E_Client *ec) +_e_resize_begin(void *data EINA_UNUSED, E_Client *ec) { Evas_Object *o; Evas_Coord ew, eh; @@ -122,7 +122,7 @@ _e_resize_begin(void *data __UNUSED__, E_Client *ec) } static void -_e_resize_end(void *data __UNUSED__, E_Client *ec __UNUSED__) +_e_resize_end(void *data EINA_UNUSED, E_Client *ec EINA_UNUSED) { if (e_config->resize_info_visible) { @@ -138,7 +138,7 @@ _e_resize_end(void *data __UNUSED__, E_Client *ec __UNUSED__) } static void -_e_resize_update(void *data __UNUSED__, E_Client *ec) +_e_resize_update(void *data EINA_UNUSED, E_Client *ec) { char buf[40]; int w, h; @@ -155,7 +155,7 @@ _e_resize_update(void *data __UNUSED__, E_Client *ec) } static void -_e_move_begin(void *data __UNUSED__, E_Client *ec) +_e_move_begin(void *data EINA_UNUSED, E_Client *ec) { Evas_Object *o; Evas_Coord ew, eh; @@ -196,7 +196,7 @@ _e_move_begin(void *data __UNUSED__, E_Client *ec) } static void -_e_move_end(void *data __UNUSED__, E_Client *ec __UNUSED__) +_e_move_end(void *data EINA_UNUSED, E_Client *ec EINA_UNUSED) { if (e_config->move_info_visible) { @@ -210,7 +210,7 @@ _e_move_end(void *data __UNUSED__, E_Client *ec __UNUSED__) } static void -_e_move_update(void *data __UNUSED__, E_Client *ec) +_e_move_update(void *data EINA_UNUSED, E_Client *ec) { char buf[40]; diff --git a/src/bin/e_msg.c b/src/bin/e_msg.c index 536b01298e..4edcc43ce8 100644 --- a/src/bin/e_msg.c +++ b/src/bin/e_msg.c @@ -115,7 +115,7 @@ e_msg_handler_del(E_Msg_Handler *emsgh) /* local subsystem functions */ static Eina_Bool -_e_msg_event_cb(void *data __UNUSED__, int ev_type __UNUSED__, void *ev) +_e_msg_event_cb(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev) { E_Msg_Event *e; Eina_List *l; @@ -138,7 +138,7 @@ _e_msg_event_cb(void *data __UNUSED__, int ev_type __UNUSED__, void *ev) } static void -_e_msg_event_free(void *data __UNUSED__, void *ev) +_e_msg_event_free(void *data EINA_UNUSED, void *ev) { E_Msg_Event *e; diff --git a/src/bin/e_msgbus.c b/src/bin/e_msgbus.c index 5f3c478922..1c8a9347ca 100644 --- a/src/bin/e_msgbus.c +++ b/src/bin/e_msgbus.c @@ -163,8 +163,8 @@ e_msgbus_interface_attach(const Eldbus_Service_Interface_Desc *desc) } static void -_e_msgbus_request_name_cb(void *data __UNUSED__, const Eldbus_Message *msg, - Eldbus_Pending *pending __UNUSED__) +_e_msgbus_request_name_cb(void *data EINA_UNUSED, const Eldbus_Message *msg, + Eldbus_Pending *pending EINA_UNUSED) { unsigned int flag; @@ -186,7 +186,7 @@ _e_msgbus_request_name_cb(void *data __UNUSED__, const Eldbus_Message *msg, /* Core Handlers */ static Eldbus_Message * -_e_msgbus_core_version_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_msgbus_core_version_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { Eldbus_Message *reply = eldbus_message_method_return_new(msg); @@ -196,7 +196,7 @@ _e_msgbus_core_version_cb(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -_e_msgbus_core_restart_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_msgbus_core_restart_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { e_sys_action_do(E_SYS_RESTART, NULL); @@ -204,7 +204,7 @@ _e_msgbus_core_restart_cb(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -_e_msgbus_core_shutdown_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_msgbus_core_shutdown_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { e_sys_action_do(E_SYS_EXIT, NULL); @@ -213,7 +213,7 @@ _e_msgbus_core_shutdown_cb(const Eldbus_Service_Interface *iface __UNUSED__, /* Modules Handlers */ static Eldbus_Message * -_e_msgbus_module_load_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_msgbus_module_load_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { char *module; @@ -232,7 +232,7 @@ _e_msgbus_module_load_cb(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -_e_msgbus_module_unload_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_msgbus_module_unload_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { char *module; @@ -253,7 +253,7 @@ _e_msgbus_module_unload_cb(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -_e_msgbus_module_enable_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_msgbus_module_enable_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { char *module; @@ -273,7 +273,7 @@ _e_msgbus_module_enable_cb(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -_e_msgbus_module_disable_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_msgbus_module_disable_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { char *module; @@ -293,7 +293,7 @@ _e_msgbus_module_disable_cb(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -_e_msgbus_module_list_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_msgbus_module_list_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { Eina_List *l; @@ -329,7 +329,7 @@ _e_msgbus_module_list_cb(const Eldbus_Service_Interface *iface __UNUSED__, /* Profile Handlers */ static Eldbus_Message * -_e_msgbus_profile_set_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_msgbus_profile_set_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { char *profile; @@ -348,7 +348,7 @@ _e_msgbus_profile_set_cb(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -_e_msgbus_profile_get_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_msgbus_profile_get_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { Eldbus_Message *reply = eldbus_message_method_return_new(msg); @@ -361,7 +361,7 @@ _e_msgbus_profile_get_cb(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -_e_msgbus_profile_list_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_msgbus_profile_list_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { Eina_List *l; @@ -390,7 +390,7 @@ _e_msgbus_profile_list_cb(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -_e_msgbus_profile_add_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_msgbus_profile_add_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { char *profile; @@ -404,7 +404,7 @@ _e_msgbus_profile_add_cb(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -_e_msgbus_profile_delete_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_msgbus_profile_delete_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { char *profile; @@ -421,7 +421,7 @@ _e_msgbus_profile_delete_cb(const Eldbus_Service_Interface *iface __UNUSED__, /* Window handlers */ static Eldbus_Message * -_e_msgbus_window_list_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_msgbus_window_list_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { const Eina_List *l; @@ -457,7 +457,7 @@ _e_msgbus_window_list_cb(const Eldbus_Service_Interface *iface __UNUSED__, #define E_MSGBUS_WIN_ACTION_CB_BEGIN(NAME) \ static Eldbus_Message * \ - _e_msgbus_window_##NAME##_cb(const Eldbus_Service_Interface * iface __UNUSED__, \ + _e_msgbus_window_##NAME##_cb(const Eldbus_Service_Interface * iface EINA_UNUSED, \ const Eldbus_Message * msg) \ { \ E_Client *ec; \ diff --git a/src/bin/e_obj_dialog.c b/src/bin/e_obj_dialog.c index 3cb74451bc..07325f66e2 100644 --- a/src/bin/e_obj_dialog.c +++ b/src/bin/e_obj_dialog.c @@ -10,7 +10,7 @@ static void _e_obj_dialog_cb_close(void *data, Evas_Object *obj, const char *emi /* externally accessible functions */ static 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; @@ -135,7 +135,7 @@ _e_obj_dialog_cb_delete(E_Obj_Dialog *od, Evas *e EINA_UNUSED, Evas_Object *obj } static void -_e_obj_dialog_cb_close(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_obj_dialog_cb_close(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Obj_Dialog *od; diff --git a/src/bin/e_open.c b/src/bin/e_open.c index e3870270b5..721f2759db 100644 --- a/src/bin/e_open.c +++ b/src/bin/e_open.c @@ -116,7 +116,7 @@ handler_find(const char *mime) } static void * -get_command(void *data, Efreet_Desktop *desktop __UNUSED__, char *command, int remaining __UNUSED__) +get_command(void *data, Efreet_Desktop *desktop EINA_UNUSED, char *command, int remaining EINA_UNUSED) { Eina_List **p_cmd = data; *p_cmd = eina_list_append(*p_cmd, command); diff --git a/src/bin/e_order.c b/src/bin/e_order.c index 72c6f26f99..1c0fe7b079 100644 --- a/src/bin/e_order.c +++ b/src/bin/e_order.c @@ -247,7 +247,7 @@ _e_order_cb_monitor_delay(void *data) } static void -_e_order_cb_monitor(void *data, Ecore_File_Monitor *em __UNUSED__, Ecore_File_Event event __UNUSED__, const char *path __UNUSED__) +_e_order_cb_monitor(void *data, Ecore_File_Monitor *em EINA_UNUSED, Ecore_File_Event event EINA_UNUSED, const char *path EINA_UNUSED) { E_Order *eo = data; @@ -328,7 +328,7 @@ _e_order_save(E_Order *eo) } static Eina_Bool -_e_order_cb_efreet_cache_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__) +_e_order_cb_efreet_cache_update(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev EINA_UNUSED) { Eina_List *l; E_Order *eo; diff --git a/src/bin/e_pan.c b/src/bin/e_pan.c index 9ba5a3c482..5183c4d1ea 100644 --- a/src/bin/e_pan.c +++ b/src/bin/e_pan.c @@ -131,7 +131,7 @@ e_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) /* local subsystem functions */ static void -_e_smart_child_del_hook(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_smart_child_del_hook(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Smart_Data *sd; @@ -141,7 +141,7 @@ _e_smart_child_del_hook(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE } static void -_e_smart_child_resize_hook(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_smart_child_resize_hook(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Smart_Data *sd; Evas_Coord w, h; diff --git a/src/bin/e_path.c b/src/bin/e_path.c index 4d1dc64a1d..f19a533460 100644 --- a/src/bin/e_path.c +++ b/src/bin/e_path.c @@ -368,7 +368,7 @@ _e_path_cache_free(E_Path *ep) } static Eina_Bool -_e_path_cache_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) +_e_path_cache_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED) { eina_stringshare_del(data); return 1; diff --git a/src/bin/e_place.c b/src/bin/e_place.c index 2e12bf8905..e35496f59a 100644 --- a/src/bin/e_place.c +++ b/src/bin/e_place.c @@ -441,7 +441,7 @@ e_place_zone_region_smart(E_Zone *zone, Eina_List *skiplist, int x, int y, int w } EAPI int -e_place_zone_cursor(E_Zone *zone, int x __UNUSED__, int y __UNUSED__, int w, int h, int it, int *rx, int *ry) +e_place_zone_cursor(E_Zone *zone, int x EINA_UNUSED, int y EINA_UNUSED, int w, int h, int it, int *rx, int *ry) { int cursor_x = 0, cursor_y = 0; int zone_right, zone_bottom; diff --git a/src/bin/e_powersave.c b/src/bin/e_powersave.c index fc5a16eeb2..d3c81cc9b1 100644 --- a/src/bin/e_powersave.c +++ b/src/bin/e_powersave.c @@ -10,7 +10,7 @@ struct _E_Powersave_Deferred_Action /* local subsystem functions */ static Eina_Bool _e_powersave_cb_deferred_timer(void *data); static void _e_powersave_mode_eval(void); -static void _e_powersave_event_update_free(void *data __UNUSED__, void *event); +static void _e_powersave_event_update_free(void *data EINA_UNUSED, void *event); /* local subsystem globals */ EAPI int E_EVENT_POWERSAVE_UPDATE = 0; @@ -116,7 +116,7 @@ e_powersave_mode_max_get(void) /* local subsystem functions */ static Eina_Bool -_e_powersave_cb_deferred_timer(void *data __UNUSED__) +_e_powersave_cb_deferred_timer(void *data EINA_UNUSED) { E_Powersave_Deferred_Action *pa; @@ -173,7 +173,7 @@ _e_powersave_mode_eval(void) } static void -_e_powersave_event_update_free(void *data __UNUSED__, void *event) +_e_powersave_event_update_free(void *data EINA_UNUSED, void *event) { free(event); } diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c index 61076d92f6..ab1fa23316 100644 --- a/src/bin/e_remember.c +++ b/src/bin/e_remember.c @@ -129,7 +129,7 @@ e_remember_internal_save(void) } static Eina_Bool -_e_remember_restore_idler_cb(void *d __UNUSED__) +_e_remember_restore_idler_cb(void *d EINA_UNUSED) { E_Remember *rem; E_Action *act_fm = NULL, *act; @@ -190,7 +190,7 @@ _e_remember_restore_idler_cb(void *d __UNUSED__) } static Eina_Bool -_e_remember_restore_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_e_remember_restore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { handlers = eina_list_free(handlers); if (!remembers->list) return ECORE_CALLBACK_PASS_ON; @@ -606,7 +606,7 @@ _e_remember_free(E_Remember *rem) } static void -_e_remember_cb_hook_eval_post_new_client(void *data __UNUSED__, E_Client *ec) +_e_remember_cb_hook_eval_post_new_client(void *data EINA_UNUSED, E_Client *ec) { // remember only when window was modified // if (!ec->new_client) return; @@ -642,7 +642,7 @@ _e_remember_cb_hook_eval_post_new_client(void *data __UNUSED__, E_Client *ec) } static void -_e_remember_cb_hook_pre_post_fetch(void *data __UNUSED__, E_Client *ec) +_e_remember_cb_hook_pre_post_fetch(void *data EINA_UNUSED, E_Client *ec) { E_Remember *rem = NULL; int temporary = 0; diff --git a/src/bin/e_resist.c b/src/bin/e_resist.c index 8b94823064..ea0b830b1e 100644 --- a/src/bin/e_resist.c +++ b/src/bin/e_resist.c @@ -88,7 +88,7 @@ e_resist_client_position(Eina_List *skiplist, } EAPI int -e_resist_gadman_position(Eina_List *skiplist __UNUSED__, +e_resist_gadman_position(Eina_List *skiplist EINA_UNUSED, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry) diff --git a/src/bin/e_screensaver.c b/src/bin/e_screensaver.c index 6be9b7ab8a..ef10712098 100644 --- a/src/bin/e_screensaver.c +++ b/src/bin/e_screensaver.c @@ -114,7 +114,7 @@ e_screensaver_force_update(void) } static Eina_Bool -_e_screensaver_handler_config_mode_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_e_screensaver_handler_config_mode_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { e_screensaver_update(); return ECORE_CALLBACK_PASS_ON; @@ -128,7 +128,7 @@ _e_screensaver_ask_presentation_del(void *data) } static void -_e_screensaver_ask_presentation_yes(void *data __UNUSED__, E_Dialog *dia) +_e_screensaver_ask_presentation_yes(void *data EINA_UNUSED, E_Dialog *dia) { e_config->mode.presentation = 1; e_config_mode_changed(); @@ -138,14 +138,14 @@ _e_screensaver_ask_presentation_yes(void *data __UNUSED__, E_Dialog *dia) } static void -_e_screensaver_ask_presentation_no(void *data __UNUSED__, E_Dialog *dia) +_e_screensaver_ask_presentation_no(void *data EINA_UNUSED, E_Dialog *dia) { e_object_del(E_OBJECT(dia)); _e_screensaver_ask_presentation_count = 0; } static void -_e_screensaver_ask_presentation_no_increase(void *data __UNUSED__, E_Dialog *dia) +_e_screensaver_ask_presentation_no_increase(void *data EINA_UNUSED, E_Dialog *dia) { _e_screensaver_ask_presentation_count++; e_screensaver_update(); @@ -153,7 +153,7 @@ _e_screensaver_ask_presentation_no_increase(void *data __UNUSED__, E_Dialog *dia } static void -_e_screensaver_ask_presentation_no_forever(void *data __UNUSED__, E_Dialog *dia) +_e_screensaver_ask_presentation_no_forever(void *data EINA_UNUSED, E_Dialog *dia) { e_config->screensaver_ask_presentation = 0; e_config_save_queue(); @@ -162,7 +162,7 @@ _e_screensaver_ask_presentation_no_forever(void *data __UNUSED__, E_Dialog *dia) } static void -_e_screensaver_ask_presentation_key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event) +_e_screensaver_ask_presentation_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event) { Evas_Event_Key_Down *ev = event; E_Dialog *dia = data; @@ -212,7 +212,7 @@ _e_screensaver_ask_presentation_mode(void) } static Eina_Bool -_e_screensaver_suspend_cb(void *data __UNUSED__) +_e_screensaver_suspend_cb(void *data EINA_UNUSED) { _e_screensaver_suspend_timer = NULL; if (e_config->screensaver_suspend) @@ -225,7 +225,7 @@ _e_screensaver_suspend_cb(void *data __UNUSED__) } static Eina_Bool -_e_screensaver_handler_powersave_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_e_screensaver_handler_powersave_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { if ((e_config->screensaver_suspend) && (_e_screensaver_on)) { @@ -241,7 +241,7 @@ _e_screensaver_handler_powersave_cb(void *data __UNUSED__, int type __UNUSED__, static double last_start = 0.0; static Eina_Bool -_e_screensaver_handler_screensaver_on_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_e_screensaver_handler_screensaver_on_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { _e_screensaver_on = EINA_TRUE; if (_e_screensaver_suspend_timer) @@ -259,7 +259,7 @@ _e_screensaver_handler_screensaver_on_cb(void *data __UNUSED__, int type __UNUSE } static Eina_Bool -_e_screensaver_handler_screensaver_off_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_e_screensaver_handler_screensaver_off_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { // e_screensaver_force_update(); // e_dpms_force_update(); @@ -285,21 +285,21 @@ _e_screensaver_handler_screensaver_off_cb(void *data __UNUSED__, int type __UNUS } static Eina_Bool -_e_screensaver_handler_border_fullscreen_check_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_e_screensaver_handler_border_fullscreen_check_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { e_screensaver_update(); return ECORE_CALLBACK_PASS_ON; } static Eina_Bool -_e_screensaver_handler_border_desk_set_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_e_screensaver_handler_border_desk_set_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { e_screensaver_update(); return ECORE_CALLBACK_PASS_ON; } static Eina_Bool -_e_screensaver_handler_desk_show_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_e_screensaver_handler_desk_show_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { e_screensaver_update(); return ECORE_CALLBACK_PASS_ON; diff --git a/src/bin/e_scrollframe.c b/src/bin/e_scrollframe.c index fe2e9b61d4..9935d53855 100644 --- a/src/bin/e_scrollframe.c +++ b/src/bin/e_scrollframe.c @@ -407,7 +407,7 @@ e_scrollframe_key_navigation_set(Evas_Object *obj, Eina_Bool enabled) /* local subsystem functions */ static void -_e_smart_edje_drag_v(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_smart_edje_drag_v(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Smart_Data *sd; @@ -416,7 +416,7 @@ _e_smart_edje_drag_v(void *data, Evas_Object *obj __UNUSED__, const char *emissi } static void -_e_smart_edje_drag_h(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_smart_edje_drag_h(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Smart_Data *sd; @@ -425,7 +425,7 @@ _e_smart_edje_drag_h(void *data, Evas_Object *obj __UNUSED__, const char *emissi } static void -_e_smart_child_del_hook(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_smart_child_del_hook(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Smart_Data *sd; @@ -436,7 +436,7 @@ _e_smart_child_del_hook(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE } static void -_e_smart_pan_changed_hook(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_smart_pan_changed_hook(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Evas_Coord w, h; E_Smart_Data *sd; @@ -453,7 +453,7 @@ _e_smart_pan_changed_hook(void *data, Evas_Object *obj __UNUSED__, void *event_i } static void -_e_smart_pan_pan_changed_hook(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_smart_pan_pan_changed_hook(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Evas_Coord x, y; E_Smart_Data *sd; @@ -465,7 +465,7 @@ _e_smart_pan_pan_changed_hook(void *data, Evas_Object *obj __UNUSED__, void *eve } static void -_e_smart_event_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_smart_event_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Wheel *ev; E_Smart_Data *sd; @@ -485,7 +485,7 @@ _e_smart_event_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__ } static void -_e_smart_event_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_smart_event_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; E_Smart_Data *sd; @@ -548,7 +548,7 @@ _e_smart_momentum_animator(void *data) } static void -_e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *event_info) +_e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; E_Smart_Data *sd; @@ -613,7 +613,7 @@ _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void * } static void -_e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *event_info) +_e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev; E_Smart_Data *sd; @@ -688,7 +688,7 @@ _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void } static void -_e_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_smart_event_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Key_Down *ev; E_Smart_Data *sd; diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c index 47c30a4944..6045f0483b 100644 --- a/src/bin/e_shelf.c +++ b/src/bin/e_shelf.c @@ -21,7 +21,7 @@ static Eina_Bool _e_shelf_cb_mouse_in(void *data, int type, void *event); //static Eina_Bool _e_shelf_cb_mouse_out(void *data, int type, void *event); //static void _e_shelf_cb_mouse_out2(E_Shelf *es, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Out *ev); static int _e_shelf_cb_id_sort(const void *data1, const void *data2); -static void _e_shelf_cb_menu_rename(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__); +static void _e_shelf_cb_menu_rename(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED); static Eina_Bool _e_shelf_cb_hide_animator(void *data); static Eina_Bool _e_shelf_cb_hide_animator_timer(void *data); static Eina_Bool _e_shelf_cb_hide_urgent_timer(void *data); @@ -1040,14 +1040,14 @@ _e_shelf_del_cb(void *d) } static void -_e_shelf_event_rename_end_cb(void *data __UNUSED__, E_Event_Shelf *ev) +_e_shelf_event_rename_end_cb(void *data EINA_UNUSED, E_Event_Shelf *ev) { e_object_unref(E_OBJECT(ev->shelf)); free(ev); } static void -_e_shelf_free_cb(void *data __UNUSED__, void *event) +_e_shelf_free_cb(void *data EINA_UNUSED, void *event) { E_Event_Shelf *ev = event; E_Shelf *es = ev->shelf; @@ -1126,7 +1126,7 @@ _e_shelf_free(E_Shelf *es) } static void -_e_shelf_gadcon_min_size_request(void *data __UNUSED__, E_Gadcon *gc __UNUSED__, Evas_Coord w __UNUSED__, Evas_Coord h __UNUSED__) +_e_shelf_gadcon_min_size_request(void *data EINA_UNUSED, E_Gadcon *gc EINA_UNUSED, Evas_Coord w EINA_UNUSED, Evas_Coord h EINA_UNUSED) { return; } @@ -1484,7 +1484,7 @@ _e_shelf_menu_append(E_Shelf *es, E_Menu *mn) } static void -_e_shelf_cb_menu_items_append(void *data, E_Gadcon_Client *gcc __UNUSED__, E_Menu *mn) +_e_shelf_cb_menu_items_append(void *data, E_Gadcon_Client *gcc EINA_UNUSED, E_Menu *mn) { E_Shelf *es; @@ -1511,7 +1511,7 @@ _e_shelf_cb_urgent_show(void *data) } static void -_e_shelf_cb_menu_autohide(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_shelf_cb_menu_autohide(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Shelf *es = data; @@ -1525,7 +1525,7 @@ _e_shelf_cb_menu_autohide(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UN } static void -_e_shelf_cb_menu_refresh(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_shelf_cb_menu_refresh(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Shelf *es = data; @@ -1534,7 +1534,7 @@ _e_shelf_cb_menu_refresh(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNU } static void -_e_shelf_cb_menu_config(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_shelf_cb_menu_config(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Shelf *es; @@ -1543,7 +1543,7 @@ _e_shelf_cb_menu_config(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUS } static void -_e_shelf_cb_menu_edit(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_shelf_cb_menu_edit(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Shelf *es; @@ -1561,7 +1561,7 @@ _e_shelf_cb_menu_edit(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED } static void -_e_shelf_cb_menu_contents(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_shelf_cb_menu_contents(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Shelf *es; @@ -1590,7 +1590,7 @@ _e_shelf_cb_confirm_dialog_yes(void *data) } static void -_e_shelf_cb_menu_delete(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_shelf_cb_menu_delete(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Shelf *es; @@ -1617,7 +1617,7 @@ _e_shelf_cb_menu_delete(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUS } static void -_e_shelf_cb_menu_post(void *data, E_Menu *m __UNUSED__) +_e_shelf_cb_menu_post(void *data, E_Menu *m EINA_UNUSED) { E_Shelf *es; @@ -1628,7 +1628,7 @@ _e_shelf_cb_menu_post(void *data, E_Menu *m __UNUSED__) } static void -_e_shelf_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_shelf_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; E_Shelf *es; @@ -1830,7 +1830,7 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event) #if 0 static void -_e_shelf_cb_mouse_out2(E_Shelf *es, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, Evas_Event_Mouse_Out *ev) +_e_shelf_cb_mouse_out2(E_Shelf *es, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Event_Mouse_Out *ev) { int x, y, w, h; @@ -1881,7 +1881,7 @@ _e_shelf_cb_mouse_out(void *data, int type, void *event) #endif static void -_e_shelf_cb_dummy_moveresize(E_Shelf *es, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_shelf_cb_dummy_moveresize(E_Shelf *es, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { int x, y, w, h; @@ -1894,7 +1894,7 @@ _e_shelf_cb_dummy_moveresize(E_Shelf *es, Evas *e __UNUSED__, Evas_Object *obj _ } static void -_e_shelf_cb_dummy_del(E_Shelf *es, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_shelf_cb_dummy_del(E_Shelf *es, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { e_object_free(E_OBJECT(es)); } @@ -2108,7 +2108,7 @@ _e_shelf_cb_instant_hide_timer(void *data) } static Eina_Bool -_e_shelf_gadcon_populate_handler_cb(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_shelf_gadcon_populate_handler_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Gadcon_Populate *ev = event; Eina_List *l; @@ -2154,7 +2154,7 @@ _e_shelf_cb_menu_rename_cb(void *data) } static void -_e_shelf_cb_menu_rename(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_shelf_cb_menu_rename(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Shelf *es = data; if (es->rename_dialog) return; diff --git a/src/bin/e_signals.c b/src/bin/e_signals.c index 7d2b8e22b4..b37e043069 100644 --- a/src/bin/e_signals.c +++ b/src/bin/e_signals.c @@ -67,7 +67,7 @@ _e_write_safe_int(int fd, const char *buf, size_t size) * with the -rdynamic flag to GCC for any sort of decent output. */ EAPI void -e_sigseg_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) +e_sigseg_act(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UNUSED) { #ifdef HAVE_WAYLAND_ONLY Eina_List *list, *l, *ll; @@ -95,7 +95,7 @@ e_sigseg_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__ } EAPI void -e_sigill_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) +e_sigill_act(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UNUSED) { // In case of a sigill in Enlightenment, Enlightenment start will catch the sigill and continue, // because evas cpu detection use that behaviour. But if we get a SIGILL after that, we endup in @@ -113,7 +113,7 @@ e_sigill_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__ } EAPI void -e_sigfpe_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) +e_sigfpe_act(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UNUSED) { #ifdef HAVE_WAYLAND_ONLY Eina_List *list, *l, *ll; @@ -141,7 +141,7 @@ e_sigfpe_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__ } EAPI void -e_sigbus_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) +e_sigbus_act(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UNUSED) { #ifdef HAVE_WAYLAND_ONLY Eina_List *list, *l, *ll; @@ -169,7 +169,7 @@ e_sigbus_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__ } EAPI void -e_sigabrt_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) +e_sigabrt_act(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UNUSED) { #ifdef HAVE_WAYLAND_ONLY Eina_List *list, *l, *ll; diff --git a/src/bin/e_slidecore.c b/src/bin/e_slidecore.c index 77a1afac19..081c72202e 100644 --- a/src/bin/e_slidecore.c +++ b/src/bin/e_slidecore.c @@ -128,7 +128,7 @@ _e_smart_cb_slide_animator(void *data) } static void -_e_smart_event_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_smart_event_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; E_Smart_Data *sd; @@ -144,7 +144,7 @@ _e_smart_event_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU } static void -_e_smart_event_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_smart_event_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; E_Smart_Data *sd; @@ -169,7 +169,7 @@ _e_smart_event_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE } static void -_e_smart_event_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_smart_event_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev; E_Smart_Data *sd; diff --git a/src/bin/e_slider.c b/src/bin/e_slider.c index 1da664e796..7445256dc0 100644 --- a/src/bin/e_slider.c +++ b/src/bin/e_slider.c @@ -44,7 +44,7 @@ static void _e_smart_signal_cb_drag(void *data, Evas_Object *obj, const cha static void _e_smart_signal_cb_drag_start(void *data, Evas_Object *obj, const char *emission, const char *source); static void _e_smart_signal_cb_drag_stop(void *data, Evas_Object *obj, const char *emission, const char *source); static void _e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *event_info); +static void _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj EINA_UNUSED, void *event_info); static void _e_smart_reconfigure(E_Smart_Data *sd); static void _e_smart_add(Evas_Object *obj); static void _e_smart_del(Evas_Object *obj); @@ -365,7 +365,7 @@ _e_smart_format_update(E_Smart_Data *sd) } static void -_e_smart_signal_cb_drag(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_smart_signal_cb_drag(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Smart_Data *sd = data; double pval = sd->val; @@ -379,7 +379,7 @@ _e_smart_signal_cb_drag(void *data, Evas_Object *obj __UNUSED__, const char *emi } static void -_e_smart_signal_cb_drag_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_smart_signal_cb_drag_start(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Smart_Data *sd = data; double pval = sd->val; @@ -393,7 +393,7 @@ _e_smart_signal_cb_drag_start(void *data, Evas_Object *obj __UNUSED__, const cha } static void -_e_smart_signal_cb_drag_stop(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_smart_signal_cb_drag_stop(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Smart_Data *sd = data; double pval = sd->val; @@ -408,7 +408,7 @@ _e_smart_signal_cb_drag_stop(void *data, Evas_Object *obj __UNUSED__, const char } static void -_e_smart_signal_cb_wheel_up(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_smart_signal_cb_wheel_up(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Smart_Data *sd = data; @@ -418,7 +418,7 @@ _e_smart_signal_cb_wheel_up(void *data, Evas_Object *obj __UNUSED__, const char } static void -_e_smart_signal_cb_wheel_down(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_smart_signal_cb_wheel_down(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Smart_Data *sd = data; @@ -428,7 +428,7 @@ _e_smart_signal_cb_wheel_down(void *data, Evas_Object *obj __UNUSED__, const cha } static void -_e_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_smart_event_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Key_Down *ev = event_info; E_Smart_Data *sd = data; @@ -477,7 +477,7 @@ _e_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE } static void -_e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *event_info) +_e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev = event_info; Evas_Coord x, y, w, h; diff --git a/src/bin/e_slidesel.c b/src/bin/e_slidesel.c index 6387a7f4c9..c1e73bdf3f 100644 --- a/src/bin/e_slidesel.c +++ b/src/bin/e_slidesel.c @@ -102,7 +102,7 @@ e_slidesel_jump(Evas_Object *obj, int num) /* local subsystem functions */ static void -_e_smart_event_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_smart_event_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; E_Smart_Data *sd; @@ -121,7 +121,7 @@ _e_smart_event_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU } static void -_e_smart_event_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_smart_event_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; E_Smart_Data *sd; @@ -151,7 +151,7 @@ _e_smart_event_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE } static void -_e_smart_event_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_smart_event_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev; E_Smart_Data *sd; @@ -174,7 +174,7 @@ _e_smart_event_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU } static void -_e_smart_event_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_smart_event_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { /* Evas_Event_Key_Down *ev; diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c index 9394284e4a..80bacf339d 100644 --- a/src/bin/e_start_main.c +++ b/src/bin/e_start_main.c @@ -236,7 +236,7 @@ _env_path_append(const char *env, const char *path) } static void -_sigusr1(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) +_sigusr1(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UNUSED) { struct sigaction action; diff --git a/src/bin/e_startup.c b/src/bin/e_startup.c index f952fc1570..bb9cff63aa 100644 --- a/src/bin/e_startup.c +++ b/src/bin/e_startup.c @@ -69,7 +69,7 @@ _e_startup(void) } static void -_e_startup_next_cb(void *data __UNUSED__) +_e_startup_next_cb(void *data EINA_UNUSED) { _e_startup(); } @@ -92,7 +92,7 @@ _e_startup_error_dialog(const char *msg) } static Eina_Bool -_e_startup_event_cb(void *data, int ev_type __UNUSED__, void *ev) +_e_startup_event_cb(void *data, int ev_type EINA_UNUSED, void *ev) { char *buf; Efreet_Event_Cache_Update *e; diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c index 15ff123730..0b28fade23 100644 --- a/src/bin/e_sys.c +++ b/src/bin/e_sys.c @@ -357,7 +357,7 @@ e_sys_con_extra_action_list_get(void) } static void -_e_sys_systemd_inhibit_cb(void *data __UNUSED__, const Eldbus_Message *m, Eldbus_Pending *p __UNUSED__) +_e_sys_systemd_inhibit_cb(void *data EINA_UNUSED, const Eldbus_Message *m, Eldbus_Pending *p EINA_UNUSED) { int fd = -1; if (eldbus_message_error_get(m, NULL, NULL)) return; @@ -386,7 +386,7 @@ _e_sys_systemd_handle_inhibit(void) } static void -_e_sys_systemd_check_cb(void *data, const Eldbus_Message *m, Eldbus_Pending *p __UNUSED__) +_e_sys_systemd_check_cb(void *data, const Eldbus_Message *m, Eldbus_Pending *p EINA_UNUSED) { int *dest = data; char *s = NULL; @@ -415,7 +415,7 @@ _e_sys_systemd_check(void) } static void -_e_sys_systemd_exists_cb(void *data __UNUSED__, const Eldbus_Message *m, Eldbus_Pending *p __UNUSED__) +_e_sys_systemd_exists_cb(void *data EINA_UNUSED, const Eldbus_Message *m, Eldbus_Pending *p EINA_UNUSED) { const char *id = NULL; @@ -463,7 +463,7 @@ _e_sys_resume_job(void *d EINA_UNUSED) } static Eina_Bool -_e_sys_susp_hib_check_timer_cb(void *data __UNUSED__) +_e_sys_susp_hib_check_timer_cb(void *data EINA_UNUSED) { double t = ecore_time_unix_get(); @@ -494,7 +494,7 @@ _e_sys_susp_hib_check(void) /* local subsystem functions */ static Eina_Bool -_e_sys_cb_timer(void *data __UNUSED__) +_e_sys_cb_timer(void *data EINA_UNUSED) { /* exec out sys helper and ask it to test if we are allowed to do these * things @@ -522,7 +522,7 @@ _e_sys_cb_timer(void *data __UNUSED__) } static Eina_Bool -_e_sys_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_sys_cb_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Del *ev; @@ -587,7 +587,7 @@ _e_sys_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event) } static void -_e_sys_cb_logout_logout(void *data __UNUSED__, E_Dialog *dia) +_e_sys_cb_logout_logout(void *data EINA_UNUSED, E_Dialog *dia) { if (_e_sys_logout_timer) { @@ -601,7 +601,7 @@ _e_sys_cb_logout_logout(void *data __UNUSED__, E_Dialog *dia) } static void -_e_sys_cb_logout_wait(void *data __UNUSED__, E_Dialog *dia) +_e_sys_cb_logout_wait(void *data EINA_UNUSED, E_Dialog *dia) { if (_e_sys_logout_timer) ecore_timer_del(_e_sys_logout_timer); _e_sys_logout_timer = ecore_timer_add(0.5, _e_sys_cb_logout_timer, NULL); @@ -611,7 +611,7 @@ _e_sys_cb_logout_wait(void *data __UNUSED__, E_Dialog *dia) } static void -_e_sys_cb_logout_abort(void *data __UNUSED__, E_Dialog *dia) +_e_sys_cb_logout_abort(void *data EINA_UNUSED, E_Dialog *dia) { if (_e_sys_logout_timer) { @@ -655,7 +655,7 @@ _e_sys_logout_confirm_dialog_update(int remaining) } static Eina_Bool -_e_sys_cb_logout_timer(void *data __UNUSED__) +_e_sys_cb_logout_timer(void *data EINA_UNUSED) { E_Client *ec; int pending = 0; @@ -885,7 +885,7 @@ _e_sys_action_failed(void) } static int -_e_sys_action_do(E_Sys_Action a, char *param __UNUSED__, Eina_Bool raw) +_e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) { char buf[PATH_MAX]; E_Obj_Dialog *od; @@ -1102,7 +1102,7 @@ _e_sys_action_do(E_Sys_Action a, char *param __UNUSED__, Eina_Bool raw) } static void -_e_sys_dialog_cb_delete(E_Obj_Dialog *od __UNUSED__) +_e_sys_dialog_cb_delete(E_Obj_Dialog *od EINA_UNUSED) { /* If we don't NULL out the _e_sys_dialog, then the * ECORE_EXE_EVENT_DEL callback will trigger and segv if the window diff --git a/src/bin/e_theme.c b/src/bin/e_theme.c index 05525d0801..cc6b59ee38 100644 --- a/src/bin/e_theme.c +++ b/src/bin/e_theme.c @@ -1,7 +1,7 @@ #include "e.h" -static void e_theme_handler_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *path); -static int e_theme_handler_test(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *path); +static void e_theme_handler_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *path); +static int e_theme_handler_test(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *path); static E_Fm2_Mime_Handler *theme_hdl = NULL; @@ -170,7 +170,7 @@ e_theme_comp_frame_list(void) /* local subsystem functions */ static void -e_theme_handler_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *path) +e_theme_handler_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *path) { E_Action *a; char buf[PATH_MAX]; @@ -234,7 +234,7 @@ e_theme_handler_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const ch } static int -e_theme_handler_test(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *path) +e_theme_handler_test(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *path) { if (!path) return 0; if (!edje_file_group_exists(path, "e/widgets/border/default/border")) diff --git a/src/bin/e_theme_about.c b/src/bin/e_theme_about.c index bc825ea65c..5006d62a39 100644 --- a/src/bin/e_theme_about.c +++ b/src/bin/e_theme_about.c @@ -2,7 +2,7 @@ /* local subsystem functions */ static void -_cb_settings_theme(void *data EINA_UNUSED, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_settings_theme(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { e_configure_registry_call("appearance/theme", NULL, NULL); } diff --git a/src/bin/e_thumb.c b/src/bin/e_thumb.c index 12ab83b253..d1b016eca2 100644 --- a/src/bin/e_thumb.c +++ b/src/bin/e_thumb.c @@ -66,7 +66,7 @@ e_thumb_shutdown(void) } static void -_thumb_preloaded(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_thumb_preloaded(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { evas_object_smart_callback_call(data, "e_thumb_gen", NULL); } @@ -324,7 +324,7 @@ _e_thumb_gen_end(int objid) } static void -_e_thumb_del_hook(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_thumb_del_hook(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { E_Thumb *eth; @@ -390,7 +390,7 @@ _e_thumb_thumbnailers_kill_cancel(void) } static Eina_Bool -_e_thumb_cb_kill(void *data __UNUSED__) +_e_thumb_cb_kill(void *data EINA_UNUSED) { Eina_List *l; Ecore_Exe *exe; @@ -402,7 +402,7 @@ _e_thumb_cb_kill(void *data __UNUSED__) } static Eina_Bool -_e_thumb_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_thumb_cb_exe_event_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Del *ev; Ecore_Exe *exe; diff --git a/src/bin/e_thumb_main.c b/src/bin/e_thumb_main.c index c508ddde1f..eab0da16d5 100644 --- a/src/bin/e_thumb_main.c +++ b/src/bin/e_thumb_main.c @@ -152,8 +152,8 @@ _e_ipc_init(void) } static Eina_Bool -_e_ipc_cb_server_add(void *data __UNUSED__, - int type __UNUSED__, +_e_ipc_cb_server_add(void *data EINA_UNUSED, + int type EINA_UNUSED, void *event) { Ecore_Ipc_Event_Server_Add *e; @@ -167,9 +167,9 @@ _e_ipc_cb_server_add(void *data __UNUSED__, } static Eina_Bool -_e_ipc_cb_server_del(void *data __UNUSED__, - int type __UNUSED__, - void *event __UNUSED__) +_e_ipc_cb_server_del(void *data EINA_UNUSED, + int type EINA_UNUSED, + void *event EINA_UNUSED) { /* quit now */ ecore_main_loop_quit(); @@ -177,8 +177,8 @@ _e_ipc_cb_server_del(void *data __UNUSED__, } static Eina_Bool -_e_ipc_cb_server_data(void *data __UNUSED__, - int type __UNUSED__, +_e_ipc_cb_server_data(void *data EINA_UNUSED, + int type EINA_UNUSED, void *event) { Ecore_Ipc_Event_Server_Data *e; @@ -243,7 +243,7 @@ _e_ipc_cb_server_data(void *data __UNUSED__, } static Eina_Bool -_e_cb_timer(void *data __UNUSED__) +_e_cb_timer(void *data EINA_UNUSED) { E_Thumb *eth; /* diff --git a/src/bin/e_toolbar.c b/src/bin/e_toolbar.c index 56880fb471..01a0cf147f 100644 --- a/src/bin/e_toolbar.c +++ b/src/bin/e_toolbar.c @@ -24,7 +24,7 @@ static Eina_List *toolbars = NULL; static E_Gadcon_Location *tb_location = NULL; static void -_tb_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *info __UNUSED__) +_tb_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *info EINA_UNUSED) { E_Toolbar *tbar = data; Evas_Coord w, h; @@ -298,7 +298,7 @@ _e_toolbar_free(E_Toolbar *tbar) } static void -_e_toolbar_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_toolbar_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; E_Toolbar *tbar; @@ -320,7 +320,7 @@ _e_toolbar_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __U } static void -_e_toolbar_menu_cb_post(void *data, E_Menu *mn __UNUSED__) +_e_toolbar_menu_cb_post(void *data, E_Menu *mn EINA_UNUSED) { E_Toolbar *tbar; @@ -363,7 +363,7 @@ _e_toolbar_menu_cb_pre(void *data, E_Menu *mn) } static void -_e_toolbar_menu_items_append(void *data, E_Gadcon_Client *gcc __UNUSED__, E_Menu *mn) +_e_toolbar_menu_items_append(void *data, E_Gadcon_Client *gcc EINA_UNUSED, E_Menu *mn) { E_Toolbar *tbar; @@ -387,7 +387,7 @@ _e_toolbar_menu_append(E_Toolbar *tbar, E_Menu *mn) } /* static void -_e_toolbar_menu_cb_edit(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_toolbar_menu_cb_edit(void *data, E_Menu *mn EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Toolbar *tbar; @@ -399,7 +399,7 @@ _e_toolbar_menu_cb_edit(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNU } */ static void -_e_toolbar_menu_cb_config(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_toolbar_menu_cb_config(void *data, E_Menu *mn EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Toolbar *tbar; @@ -408,7 +408,7 @@ _e_toolbar_menu_cb_config(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __U } /* static void -_e_toolbar_menu_cb_contents(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_toolbar_menu_cb_contents(void *data, E_Menu *mn EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Toolbar *tbar; @@ -486,7 +486,7 @@ _e_toolbar_orient_string_get(E_Toolbar *tbar) } static void -_e_toolbar_fm2_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_toolbar_fm2_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Toolbar *tbar; Eina_List *l = NULL; @@ -502,7 +502,7 @@ _e_toolbar_fm2_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info } static void -_e_toolbar_fm2_dir_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_toolbar_fm2_dir_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Toolbar *tbar; Eina_List *l = NULL; @@ -518,7 +518,7 @@ _e_toolbar_fm2_dir_changed(void *data, Evas_Object *obj __UNUSED__, void *event_ } static void -_e_toolbar_fm2_dir_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_toolbar_fm2_dir_deleted(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Toolbar *tbar; Eina_List *l = NULL; @@ -534,7 +534,7 @@ _e_toolbar_fm2_dir_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_ } static void -_e_toolbar_fm2_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_toolbar_fm2_files_deleted(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Toolbar *tbar; Eina_List *l = NULL; @@ -550,7 +550,7 @@ _e_toolbar_fm2_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *even } static void -_e_toolbar_fm2_selected(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_toolbar_fm2_selected(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Toolbar *tbar; Eina_List *l = NULL; @@ -566,7 +566,7 @@ _e_toolbar_fm2_selected(void *data, Evas_Object *obj __UNUSED__, void *event_inf } static void -_e_toolbar_fm2_selection_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_toolbar_fm2_selection_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Toolbar *tbar; Eina_List *l = NULL; diff --git a/src/bin/e_update.c b/src/bin/e_update.c index c57bea591b..6f4e384791 100644 --- a/src/bin/e_update.c +++ b/src/bin/e_update.c @@ -17,13 +17,13 @@ _update_done(void) } static void -_delete_cb(void *obj __UNUSED__) +_delete_cb(void *obj EINA_UNUSED) { dialog = NULL; } static void -_ok_cb(void *data __UNUSED__, E_Dialog *dia __UNUSED__) +_ok_cb(void *data EINA_UNUSED, E_Dialog *dia EINA_UNUSED) { e_object_del(E_OBJECT(dialog)); if (e_config->update.later > 0) @@ -34,7 +34,7 @@ _ok_cb(void *data __UNUSED__, E_Dialog *dia __UNUSED__) } static void -_bother_me_later_cb(void *data __UNUSED__, E_Dialog *dia __UNUSED__) +_bother_me_later_cb(void *data EINA_UNUSED, E_Dialog *dia EINA_UNUSED) { e_object_del(E_OBJECT(dialog)); // 5 * 5 * 1hr === about 1 day limit, so bother-me later will wait @@ -47,7 +47,7 @@ _bother_me_later_cb(void *data __UNUSED__, E_Dialog *dia __UNUSED__) } static void -_never_tell_me_cb(void *data __UNUSED__, E_Dialog *dia __UNUSED__) +_never_tell_me_cb(void *data EINA_UNUSED, E_Dialog *dia EINA_UNUSED) { if (update_timer) ecore_timer_del(update_timer); update_timer = NULL; @@ -93,7 +93,7 @@ _new_version(const char *ver) } static Eina_Bool -_upload_data_cb(void *data __UNUSED__, int ev_type __UNUSED__, void *event) +_upload_data_cb(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *event) { Ecore_Con_Event_Url_Data *ev = event; if (ev->url_con != url_up) return EINA_TRUE; @@ -121,7 +121,7 @@ _upload_data_cb(void *data __UNUSED__, int ev_type __UNUSED__, void *event) } static Eina_Bool -_upload_progress_cb(void *data __UNUSED__, int ev_type __UNUSED__, void *event) +_upload_progress_cb(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *event) { Ecore_Con_Event_Url_Progress *ev = event; if (ev->url_con != url_up) return EINA_TRUE; @@ -129,7 +129,7 @@ _upload_progress_cb(void *data __UNUSED__, int ev_type __UNUSED__, void *event) } static Eina_Bool -_upload_complete_cb(void *data __UNUSED__, int ev_type __UNUSED__, void *event) +_upload_complete_cb(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *event) { Ecore_Con_Event_Url_Complete *ev = event; if (ev->url_con != url_up) return EINA_TRUE; diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c index d40e657d1e..439d8f0905 100644 --- a/src/bin/e_utils.c +++ b/src/bin/e_utils.c @@ -870,7 +870,7 @@ _e_util_cb_delayed_del(void *data) } static void -_e_util_cb_delayed_cancel(void *data, void *obj __UNUSED__) +_e_util_cb_delayed_cancel(void *data, void *obj EINA_UNUSED) { Ecore_Idle_Enterer *idler = data; @@ -878,7 +878,7 @@ _e_util_cb_delayed_cancel(void *data, void *obj __UNUSED__) } static Eina_Bool -_e_util_wakeup_cb(void *data __UNUSED__) +_e_util_wakeup_cb(void *data EINA_UNUSED) { _e_util_dummy_timer = NULL; return ECORE_CALLBACK_CANCEL; @@ -1035,7 +1035,7 @@ e_util_time_str_get(long int seconds) } static void -_e_util_size_debug_free(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_util_size_debug_free(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { int x, y, w, h; const char *name; @@ -1046,7 +1046,7 @@ _e_util_size_debug_free(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object * } static void -_e_util_size_debug_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_util_size_debug_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { int x, y, w, h; const char *name; @@ -1057,7 +1057,7 @@ _e_util_size_debug_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *o } static void -_e_util_size_debug_stack(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_util_size_debug_stack(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { int x, y, w, h; const char *name; @@ -1068,7 +1068,7 @@ _e_util_size_debug_stack(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object } static void -_e_util_size_debug(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_util_size_debug(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { int x, y, w, h; const char *name; diff --git a/src/bin/e_widget.c b/src/bin/e_widget.c index 4b72f9d2ea..8107b0fcd0 100644 --- a/src/bin/e_widget.c +++ b/src/bin/e_widget.c @@ -141,9 +141,9 @@ e_widget_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh) static void _sub_obj_del(void *data, - Evas *e __UNUSED__, + Evas *e EINA_UNUSED, Evas_Object *obj, - void *event_info __UNUSED__) + void *event_info EINA_UNUSED) { E_Smart_Data *sd = data; diff --git a/src/bin/e_widget_aspect.c b/src/bin/e_widget_aspect.c index 07d0c7dd3b..7232599d14 100644 --- a/src/bin/e_widget_aspect.c +++ b/src/bin/e_widget_aspect.c @@ -61,7 +61,7 @@ _e_wid_reconfigure(E_Widget_Data *wd) } static void -_cb_reconfigure(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_reconfigure(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_bgpreview.c b/src/bin/e_widget_bgpreview.c index d935bcd135..12b1531f9e 100644 --- a/src/bin/e_widget_bgpreview.c +++ b/src/bin/e_widget_bgpreview.c @@ -18,8 +18,8 @@ struct _E_Widget_Desk_Data }; /* local function prototypes */ -static void _e_wid_data_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__); -static void _e_wid_livethumb_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj EINA_UNUSED, void *event_info __UNUSED__); +static void _e_wid_data_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _e_wid_livethumb_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); static void _e_wid_del_hook(Evas_Object *obj); static void _e_wid_reconfigure(E_Widget_Data *wd); static void _e_wid_desk_cb_config(void *data, Evas *evas, Evas_Object *obj, void *event); @@ -147,7 +147,7 @@ _e_wid_livethumb_resize_job(void *data) } static void -_e_wid_livethumb_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj EINA_UNUSED, void *event_info __UNUSED__) +_e_wid_livethumb_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Widget_Desk_Data *dd = data; @@ -156,7 +156,7 @@ _e_wid_livethumb_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj EINA_UN } static void -_e_wid_data_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_data_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Widget_Desk_Data *dd; dd = data; @@ -269,7 +269,7 @@ _e_wid_reconfigure(E_Widget_Data *wd) } static void -_e_wid_desk_cb_config(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_e_wid_desk_cb_config(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { E_Widget_Desk_Data *dd; Evas_Event_Mouse_Down *ev; @@ -287,7 +287,7 @@ _e_wid_desk_cb_config(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUS } static void -_e_wid_cb_resize(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event __UNUSED__) +_e_wid_cb_resize(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_button.c b/src/bin/e_widget_button.c index db46639b83..b0cbb693ae 100644 --- a/src/bin/e_widget_button.c +++ b/src/bin/e_widget_button.c @@ -145,7 +145,7 @@ _click(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) } static void -_e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_focus_steal(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { e_widget_focus_steal(data); } diff --git a/src/bin/e_widget_check.c b/src/bin/e_widget_check.c index eae79b6070..52126e6f23 100644 --- a/src/bin/e_widget_check.c +++ b/src/bin/e_widget_check.c @@ -109,13 +109,13 @@ _e_wid_disable_hook(Evas_Object *obj) } static void -_e_wid_signal_cb1(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_wid_signal_cb1(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { _e_wid_do(data); } static void -_e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_focus_steal(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { e_widget_focus_steal(data); } diff --git a/src/bin/e_widget_color_well.c b/src/bin/e_widget_color_well.c index 0b3d5fcb78..7b2730e7d8 100644 --- a/src/bin/e_widget_color_well.c +++ b/src/bin/e_widget_color_well.c @@ -34,7 +34,7 @@ _e_wid_update(E_Widget_Data *wd) } static void -_e_wid_signal_cb1(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_wid_signal_cb1(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Evas_Object *wid; E_Widget_Data *wd; @@ -54,7 +54,7 @@ _e_wid_signal_cb1(void *data, Evas_Object *obj __UNUSED__, const char *emission } static void -_e_wid_color_select_cb(E_Color_Dialog *dia __UNUSED__, E_Color *color, void *data) +_e_wid_color_select_cb(E_Color_Dialog *dia EINA_UNUSED, E_Color *color, void *data) { E_Widget_Data *wd; @@ -65,7 +65,7 @@ _e_wid_color_select_cb(E_Color_Dialog *dia __UNUSED__, E_Color *color, void *dat } static void -_e_wid_color_cancel_cb(E_Color_Dialog *dia __UNUSED__, E_Color *color, void *data) +_e_wid_color_cancel_cb(E_Color_Dialog *dia EINA_UNUSED, E_Color *color, void *data) { E_Widget_Data *wd; @@ -77,7 +77,7 @@ _e_wid_color_cancel_cb(E_Color_Dialog *dia __UNUSED__, E_Color *color, void *dat } static void -_e_wid_color_change_cb(E_Color_Dialog *dia __UNUSED__, E_Color *color, void *data) +_e_wid_color_change_cb(E_Color_Dialog *dia EINA_UNUSED, E_Color *color, void *data) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_config_list.c b/src/bin/e_widget_config_list.c index 4537a20d46..d6d65227bc 100644 --- a/src/bin/e_widget_config_list.c +++ b/src/bin/e_widget_config_list.c @@ -32,7 +32,7 @@ struct _E_Widget_Data /* Externally accessible functions */ EAPI Evas_Object * -e_widget_config_list_add(Evas *evas, Evas_Object * (*func_entry_add)(Evas_Object *, char **val, void (*func)(void *data, void *data2), void *data, void *data2), const char *label, int listspan __UNUSED__) +e_widget_config_list_add(Evas *evas, Evas_Object * (*func_entry_add)(Evas_Object *, char **val, void (*func)(void *data, void *data2), void *data, void *data2), const char *label, int listspan EINA_UNUSED) { Evas_Object *obj, *o; E_Widget_Data *wd; @@ -153,7 +153,7 @@ e_widget_config_list_object_append(Evas_Object *obj, Evas_Object *sobj, int col, /* Private Function defs */ static void -_list_cb_change(void *data, Evas_Object *obj __UNUSED__) +_list_cb_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Widget_Data *wd; int indx; @@ -195,7 +195,7 @@ _button_cb_add(void *data, void *obj) } static void -_button_cb_remove(void *data, void *obj __UNUSED__) +_button_cb_remove(void *data, void *obj EINA_UNUSED) { E_Widget_Data *wd; int indx, count; @@ -213,7 +213,7 @@ _button_cb_remove(void *data, void *obj __UNUSED__) } static void -_button_cb_up(void *data, void *obj __UNUSED__) +_button_cb_up(void *data, void *obj EINA_UNUSED) { E_Widget_Data *wd; int idx_sel; @@ -234,7 +234,7 @@ _button_cb_up(void *data, void *obj __UNUSED__) } static void -_button_cb_down(void *data, void *obj __UNUSED__) +_button_cb_down(void *data, void *obj EINA_UNUSED) { E_Widget_Data *wd; int idx_sel; diff --git a/src/bin/e_widget_csel.c b/src/bin/e_widget_csel.c index 191c2b2b34..e616ffe0f1 100644 --- a/src/bin/e_widget_csel.c +++ b/src/bin/e_widget_csel.c @@ -34,7 +34,7 @@ _e_wid_del_hook(Evas_Object *obj) } static void -_e_wid_cb_radio_changed(void *data, Evas_Object *o __UNUSED__) +_e_wid_cb_radio_changed(void *data, Evas_Object *o EINA_UNUSED) { E_Widget_Data *wd = data; @@ -179,7 +179,7 @@ _e_wid_cb_color_changed(void *data, Evas_Object *o) } static void -_e_wid_cb_alpha_changed(void *data, Evas_Object *o __UNUSED__) +_e_wid_cb_alpha_changed(void *data, Evas_Object *o EINA_UNUSED) { _e_wid_cb_color_changed(data, NULL); } diff --git a/src/bin/e_widget_cslider.c b/src/bin/e_widget_cslider.c index bb630dc726..0eff975231 100644 --- a/src/bin/e_widget_cslider.c +++ b/src/bin/e_widget_cslider.c @@ -108,7 +108,7 @@ e_widget_cslider_add(Evas *evas, E_Color_Component mode, E_Color *color, int ver } static void -_e_wid_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Widget_Data *wd; Evas_Coord x, y; @@ -120,7 +120,7 @@ _e_wid_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e } static void -_e_wid_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Widget_Data *wd; Evas_Coord w, h; @@ -507,13 +507,13 @@ _e_wid_disable_hook(Evas_Object *obj) } static void -_e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_focus_steal(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { e_widget_focus_steal(data); } static void -_e_wid_cb_drag_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_wid_cb_drag_start(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Evas_Object *o_wid; E_Widget_Data *wd; @@ -533,7 +533,7 @@ _e_wid_cb_drag_start(void *data, Evas_Object *obj __UNUSED__, const char *emissi } static void -_e_wid_cb_drag_stop(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_wid_cb_drag_stop(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Evas_Object *o_wid; E_Widget_Data *wd; @@ -544,7 +544,7 @@ _e_wid_cb_drag_stop(void *data, Evas_Object *obj __UNUSED__, const char *emissio } static void -_e_wid_cb_drag(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_wid_cb_drag(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Evas_Object *o_wid; E_Widget_Data *wd; @@ -597,7 +597,7 @@ _e_wid_mouse_handle(Evas_Object *obj, int mx, int my) } static void -_e_wid_cb_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_wid_cb_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; Evas_Object *o_wid; @@ -612,7 +612,7 @@ _e_wid_cb_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void } static void -_e_wid_cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_cb_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Evas_Object *o_wid; E_Widget_Data *wd; @@ -623,7 +623,7 @@ _e_wid_cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void * } static void -_e_wid_cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_wid_cb_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev; Evas_Object *o_wid; diff --git a/src/bin/e_widget_entry.c b/src/bin/e_widget_entry.c index 19fa0f0cfb..05c767685b 100644 --- a/src/bin/e_widget_entry.c +++ b/src/bin/e_widget_entry.c @@ -237,13 +237,13 @@ _e_wid_disable_hook(Evas_Object *obj) } static void -_e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_focus_steal(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { e_widget_focus_steal(data); } static void -_e_wid_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Pointer *p; E_Widget_Data *wd; @@ -257,7 +257,7 @@ _e_wid_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *eve } static void -_e_wid_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Pointer *p; E_Widget_Data *wd; @@ -271,7 +271,7 @@ _e_wid_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev } static void -_e_wid_changed_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Evas_Object *entry; E_Widget_Data *wd; @@ -292,13 +292,13 @@ _e_wid_changed_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN } static void -_e_wid_keydown(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_wid_keydown(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { evas_object_smart_callback_call(data, "key_down", event_info); } static void -_e_wid_movresz(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_wid_movresz(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { E_Widget_Data *wd; Evas_Coord x, y, w, h; diff --git a/src/bin/e_widget_filepreview.c b/src/bin/e_widget_filepreview.c index f7b08279b9..711758393b 100644 --- a/src/bin/e_widget_filepreview.c +++ b/src/bin/e_widget_filepreview.c @@ -64,7 +64,7 @@ static void _e_wid_fprev_preview_font(E_Widget_Data *wd); static void _e_wid_fprev_preview_fm(E_Widget_Data *wd); static void -_e_wid_fprev_preview_update(void *data, Evas_Object *obj, void *event_info __UNUSED__) +_e_wid_fprev_preview_update(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) { E_Widget_Data *wd; Evas_Object *o; @@ -219,7 +219,7 @@ _e_wid_fprev_clear_widgets(E_Widget_Data *wd) } static void -_e_wid_fprev_preview_video_position(E_Widget_Data *wd, Evas_Object *obj, void *event_info __UNUSED__) +_e_wid_fprev_preview_video_position(E_Widget_Data *wd, Evas_Object *obj, void *event_info EINA_UNUSED) { double t, tot; @@ -231,7 +231,7 @@ _e_wid_fprev_preview_video_position(E_Widget_Data *wd, Evas_Object *obj, void *e } static void -_e_wid_fprev_preview_video_opened(E_Widget_Data *wd, Evas_Object *obj, void *event_info __UNUSED__) +_e_wid_fprev_preview_video_opened(E_Widget_Data *wd, Evas_Object *obj, void *event_info EINA_UNUSED) { double ratio; int iw, ih; @@ -269,7 +269,7 @@ _e_wid_fprev_preview_video_opened(E_Widget_Data *wd, Evas_Object *obj, void *eve } static void -_e_wid_fprev_preview_video_resize(E_Widget_Data *wd, Evas_Object *obj, void *event_info __UNUSED__) +_e_wid_fprev_preview_video_resize(E_Widget_Data *wd, Evas_Object *obj, void *event_info EINA_UNUSED) { int w, h; char buf[128]; @@ -883,47 +883,47 @@ _e_wid_fprev_preview_reset(E_Widget_Data *wd) } static void -_e_wid_cb_selected(void *data, Evas_Object *obj, void *event __UNUSED__) +_e_wid_cb_selected(void *data, Evas_Object *obj, void *event EINA_UNUSED) { evas_object_smart_callback_call(data, "selected", obj); } static void -_e_wid_cb_selection_change(void *data, Evas_Object *obj, void *event __UNUSED__) +_e_wid_cb_selection_change(void *data, Evas_Object *obj, void *event EINA_UNUSED) { evas_object_smart_callback_call(data, "selection_change", obj); } static void -_e_wid_cb_dir_changed(void *data, Evas_Object *obj, void *event __UNUSED__) +_e_wid_cb_dir_changed(void *data, Evas_Object *obj, void *event EINA_UNUSED) { evas_object_smart_callback_call(data, "dir_changed", obj); } static void -_e_wid_cb_changed(void *data, Evas_Object *obj, void *event __UNUSED__) +_e_wid_cb_changed(void *data, Evas_Object *obj, void *event EINA_UNUSED) { evas_object_smart_callback_call(data, "changed", obj); } static void -_e_wid_cb_file_deleted(void *data, Evas_Object *obj, void *event __UNUSED__) +_e_wid_cb_file_deleted(void *data, Evas_Object *obj, void *event EINA_UNUSED) { evas_object_smart_callback_call(data, "files_deleted", obj); } static void -_e_wid_fprev_preview_txt_read_cancel(void *data __UNUSED__, Ecore_Thread *eth __UNUSED__) +_e_wid_fprev_preview_txt_read_cancel(void *data EINA_UNUSED, Ecore_Thread *eth EINA_UNUSED) { } static void -_e_wid_fprev_preview_txt_read_end(void *data __UNUSED__, Ecore_Thread *eth __UNUSED__) +_e_wid_fprev_preview_txt_read_end(void *data EINA_UNUSED, Ecore_Thread *eth EINA_UNUSED) { } static void -_e_wid_fprev_preview_txt_read_notify(void *data, Ecore_Thread *eth __UNUSED__, void *msg) +_e_wid_fprev_preview_txt_read_notify(void *data, Ecore_Thread *eth EINA_UNUSED, void *msg) { E_Widget_Data *wd = data; char *buf; @@ -940,7 +940,7 @@ _e_wid_fprev_preview_txt_read_notify(void *data, Ecore_Thread *eth __UNUSED__, v } static void -_e_wid_fprev_preview_txt_read(void *data __UNUSED__, Ecore_Thread *eth) +_e_wid_fprev_preview_txt_read(void *data EINA_UNUSED, Ecore_Thread *eth) { char *text; char buf[FILEPREVIEW_TEXT_PREVIEW_SIZE + 1]; @@ -1160,7 +1160,7 @@ _e_wid_fprev_preview_fm(E_Widget_Data *wd) } static Eina_Bool -_e_wid_fprev_cb_del(E_Widget_Data *wd, int type __UNUSED__, Eio_Monitor_Event *ev) +_e_wid_fprev_cb_del(E_Widget_Data *wd, int type EINA_UNUSED, Eio_Monitor_Event *ev) { if (wd->monitor != ev->monitor) return ECORE_CALLBACK_RENEW; _e_wid_fprev_clear_widgets(wd); @@ -1171,7 +1171,7 @@ _e_wid_fprev_cb_del(E_Widget_Data *wd, int type __UNUSED__, Eio_Monitor_Event *e } static Eina_Bool -_e_wid_fprev_cb_mod(E_Widget_Data *wd, int type __UNUSED__, Eio_Monitor_Event *ev) +_e_wid_fprev_cb_mod(E_Widget_Data *wd, int type EINA_UNUSED, Eio_Monitor_Event *ev) { if (wd->monitor != ev->monitor) return ECORE_CALLBACK_RENEW; _e_wid_fprev_preview_file(wd); diff --git a/src/bin/e_widget_flist.c b/src/bin/e_widget_flist.c index 84bf362779..d4e1226312 100644 --- a/src/bin/e_widget_flist.c +++ b/src/bin/e_widget_flist.c @@ -207,31 +207,31 @@ _e_wid_focus_hook(Evas_Object *obj) } static void -_e_wid_focus_steal(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_e_wid_focus_steal(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { e_widget_focus_steal(data); } static void -_e_wid_cb_selected(void *data, Evas_Object *obj __UNUSED__, void *event) +_e_wid_cb_selected(void *data, Evas_Object *obj EINA_UNUSED, void *event) { evas_object_smart_callback_call(data, "selection_change", event); } static void -_e_wid_cb_dir_changed(void *data, Evas_Object *obj __UNUSED__, void *event) +_e_wid_cb_dir_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event) { evas_object_smart_callback_call(data, "dir_changed", event); } static void -_e_wid_cb_changed(void *data, Evas_Object *obj __UNUSED__, void *event) +_e_wid_cb_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event) { evas_object_smart_callback_call(data, "changed", event); } static void -_e_wid_cb_file_deleted(void *data, Evas_Object *obj __UNUSED__, void *event) +_e_wid_cb_file_deleted(void *data, Evas_Object *obj EINA_UNUSED, void *event) { evas_object_smart_callback_call(data, "files_deleted", event); } diff --git a/src/bin/e_widget_font_preview.c b/src/bin/e_widget_font_preview.c index 56b67bcc42..e0759cb7a0 100644 --- a/src/bin/e_widget_font_preview.c +++ b/src/bin/e_widget_font_preview.c @@ -77,7 +77,7 @@ _e_wid_del_hook(Evas_Object *obj) } static void -_e_wid_cb_scrollframe_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_wid_cb_scrollframe_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { E_Widget_Data *wd; Evas_Coord mw, mh, vw, vh; @@ -92,7 +92,7 @@ _e_wid_cb_scrollframe_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, v } static void -_e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_focus_steal(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { e_widget_focus_steal(data); } diff --git a/src/bin/e_widget_fsel.c b/src/bin/e_widget_fsel.c index df4df3258d..e9ef5a0685 100644 --- a/src/bin/e_widget_fsel.c +++ b/src/bin/e_widget_fsel.c @@ -33,7 +33,7 @@ static void _e_wid_del_hook(Evas_Object *obj); /* local subsystem functions */ static void -_e_wid_fsel_button_up(void *data1, void *data2 __UNUSED__) +_e_wid_fsel_button_up(void *data1, void *data2 EINA_UNUSED) { E_Widget_Data *wd; @@ -45,7 +45,7 @@ _e_wid_fsel_button_up(void *data1, void *data2 __UNUSED__) } static void -_e_wid_fsel_favorites_add(void *data1, void *data2 __UNUSED__) +_e_wid_fsel_favorites_add(void *data1, void *data2 EINA_UNUSED) { E_Widget_Data *wd; const char *current_path, *fn; @@ -100,7 +100,7 @@ _e_wid_fsel_favorites_add(void *data1, void *data2 __UNUSED__) } static void -_e_wid_fsel_favorites_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_fsel_favorites_files_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Widget_Data *wd; Eina_List *icons, *l; @@ -139,7 +139,7 @@ done: } static void -_e_wid_fsel_favorites_selected(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_fsel_favorites_selected(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Widget_Data *wd; Eina_List *selected; @@ -160,7 +160,7 @@ _e_wid_fsel_favorites_selected(void *data, Evas_Object *obj __UNUSED__, void *ev } static void -_e_wid_fsel_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_fsel_files_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Widget_Data *wd; @@ -173,7 +173,7 @@ _e_wid_fsel_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_i } static void -_e_wid_fsel_files_dir_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_fsel_files_dir_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Widget_Data *wd; @@ -196,7 +196,7 @@ _e_wid_fsel_files_dir_changed(void *data, Evas_Object *obj __UNUSED__, void *eve } static void -_e_wid_fsel_typebuf_change(E_Widget_Data *wd, Evas_Object *obj __UNUSED__, const char *str) +_e_wid_fsel_typebuf_change(E_Widget_Data *wd, Evas_Object *obj EINA_UNUSED, const char *str) { e_widget_entry_text_set(wd->o_entry, str); } @@ -241,19 +241,19 @@ _e_wid_fsel_sel_chg(E_Widget_Data *wd, Evas_Object *fm) } static void -_e_wid_fsel_fprev_selection_change(void *data, Evas_Object *obj __UNUSED__, void *event_info) +_e_wid_fsel_fprev_selection_change(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) { _e_wid_fsel_sel_chg(data, event_info); } static void -_e_wid_fsel_files_selection_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_fsel_files_selection_change(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { _e_wid_fsel_sel_chg(data, NULL); } static void -_e_wid_fsel_preview_file_selected(void *data, Evas_Object *obj __UNUSED__, void *event_info) +_e_wid_fsel_preview_file_selected(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) { E_Widget_Data *wd; Eina_List *l; @@ -276,7 +276,7 @@ _e_wid_fsel_preview_file_selected(void *data, Evas_Object *obj __UNUSED__, void } static void -_e_wid_fsel_files_selected(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_fsel_files_selected(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Widget_Data *wd; @@ -288,7 +288,7 @@ _e_wid_fsel_files_selected(void *data, Evas_Object *obj __UNUSED__, void *event_ } static void -_e_wid_fsel_moveresize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_fsel_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Widget_Data *wd = data; int x, y, w, h; @@ -300,7 +300,7 @@ _e_wid_fsel_moveresize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED /* externally accessible functions */ EAPI Evas_Object * -e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, char *filter __UNUSED__, +e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, char *filter EINA_UNUSED, void (*sel_func)(void *data, Evas_Object *obj), void *sel_data, void (*chg_func)(void *data, Evas_Object *obj), void *chg_data, int preview) diff --git a/src/bin/e_widget_ilist.c b/src/bin/e_widget_ilist.c index 3279801e38..824867b408 100644 --- a/src/bin/e_widget_ilist.c +++ b/src/bin/e_widget_ilist.c @@ -1084,7 +1084,7 @@ _e_wid_focus_hook(Evas_Object *obj) } static void -_e_wid_cb_scrollframe_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_wid_cb_scrollframe_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { Evas_Coord mw, mh, vw, vh, w, h; @@ -1125,7 +1125,7 @@ _e_wid_cb_item_sel(void *data, void *data2) } static void -_e_wid_cb_item_hilight(void *data, void *data2 __UNUSED__) +_e_wid_cb_item_hilight(void *data, void *data2 EINA_UNUSED) { E_Widget_Data *wd; Evas_Coord x, y, w, h; @@ -1136,13 +1136,13 @@ _e_wid_cb_item_hilight(void *data, void *data2 __UNUSED__) } static void -_e_wid_cb_selected(void *data, Evas_Object *obj __UNUSED__, void *event_info) +_e_wid_cb_selected(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) { evas_object_smart_callback_call(data, "selected", event_info); } static void -_e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_focus_steal(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { e_widget_focus_steal(data); } diff --git a/src/bin/e_widget_preview.c b/src/bin/e_widget_preview.c index ccfe13c5c2..37b17d6a20 100644 --- a/src/bin/e_widget_preview.c +++ b/src/bin/e_widget_preview.c @@ -149,7 +149,7 @@ e_widget_preview_vsize_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) } static void -_e_wid_preview_thumb_gen(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_preview_thumb_gen(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_radio.c b/src/bin/e_widget_radio.c index 1f00269ae0..83a2ec61bd 100644 --- a/src/bin/e_widget_radio.c +++ b/src/bin/e_widget_radio.c @@ -267,14 +267,14 @@ _e_wid_disable_hook(Evas_Object *obj) } static void -_e_wid_signal_cb1(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_wid_signal_cb1(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { _e_wid_do(data); e_widget_change(data); } static void -_e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_focus_steal(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { e_widget_focus_steal(data); } diff --git a/src/bin/e_widget_scrollframe.c b/src/bin/e_widget_scrollframe.c index 2d7c262cec..aeaa9373af 100644 --- a/src/bin/e_widget_scrollframe.c +++ b/src/bin/e_widget_scrollframe.c @@ -151,13 +151,13 @@ _e_wid_focus_hook(Evas_Object *obj) } static void -_e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_focus_steal(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { e_widget_focus_steal(data); } static void -_e_wid_cb_scrollframe_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_wid_cb_scrollframe_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { Evas_Coord mw = 0, mh = 0; Evas_Coord vw = 0, vh = 0; diff --git a/src/bin/e_widget_slider.c b/src/bin/e_widget_slider.c index da657f8154..a73cb5171e 100644 --- a/src/bin/e_widget_slider.c +++ b/src/bin/e_widget_slider.c @@ -210,13 +210,13 @@ _e_wid_focus_hook(Evas_Object *obj) } static void -_e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_focus_steal(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { e_widget_focus_steal(data); } static void -_e_wid_cb_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_cb_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_spectrum.c b/src/bin/e_widget_spectrum.c index 4649dbd47d..68882904ec 100644 --- a/src/bin/e_widget_spectrum.c +++ b/src/bin/e_widget_spectrum.c @@ -146,7 +146,7 @@ e_widget_spectrum_mode_set(Evas_Object *obj, E_Color_Component mode) } static void -_e_wid_move(void *data, Evas_Object *o __UNUSED__, Evas_Coord x, Evas_Coord y) +_e_wid_move(void *data, Evas_Object *o EINA_UNUSED, Evas_Coord x, Evas_Coord y) { E_Widget_Data *wd; @@ -156,7 +156,7 @@ _e_wid_move(void *data, Evas_Object *o __UNUSED__, Evas_Coord x, Evas_Coord y) } static void -_e_wid_resize(void *data, Evas_Object *o __UNUSED__, Evas_Coord w, Evas_Coord h) +_e_wid_resize(void *data, Evas_Object *o EINA_UNUSED, Evas_Coord w, Evas_Coord h) { E_Widget_Data *wd; @@ -205,7 +205,7 @@ _e_wid_disable_hook(Evas_Object *obj) } static void -_e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_focus_steal(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { e_widget_focus_steal(data); } @@ -274,7 +274,7 @@ _e_wid_mouse_handle(Evas_Object *obj, int mx, int my) } static void -_e_wid_cb_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_wid_cb_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; Evas_Object *o_wid; @@ -289,7 +289,7 @@ _e_wid_cb_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void } static void -_e_wid_cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_cb_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Evas_Object *o_wid; E_Widget_Data *wd; @@ -300,7 +300,7 @@ _e_wid_cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void * } static void -_e_wid_cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_wid_cb_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev; Evas_Object *o_wid; diff --git a/src/bin/e_widget_textblock.c b/src/bin/e_widget_textblock.c index ecd3e1487c..d3ba61a23a 100644 --- a/src/bin/e_widget_textblock.c +++ b/src/bin/e_widget_textblock.c @@ -134,7 +134,7 @@ _e_wid_focus_hook(Evas_Object *obj) } static void -_e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_focus_steal(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { e_widget_focus_steal(data); } diff --git a/src/bin/e_widget_toolbar.c b/src/bin/e_widget_toolbar.c index a126744821..a27202b320 100644 --- a/src/bin/e_widget_toolbar.c +++ b/src/bin/e_widget_toolbar.c @@ -348,7 +348,7 @@ _e_wid_disable_hook(Evas_Object *obj) } static void -_e_wid_signal_cb1(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_wid_signal_cb1(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Item *it, *it2; E_Widget_Data *wd; @@ -369,7 +369,7 @@ _e_wid_signal_cb1(void *data, Evas_Object *obj __UNUSED__, const char *emission } static void -_e_wid_signal_prev(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_wid_signal_prev(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Widget_Data *wd; Eina_List *l, *l2; @@ -394,7 +394,7 @@ _e_wid_signal_prev(void *data, Evas_Object *obj __UNUSED__, const char *emission } static void -_e_wid_signal_next(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_wid_signal_next(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Widget_Data *wd; Eina_List *l, *l2; @@ -419,7 +419,7 @@ _e_wid_signal_next(void *data, Evas_Object *obj __UNUSED__, const char *emission } static void -_e_wid_cb_scrollframe_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_cb_scrollframe_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Widget_Data *wd; Evas_Coord mw, mh, vw, vh, w, h; @@ -448,7 +448,7 @@ _e_wid_cb_scrollframe_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __ } static void -_e_wid_cb_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_wid_cb_key_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Key_Down *ev; E_Widget_Data *wd; @@ -536,7 +536,7 @@ _e_wid_focus_hook(Evas_Object *obj) } static void -_e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_wid_focus_steal(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { e_widget_focus_steal(data); } diff --git a/src/bin/e_win.c b/src/bin/e_win.c index 32e0ea3799..8797c6780c 100644 --- a/src/bin/e_win.c +++ b/src/bin/e_win.c @@ -133,7 +133,7 @@ _e_elm_win_trap_show(void *data, Evas_Object *o) } static Eina_Bool -_e_elm_win_trap_move(void *data, Evas_Object *o __UNUSED__, int x, int y) +_e_elm_win_trap_move(void *data, Evas_Object *o EINA_UNUSED, int x, int y) { Elm_Win_Trap_Ctx *ctx = data; EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_TRUE); @@ -145,7 +145,7 @@ _e_elm_win_trap_move(void *data, Evas_Object *o __UNUSED__, int x, int y) } static Eina_Bool -_e_elm_win_trap_resize(void *data, Evas_Object *o __UNUSED__, int w, int h) +_e_elm_win_trap_resize(void *data, Evas_Object *o EINA_UNUSED, int w, int h) { Elm_Win_Trap_Ctx *ctx = data; EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_TRUE); @@ -157,7 +157,7 @@ _e_elm_win_trap_resize(void *data, Evas_Object *o __UNUSED__, int w, int h) } static Eina_Bool -_e_elm_win_trap_center(void *data, Evas_Object *o __UNUSED__, Eina_Bool h, Eina_Bool v) +_e_elm_win_trap_center(void *data, Evas_Object *o EINA_UNUSED, Eina_Bool h, Eina_Bool v) { Elm_Win_Trap_Ctx *ctx = data; EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_TRUE); @@ -169,7 +169,7 @@ _e_elm_win_trap_center(void *data, Evas_Object *o __UNUSED__, Eina_Bool h, Eina_ } static Eina_Bool -_e_elm_win_trap_lower(void *data, Evas_Object *o __UNUSED__) +_e_elm_win_trap_lower(void *data, Evas_Object *o EINA_UNUSED) { Elm_Win_Trap_Ctx *ctx = data; EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_TRUE); @@ -179,7 +179,7 @@ _e_elm_win_trap_lower(void *data, Evas_Object *o __UNUSED__) } static Eina_Bool -_e_elm_win_trap_raise(void *data, Evas_Object *o __UNUSED__) +_e_elm_win_trap_raise(void *data, Evas_Object *o EINA_UNUSED) { Elm_Win_Trap_Ctx *ctx = data; EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_TRUE); @@ -189,7 +189,7 @@ _e_elm_win_trap_raise(void *data, Evas_Object *o __UNUSED__) } static Eina_Bool -_e_elm_win_trap_activate(void *data, Evas_Object *o __UNUSED__) +_e_elm_win_trap_activate(void *data, Evas_Object *o EINA_UNUSED) { Elm_Win_Trap_Ctx *ctx = data; EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_TRUE); @@ -201,7 +201,7 @@ _e_elm_win_trap_activate(void *data, Evas_Object *o __UNUSED__) } static Eina_Bool -_e_elm_win_trap_size_min_set(void *data, Evas_Object *o __UNUSED__, int w, int h) +_e_elm_win_trap_size_min_set(void *data, Evas_Object *o EINA_UNUSED, int w, int h) { Elm_Win_Trap_Ctx *ctx = data; int mw = 0, mh = 0; @@ -220,7 +220,7 @@ _e_elm_win_trap_size_min_set(void *data, Evas_Object *o __UNUSED__, int w, int h } static Eina_Bool -_e_elm_win_trap_size_max_set(void *data, Evas_Object *o __UNUSED__, int w, int h) +_e_elm_win_trap_size_max_set(void *data, Evas_Object *o EINA_UNUSED, int w, int h) { Elm_Win_Trap_Ctx *ctx = data; int mw = 0, mh = 0; @@ -239,7 +239,7 @@ _e_elm_win_trap_size_max_set(void *data, Evas_Object *o __UNUSED__, int w, int h } static Eina_Bool -_e_elm_win_trap_size_base_set(void *data, Evas_Object *o __UNUSED__, int w, int h) +_e_elm_win_trap_size_base_set(void *data, Evas_Object *o EINA_UNUSED, int w, int h) { Elm_Win_Trap_Ctx *ctx = data; int mw = 0, mh = 0; diff --git a/src/bin/e_xsettings.c b/src/bin/e_xsettings.c index ab1c04dc80..4815d3be09 100644 --- a/src/bin/e_xsettings.c +++ b/src/bin/e_xsettings.c @@ -415,7 +415,7 @@ _e_xsettings_icon_theme_set(void) } static void -_e_xsettings_error_cb(void *data, Eio_File *handler __UNUSED__, int error __UNUSED__) +_e_xsettings_error_cb(void *data, Eio_File *handler EINA_UNUSED, int error EINA_UNUSED) { Eina_List *l = data; if (reset || setting) @@ -447,7 +447,7 @@ _e_xsettings_error_cb(void *data, Eio_File *handler __UNUSED__, int error __UNUS } static void -_e_xsettings_done_cb(void *data __UNUSED__, Eio_File *handler __UNUSED__, const Eina_Stat *estat __UNUSED__) +_e_xsettings_done_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, const Eina_Stat *estat EINA_UNUSED) { if (reset) { diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c index f461c3abf9..a756dc650b 100644 --- a/src/bin/e_zone.c +++ b/src/bin/e_zone.c @@ -1494,8 +1494,8 @@ _e_zone_free(E_Zone *zone) static void _e_zone_cb_bg_mouse_down(void *data, - Evas *evas __UNUSED__, - Evas_Object *obj __UNUSED__, + Evas *evas EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, void *event_info) { E_Zone *zone; @@ -1521,8 +1521,8 @@ _e_zone_cb_bg_mouse_down(void *data, static void _e_zone_cb_bg_mouse_up(void *data, - Evas *evas __UNUSED__, - Evas_Object *obj __UNUSED__, + Evas *evas EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, void *event_info) { E_Zone *zone; @@ -1577,7 +1577,7 @@ _e_zone_cb_edge_timer(void *data) } static void -_e_zone_event_generic_free(void *data __UNUSED__, void *ev) +_e_zone_event_generic_free(void *data EINA_UNUSED, void *ev) { struct _E_Event_Zone_Generic *e; // also handes E_Event_Zone_Add, E_Event_Zone_Del, E_Event_Zone_Stow, diff --git a/src/bin/e_zoomap.c b/src/bin/e_zoomap.c index 82e895c324..7b49ab91bb 100644 --- a/src/bin/e_zoomap.c +++ b/src/bin/e_zoomap.c @@ -161,7 +161,7 @@ e_zoomap_child_edje_solid_setup(Evas_Object *obj) /* local subsystem functions */ static void -_e_zoomap_smart_child_del_hook(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_zoomap_smart_child_del_hook(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Smart_Data *sd; @@ -170,7 +170,7 @@ _e_zoomap_smart_child_del_hook(void *data, Evas *e __UNUSED__, Evas_Object *obj } static void -_e_zoomap_smart_child_resize_hook(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_zoomap_smart_child_resize_hook(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Smart_Data *sd; Evas_Coord w, h; diff --git a/src/modules/access/e_mod_config.c b/src/modules/access/e_mod_config.c index 21a1371757..51eb577fca 100644 --- a/src/modules/access/e_mod_config.c +++ b/src/modules/access/e_mod_config.c @@ -9,9 +9,9 @@ struct _E_Config_Dialog_Data /* local function prototypes */ static void *_create_data (E_Config_Dialog *cfd); static void _fill_data (E_Config_Dialog_Data *cfdata); -static void _free_data (E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _basic_apply (E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); +static void _free_data (E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _basic_apply (E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); void _config_pager_module(void) @@ -35,7 +35,7 @@ _config_pager_module(void) /* local function prototypes */ static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -51,13 +51,13 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_FREE(cfdata); } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata __UNUSED__) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata EINA_UNUSED) { Evas_Object *ol, *of; @@ -70,7 +70,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata EINA_UNUSED) { e_config_save_queue(); return 1; diff --git a/src/modules/access/e_mod_main.c b/src/modules/access/e_mod_main.c index 5964e01e4b..984b79d095 100644 --- a/src/modules/access/e_mod_main.c +++ b/src/modules/access/e_mod_main.c @@ -474,7 +474,7 @@ _mouse_move(Cover *cov, Ecore_Event_Mouse_Move *ev) } static void -_mouse_wheel(Cover *cov __UNUSED__, Ecore_Event_Mouse_Wheel *ev __UNUSED__) +_mouse_wheel(Cover *cov EINA_UNUSED, Ecore_Event_Mouse_Wheel *ev EINA_UNUSED) { if (ev->z == -1) // up { @@ -487,8 +487,8 @@ _mouse_wheel(Cover *cov __UNUSED__, Ecore_Event_Mouse_Wheel *ev __UNUSED__) } static Eina_Bool -_cb_mouse_down(void *data __UNUSED__, - int type __UNUSED__, +_cb_mouse_down(void *data EINA_UNUSED, + int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Button *ev = event; @@ -546,8 +546,8 @@ _cb_mouse_down(void *data __UNUSED__, } static Eina_Bool -_cb_mouse_up(void *data __UNUSED__, - int type __UNUSED__, +_cb_mouse_up(void *data EINA_UNUSED, + int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Button *ev = event; @@ -567,8 +567,8 @@ _cb_mouse_up(void *data __UNUSED__, } static Eina_Bool -_cb_mouse_move(void *data __UNUSED__, - int type __UNUSED__, +_cb_mouse_move(void *data EINA_UNUSED, + int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Move *ev = event; @@ -698,8 +698,8 @@ _cb_mouse_move(void *data __UNUSED__, } static Eina_Bool -_cb_mouse_wheel(void *data __UNUSED__, - int type __UNUSED__, +_cb_mouse_wheel(void *data EINA_UNUSED, + int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Wheel *ev = event; @@ -839,9 +839,9 @@ _covers_shutdown(void) } static Eina_Bool -_cb_zone_add(void *data __UNUSED__, - int type __UNUSED__, - void *event __UNUSED__) +_cb_zone_add(void *data EINA_UNUSED, + int type EINA_UNUSED, + void *event EINA_UNUSED) { _covers_shutdown(); _covers_init(); @@ -849,9 +849,9 @@ _cb_zone_add(void *data __UNUSED__, } static Eina_Bool -_cb_zone_del(void *data __UNUSED__, - int type __UNUSED__, - void *event __UNUSED__) +_cb_zone_del(void *data EINA_UNUSED, + int type EINA_UNUSED, + void *event EINA_UNUSED) { _covers_shutdown(); _covers_init(); @@ -859,9 +859,9 @@ _cb_zone_del(void *data __UNUSED__, } static Eina_Bool -_cb_zone_move_resize(void *data __UNUSED__, - int type __UNUSED__, - void *event __UNUSED__) +_cb_zone_move_resize(void *data EINA_UNUSED, + int type EINA_UNUSED, + void *event EINA_UNUSED) { _covers_shutdown(); _covers_init(); @@ -905,8 +905,8 @@ _events_shutdown(void) } static Eina_Bool -_cb_property_change(void *data __UNUSED__, - int type __UNUSED__, +_cb_property_change(void *data EINA_UNUSED, + int type EINA_UNUSED, void *ev) { E_Client *ec; @@ -922,8 +922,8 @@ _cb_property_change(void *data __UNUSED__, } static Eina_Bool -_cb_client_message(void *data __UNUSED__, - int type __UNUSED__, +_cb_client_message(void *data EINA_UNUSED, + int type EINA_UNUSED, void *ev) { int block; @@ -1008,7 +1008,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { EINA_LOG_INFO("[access module] module shutdown"); if (client_message_handler) ecore_event_handler_del(client_message_handler); @@ -1021,7 +1021,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.access", conf_edd, access_config); return 1; diff --git a/src/modules/appmenu/e_mod_dbus_registrar_server.c b/src/modules/appmenu/e_mod_dbus_registrar_server.c index c2bc3efd61..2219de917f 100644 --- a/src/modules/appmenu/e_mod_dbus_registrar_server.c +++ b/src/modules/appmenu/e_mod_dbus_registrar_server.c @@ -13,7 +13,7 @@ enum }; void -appmenu_application_monitor(void *data, const char *bus EINA_UNUSED, const char *old __UNUSED__, const char *new __UNUSED__) +appmenu_application_monitor(void *data, const char *bus EINA_UNUSED, const char *old EINA_UNUSED, const char *new EINA_UNUSED) { E_AppMenu_Window *window = data; eldbus_service_signal_emit(window->ctxt->iface, SIGNAL_WINDOW_UNREGISTERED, diff --git a/src/modules/appmenu/e_mod_main.c b/src/modules/appmenu/e_mod_main.c index 1cc862b837..6b9528f626 100644 --- a/src/modules/appmenu/e_mod_main.c +++ b/src/modules/appmenu/e_mod_main.c @@ -116,7 +116,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "AppMenu" }; static Eina_Bool -cb_focus_in(void *data, int type __UNUSED__, void *event) +cb_focus_in(void *data, int type EINA_UNUSED, void *event) { E_AppMenu_Context *ctxt = data; E_Event_Client *ev = event; @@ -137,7 +137,7 @@ cb_focus_in(void *data, int type __UNUSED__, void *event) } static Eina_Bool -cb_focus_out(void *data, int type __UNUSED__, void *event EINA_UNUSED) +cb_focus_out(void *data, int type EINA_UNUSED, void *event EINA_UNUSED) { E_AppMenu_Context *ctxt = data; appmenu_menu_render(ctxt, NULL); diff --git a/src/modules/backlight/e_mod_main.c b/src/modules/backlight/e_mod_main.c index ec6b1678b5..0f816695a1 100644 --- a/src/modules/backlight/e_mod_main.c +++ b/src/modules/backlight/e_mod_main.c @@ -156,7 +156,7 @@ _backlight_win_key_down_cb(void *data, Ecore_Event_Key *ev) } static void -_backlight_settings_cb(void *d1, void *d2 __UNUSED__) +_backlight_settings_cb(void *d1, void *d2 EINA_UNUSED) { Instance *inst = d1; e_configure_registry_call("screen/power_management", NULL, NULL); @@ -164,7 +164,7 @@ _backlight_settings_cb(void *d1, void *d2 __UNUSED__) } static void -_slider_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_slider_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Instance *inst = data; _backlight_level_set(inst, inst->val, EINA_FALSE); @@ -226,7 +226,7 @@ _backlight_popup_free(Instance *inst) } static void -_backlight_menu_cb_cfg(void *data, E_Menu *menu __UNUSED__, E_Menu_Item *mi __UNUSED__) +_backlight_menu_cb_cfg(void *data, E_Menu *menu EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { Instance *inst = data; @@ -235,7 +235,7 @@ _backlight_menu_cb_cfg(void *data, E_Menu *menu __UNUSED__, E_Menu_Item *mi __UN } static void -_backlight_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_backlight_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Instance *inst = data; Evas_Event_Mouse_Down *ev = event; @@ -272,7 +272,7 @@ _backlight_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __U } static void -_backlight_cb_mouse_wheel(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_backlight_cb_mouse_wheel(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Mouse_Wheel *ev = event; Instance *inst = data; @@ -334,7 +334,7 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { Instance *inst; Evas_Coord mw, mh; @@ -351,13 +351,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("Backlight"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -412,7 +412,7 @@ _backlight_popup_timer_new(Instance *inst) } static void -_e_mod_action_cb(E_Object *obj __UNUSED__, +_e_mod_action_cb(E_Object *obj EINA_UNUSED, const char *params) { Eina_List *l; @@ -487,7 +487,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { if (act) { @@ -501,7 +501,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/battery/batget.c b/src/modules/battery/batget.c index 212662fa17..b2c3404882 100644 --- a/src/modules/battery/batget.c +++ b/src/modules/battery/batget.c @@ -896,7 +896,7 @@ static int event_fd = -1; static Ecore_Fd_Handler *event_fd_handler = NULL; static Eina_Bool -linux_acpi_cb_delay_check(void *data __UNUSED__) +linux_acpi_cb_delay_check(void *data EINA_UNUSED) { linux_acpi_init(); poll_cb(NULL); @@ -905,17 +905,17 @@ linux_acpi_cb_delay_check(void *data __UNUSED__) } static Eina_Bool -linux_acpi_cb_acpid_add(void *data __UNUSED__, - int type __UNUSED__, - void *event __UNUSED__) +linux_acpi_cb_acpid_add(void *data EINA_UNUSED, + int type EINA_UNUSED, + void *event EINA_UNUSED) { return ECORE_CALLBACK_PASS_ON; } static Eina_Bool -linux_acpi_cb_acpid_del(void *data __UNUSED__, - int type __UNUSED__, - void *event __UNUSED__) +linux_acpi_cb_acpid_del(void *data EINA_UNUSED, + int type EINA_UNUSED, + void *event EINA_UNUSED) { ecore_con_server_del(acpid); acpid = NULL; @@ -929,9 +929,9 @@ linux_acpi_cb_acpid_del(void *data __UNUSED__, } static Eina_Bool -linux_acpi_cb_acpid_data(void *data __UNUSED__, - int type __UNUSED__, - void *event __UNUSED__) +linux_acpi_cb_acpid_data(void *data EINA_UNUSED, + int type EINA_UNUSED, + void *event EINA_UNUSED) { if (delay_check) ecore_timer_del(delay_check); delay_check = ecore_timer_add(0.2, linux_acpi_cb_delay_check, NULL); @@ -939,7 +939,7 @@ linux_acpi_cb_acpid_data(void *data __UNUSED__, } static Eina_Bool -linux_acpi_cb_event_fd_active(void *data __UNUSED__, +linux_acpi_cb_event_fd_active(void *data EINA_UNUSED, Ecore_Fd_Handler *fd_handler) { if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ)) @@ -1460,7 +1460,7 @@ init(void) } static Eina_Bool -poll_cb(void *data __UNUSED__) +poll_cb(void *data EINA_UNUSED) { int ptime_left; int pbattery_full; diff --git a/src/modules/battery/e_mod_config.c b/src/modules/battery/e_mod_config.c index f0bc3ed02f..6de56298de 100644 --- a/src/modules/battery/e_mod_config.c +++ b/src/modules/battery/e_mod_config.c @@ -40,10 +40,10 @@ static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_D static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _advanced_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static void _cb_radio_changed(void *data, Evas_Object *obj __UNUSED__); +static void _cb_radio_changed(void *data, Evas_Object *obj EINA_UNUSED); E_Config_Dialog * -e_int_config_battery_module(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_battery_module(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -108,7 +108,7 @@ _ensure_alert_time(E_Config_Dialog_Data *cfdata) } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -118,7 +118,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (!battery_config) return; battery_config->config_dialog = NULL; @@ -126,7 +126,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *ob; @@ -143,7 +143,7 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (!battery_config) return 0; @@ -171,7 +171,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_Bool ret; int old_show_alert = ((battery_config->alert > 0) || @@ -185,7 +185,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static void -_cb_show_alert_changed(void *data, Evas_Object *obj __UNUSED__) +_cb_show_alert_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; Eina_Bool show_alert = cfdata->show_alert; @@ -200,7 +200,7 @@ _cb_show_alert_changed(void *data, Evas_Object *obj __UNUSED__) } static void -_cb_dismiss_alert_changed(void *data, Evas_Object *obj __UNUSED__) +_cb_dismiss_alert_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; Eina_Bool dismiss_alert = cfdata->show_alert && cfdata->dismiss_alert; @@ -209,7 +209,7 @@ _cb_dismiss_alert_changed(void *data, Evas_Object *obj __UNUSED__) } static void -_cb_radio_changed(void *data, Evas_Object *obj __UNUSED__) +_cb_radio_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Eina_Bool fuzzy; @@ -222,7 +222,7 @@ _cb_radio_changed(void *data, Evas_Object *obj __UNUSED__) } static Evas_Object * -_advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_advanced_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *ob, *otb; E_Radio_Group *rg; @@ -316,7 +316,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D } static int -_advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_advanced_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (!battery_config) return 0; @@ -352,7 +352,7 @@ _advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static int -_advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_advanced_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { int old_show_alert = ((battery_config->alert > 0) || (battery_config->alert_p > 0)); diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c index acddc97f39..32f4c26e51 100644 --- a/src/modules/battery/e_mod_main.c +++ b/src/modules/battery/e_mod_main.c @@ -122,7 +122,7 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { Instance *inst; Evas_Coord mw, mh, mxw, mxh; @@ -141,13 +141,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("Battery"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -243,13 +243,13 @@ _battery_face_time_set(Evas_Object *battery, int t) } static void -_battery_face_cb_menu_powermanagement(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +_battery_face_cb_menu_powermanagement(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_configure_registry_call("advanced/powermanagement", NULL, NULL); } static void -_battery_face_cb_menu_configure(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +_battery_face_cb_menu_configure(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { if (!battery_config) return; if (battery_config->config_dialog) return; @@ -404,7 +404,7 @@ _battery_cb_warning_popup_timeout(void *data) } static void -_battery_cb_warning_popup_hide(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_battery_cb_warning_popup_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Instance *inst = NULL; @@ -510,7 +510,7 @@ _battery_warning_popup(Instance *inst, int t, double percent) } static Eina_Bool -_powersave_cb_config_update(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_powersave_cb_config_update(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { if (!battery_config->have_battery) e_powersave_mode_set(E_POWERSAVE_MODE_LOW); @@ -656,7 +656,7 @@ _battery_update(int full, int time_left, int time_full, Eina_Bool have_battery, } static Eina_Bool -_battery_cb_exe_data(void *data __UNUSED__, int type __UNUSED__, void *event) +_battery_cb_exe_data(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Data *ev; Instance *inst; @@ -710,7 +710,7 @@ _battery_cb_exe_data(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_battery_cb_exe_del(void *data __UNUSED__, int type __UNUSED__, void *event) +_battery_cb_exe_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Del *ev; @@ -804,7 +804,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_configure_registry_item_del("advanced/battery"); e_configure_registry_category_del("advanced"); @@ -849,7 +849,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.battery", conf_edd, battery_config); return 1; diff --git a/src/modules/battery/e_mod_main.h b/src/modules/battery/e_mod_main.h index 63daca7dc8..7c642238ac 100644 --- a/src/modules/battery/e_mod_main.h +++ b/src/modules/battery/e_mod_main.h @@ -139,7 +139,7 @@ EAPI void *e_modapi_init (E_Module *m); EAPI int e_modapi_shutdown (E_Module *m); EAPI int e_modapi_save (E_Module *m); -E_Config_Dialog *e_int_config_battery_module(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_battery_module(Evas_Object *parent, const char *params EINA_UNUSED); void _battery_config_updated(void); extern Config *battery_config; diff --git a/src/modules/battery/e_mod_udev.c b/src/modules/battery/e_mod_udev.c index 0d2f380e2f..ef305f8f1a 100644 --- a/src/modules/battery/e_mod_udev.c +++ b/src/modules/battery/e_mod_udev.c @@ -65,7 +65,7 @@ _battery_udev_stop(void) } static void -_battery_udev_event_battery(const char *syspath, Eeze_Udev_Event event, void *data, Eeze_Udev_Watch *watch __UNUSED__) +_battery_udev_event_battery(const char *syspath, Eeze_Udev_Event event, void *data, Eeze_Udev_Watch *watch EINA_UNUSED) { if ((event & EEZE_UDEV_EVENT_ADD) || (event & EEZE_UDEV_EVENT_ONLINE)) @@ -78,7 +78,7 @@ _battery_udev_event_battery(const char *syspath, Eeze_Udev_Event event, void *da } static void -_battery_udev_event_ac(const char *syspath, Eeze_Udev_Event event, void *data, Eeze_Udev_Watch *watch __UNUSED__) +_battery_udev_event_ac(const char *syspath, Eeze_Udev_Event event, void *data, Eeze_Udev_Watch *watch EINA_UNUSED) { if ((event & EEZE_UDEV_EVENT_ADD) || (event & EEZE_UDEV_EVENT_ONLINE)) diff --git a/src/modules/battery/e_mod_upower.c b/src/modules/battery/e_mod_upower.c index 2aa023ad93..8fd85fc7be 100644 --- a/src/modules/battery/e_mod_upower.c +++ b/src/modules/battery/e_mod_upower.c @@ -41,7 +41,7 @@ _ac_free(Ac_Adapter *ac) } static void -_ac_get_all_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending __UNUSED__) +_ac_get_all_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) { Ac_Adapter *ac = data; Eldbus_Message_Iter *array, *dict, *variant; @@ -68,7 +68,7 @@ _ac_get_all_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending __ } static void -_ac_changed_cb(void *data, const Eldbus_Message *msg __UNUSED__) +_ac_changed_cb(void *data, const Eldbus_Message *msg EINA_UNUSED) { Ac_Adapter *ac = data; eldbus_proxy_property_get_all(ac->proxy, _ac_get_all_cb, ac); @@ -104,7 +104,7 @@ static const char *bat_techologies[] = { }; static void -_bat_get_all_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending __UNUSED__) +_bat_get_all_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) { Battery *bat = data; Eldbus_Message_Iter *array, *dict, *variant; @@ -191,7 +191,7 @@ _bat_get_all_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending _ } static void -_bat_changed_cb(void *data, const Eldbus_Message *msg __UNUSED__) +_bat_changed_cb(void *data, const Eldbus_Message *msg EINA_UNUSED) { Battery *bat = data; eldbus_proxy_property_get_all(bat->proxy, _bat_get_all_cb, bat); @@ -219,7 +219,7 @@ _process_battery(Eldbus_Proxy *proxy) } static void -_device_type_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending __UNUSED__) +_device_type_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) { Eldbus_Proxy *proxy = data; Eldbus_Message_Iter *variant; @@ -259,7 +259,7 @@ _process_enumerate_path(const char *path) } static void -_enumerate_cb(void *data __UNUSED__, const Eldbus_Message *msg, Eldbus_Pending *pending __UNUSED__) +_enumerate_cb(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) { const char *path; Eldbus_Message_Iter *array; @@ -272,7 +272,7 @@ _enumerate_cb(void *data __UNUSED__, const Eldbus_Message *msg, Eldbus_Pending * } static void -_device_added_cb(void *data __UNUSED__, const Eldbus_Message *msg) +_device_added_cb(void *data EINA_UNUSED, const Eldbus_Message *msg) { const char *path; @@ -282,7 +282,7 @@ _device_added_cb(void *data __UNUSED__, const Eldbus_Message *msg) } static void -_device_removed_cb(void *data __UNUSED__, const Eldbus_Message *msg) +_device_removed_cb(void *data EINA_UNUSED, const Eldbus_Message *msg) { Battery *bat; Ac_Adapter *ac; diff --git a/src/modules/bluez4/e_mod_main.c b/src/modules/bluez4/e_mod_main.c index 3351e6be1d..61cbbb5d73 100644 --- a/src/modules/bluez4/e_mod_main.c +++ b/src/modules/bluez4/e_mod_main.c @@ -148,19 +148,19 @@ _ebluez4_check_changed(void *data, Evas_Object *obj, const char *prop_name) } static void -_ebluez4_powered_changed(void *data, Evas_Object *obj, void *info __UNUSED__) +_ebluez4_powered_changed(void *data, Evas_Object *obj, void *info EINA_UNUSED) { _ebluez4_check_changed(data, obj, "Powered"); } static void -_ebluez4_visible_changed(void *data, Evas_Object *obj, void *info __UNUSED__) +_ebluez4_visible_changed(void *data, Evas_Object *obj, void *info EINA_UNUSED) { _ebluez4_check_changed(data, obj, "Discoverable"); } static void -_ebluez4_pairable_changed(void *data, Evas_Object *obj, void *info __UNUSED__) +_ebluez4_pairable_changed(void *data, Evas_Object *obj, void *info EINA_UNUSED) { _ebluez4_check_changed(data, obj, "Pairable"); } @@ -291,7 +291,7 @@ _ebluez4_cb_forget(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSE #ifdef HAVE_BLUETOOTH static void _ebluez4_cb_lock(void *data, - E_Menu *m __UNUSED__, + E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { Device *dev = data; @@ -311,7 +311,7 @@ _ebluez4_cb_lock(void *data, static void _ebluez4_cb_unlock(void *data, - E_Menu *m __UNUSED__, + E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { Device *dev = data; @@ -331,7 +331,7 @@ _ebluez4_cb_unlock(void *data, #endif static void -_menu_post_deactivate(void *data __UNUSED__, E_Menu *m) +_menu_post_deactivate(void *data EINA_UNUSED, E_Menu *m) { Eina_List *iter; E_Menu_Item *mi; diff --git a/src/modules/clock/e_mod_config.c b/src/modules/clock/e_mod_config.c index bfa139433e..2afcaa6d73 100644 --- a/src/modules/clock/e_mod_config.c +++ b/src/modules/clock/e_mod_config.c @@ -39,7 +39,7 @@ e_int_config_clock_module(Evas_Object *parent EINA_UNUSED, Config_Item *ci) } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Config_Item *ci; @@ -53,7 +53,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { clock_config->config_dialog = NULL; @@ -61,7 +61,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, +_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { @@ -158,7 +158,7 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Config_Item *ci; diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c index 4ebdbd20ed..6f857205d7 100644 --- a/src/modules/clock/e_mod_main.c +++ b/src/modules/clock/e_mod_main.c @@ -261,7 +261,7 @@ _clock_month_update(Instance *inst) } static void -_clock_month_prev_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_clock_month_prev_cb(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Instance *inst = data; inst->madj--; @@ -270,7 +270,7 @@ _clock_month_prev_cb(void *data, Evas_Object *obj __UNUSED__, const char *emissi } static void -_clock_month_next_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_clock_month_next_cb(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Instance *inst = data; inst->madj++; @@ -279,7 +279,7 @@ _clock_month_next_cb(void *data, Evas_Object *obj __UNUSED__, const char *emissi } static void -_clock_settings_cb(void *d1, void *d2 __UNUSED__) +_clock_settings_cb(void *d1, void *d2 EINA_UNUSED) { Instance *inst = d1; e_int_config_clock_module(NULL, inst->cfg); @@ -289,7 +289,7 @@ _clock_settings_cb(void *d1, void *d2 __UNUSED__) } static void -_popclock_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *info __UNUSED__) +_popclock_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *info EINA_UNUSED) { Instance *inst = data; if (inst->o_popclock == obj) @@ -516,7 +516,7 @@ e_int_clock_instances_redo(Eina_Bool all) } static Eina_Bool -_update_today_timer(void *data __UNUSED__) +_update_today_timer(void *data EINA_UNUSED) { time_t t, t_tomorrow; const struct tm *now; @@ -551,7 +551,7 @@ _clock_popup_free(Instance *inst) } static void -_clock_menu_cb_cfg(void *data, E_Menu *menu __UNUSED__, E_Menu_Item *mi __UNUSED__) +_clock_menu_cb_cfg(void *data, E_Menu *menu EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { Instance *inst = data; @@ -560,7 +560,7 @@ _clock_menu_cb_cfg(void *data, E_Menu *menu __UNUSED__, E_Menu_Item *mi __UNUSED } static void -_clock_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_clock_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Instance *inst = data; Evas_Event_Mouse_Down *ev = event; @@ -597,7 +597,7 @@ _clock_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSE } static void -_clock_sizing_changed_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_clock_sizing_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { _eval_instance_size(data); } @@ -679,19 +679,19 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { _eval_instance_size(gcc->data); } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("Clock"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -704,7 +704,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { Config_Item *ci = NULL; @@ -752,31 +752,31 @@ _e_mod_action(const char *params) } static void -_e_mod_action_cb_edge(E_Object *obj __UNUSED__, const char *params, E_Event_Zone_Edge *ev __UNUSED__) +_e_mod_action_cb_edge(E_Object *obj EINA_UNUSED, const char *params, E_Event_Zone_Edge *ev EINA_UNUSED) { _e_mod_action(params); } static void -_e_mod_action_cb(E_Object *obj __UNUSED__, const char *params) +_e_mod_action_cb(E_Object *obj EINA_UNUSED, const char *params) { _e_mod_action(params); } static void -_e_mod_action_cb_key(E_Object *obj __UNUSED__, const char *params, Ecore_Event_Key *ev __UNUSED__) +_e_mod_action_cb_key(E_Object *obj EINA_UNUSED, const char *params, Ecore_Event_Key *ev EINA_UNUSED) { _e_mod_action(params); } static void -_e_mod_action_cb_mouse(E_Object *obj __UNUSED__, const char *params, E_Binding_Event_Mouse_Button *ev __UNUSED__) +_e_mod_action_cb_mouse(E_Object *obj EINA_UNUSED, const char *params, E_Binding_Event_Mouse_Button *ev EINA_UNUSED) { _e_mod_action(params); } static Eina_Bool -_clock_eio_update(void *d __UNUSED__, int type __UNUSED__, void *event) +_clock_eio_update(void *d EINA_UNUSED, int type EINA_UNUSED, void *event) { Eio_Monitor_Event *ev = event; @@ -795,7 +795,7 @@ _clock_eio_update(void *d __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_clock_eio_error(void *d __UNUSED__, int type __UNUSED__, void *event) +_clock_eio_error(void *d EINA_UNUSED, int type EINA_UNUSED, void *event) { Eio_Monitor_Event *ev = event; @@ -830,7 +830,7 @@ _clock_eio_error(void *d __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_clock_time_update(void *d __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_clock_time_update(void *d EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { e_int_clock_instances_redo(EINA_TRUE); return ECORE_CALLBACK_PASS_ON; @@ -905,7 +905,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { if (act) { @@ -952,7 +952,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.clock", conf_edd, clock_config); return 1; diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c index 732c8b0905..fa029a0375 100644 --- a/src/modules/conf/e_conf.c +++ b/src/modules/conf/e_conf.c @@ -228,7 +228,7 @@ _e_configure_cb_del_req(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_U } static void -_e_configure_cb_close(void *data, void *data2 __UNUSED__) +_e_configure_cb_close(void *data, void *data2 EINA_UNUSED) { E_Configure *eco; @@ -267,7 +267,7 @@ _e_configure_category_add(E_Configure *eco, const char *label, const char *icon_ } static void -_e_configure_category_cb(void *data, void *data2 __UNUSED__) +_e_configure_category_cb(void *data, void *data2 EINA_UNUSED) { E_Configure_Category *cat; E_Configure *eco; @@ -365,7 +365,7 @@ _e_configure_focus_cb(void *data, Evas_Object *obj) } static void -_e_configure_keydown_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_e_configure_keydown_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Key_Down *ev; E_Configure *eco = data; @@ -477,7 +477,7 @@ _e_configure_fill_cat_list(void *data, const char *sel) } static Eina_Bool -_e_configure_module_update_cb(void *data, int type __UNUSED__, void *event __UNUSED__) +_e_configure_module_update_cb(void *data, int type EINA_UNUSED, void *event EINA_UNUSED) { E_Configure *eco; int sel = 0; diff --git a/src/modules/conf/e_mod_config.c b/src/modules/conf/e_mod_config.c index 3c4f5283fa..6e0f93b500 100644 --- a/src/modules/conf/e_mod_config.c +++ b/src/modules/conf/e_mod_config.c @@ -13,7 +13,7 @@ static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfd static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); E_Config_Dialog * -e_int_config_conf_module(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_conf_module(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd = NULL; E_Config_Dialog_View *v = NULL; @@ -40,7 +40,7 @@ e_int_config_conf_module(Evas_Object *parent EINA_UNUSED, const char *params __U } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata = E_NEW(E_Config_Dialog_Data, 1); if (!cfdata) return NULL; @@ -49,14 +49,14 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { conf->cfd = NULL; E_FREE(cfdata); } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *ow; @@ -70,7 +70,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { conf->menu_augmentation = cfdata->menu_augmentation; if (conf->aug) @@ -91,7 +91,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { return conf->menu_augmentation != cfdata->menu_augmentation; } diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c index 3f1a852c93..748501ad60 100644 --- a/src/modules/conf/e_mod_main.c +++ b/src/modules/conf/e_mod_main.c @@ -82,7 +82,7 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { Evas_Coord mw, mh; @@ -96,13 +96,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("Settings"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o; char buf[PATH_MAX]; @@ -115,14 +115,14 @@ _gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _gadcon_class.name; } /* static void - _cb_button_click(void *data __UNUSED__, void *data2 __UNUSED__) + _cb_button_click(void *data EINA_UNUSED, void *data2 EINA_UNUSED) { E_Action *a; @@ -132,7 +132,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) */ static void -_cb_action_conf(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_action_conf(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Instance *inst; E_Action *a; @@ -143,7 +143,7 @@ _cb_action_conf(void *data, Evas_Object *obj __UNUSED__, const char *emission __ } static void -_e_mod_run_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +_e_mod_run_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { Eina_List *l; E_Configure_Cat *ecat; @@ -198,14 +198,14 @@ _config_pre_activate_cb(void *data, E_Menu *m) } static void -_config_item_activate_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +_config_item_activate_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Configure_Cat *ecat = data; e_configure_show(ecat ? ecat->cat : NULL); } static void -_config_all_pre_activate_cb(void *data __UNUSED__, E_Menu *m) +_config_all_pre_activate_cb(void *data EINA_UNUSED, E_Menu *m) { const Eina_List *l; E_Configure_Cat *ecat; @@ -238,7 +238,7 @@ _config_all_pre_activate_cb(void *data __UNUSED__, E_Menu *m) /* menu item add hook */ void -e_mod_config_menu_add(void *data __UNUSED__, E_Menu *m) +e_mod_config_menu_add(void *data EINA_UNUSED, E_Menu *m) { E_Menu_Item *mi; E_Menu *sub; @@ -316,7 +316,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_configure_del(); @@ -356,7 +356,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.conf", conf_edd, conf); return 1; @@ -388,13 +388,13 @@ _e_mod_action_conf_cb(E_Object *obj, const char *params) /* menu item callback(s) */ static void -_e_mod_conf_cb(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +_e_mod_conf_cb(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_configure_show(NULL); } static void -_e_mod_mode_presentation_toggle(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_mod_mode_presentation_toggle(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { e_config->mode.presentation = !e_config->mode.presentation; e_menu_item_toggle_set(mi, e_config->mode.presentation); @@ -403,7 +403,7 @@ _e_mod_mode_presentation_toggle(void *data __UNUSED__, E_Menu *m __UNUSED__, E_M } static void -_e_mod_mode_offline_toggle(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_mod_mode_offline_toggle(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { e_config->mode.offline = !e_config->mode.offline; e_menu_item_toggle_set(mi, e_config->mode.offline); @@ -412,7 +412,7 @@ _e_mod_mode_offline_toggle(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_I } static void -_e_mod_submenu_modes_fill(void *data __UNUSED__, E_Menu *m) +_e_mod_submenu_modes_fill(void *data EINA_UNUSED, E_Menu *m) { E_Menu_Item *mi; @@ -445,7 +445,7 @@ _e_mod_submenu_modes_get(void) /* menu item add hook */ static void -_e_mod_menu_add(void *data __UNUSED__, E_Menu *m) +_e_mod_menu_add(void *data EINA_UNUSED, E_Menu *m) { E_Menu_Item *mi; diff --git a/src/modules/conf_applications/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c index 548df0efd5..aa28f79ee0 100644 --- a/src/modules/conf_applications/e_int_config_apps.c +++ b/src/modules/conf_applications/e_int_config_apps.c @@ -27,9 +27,9 @@ struct _E_Config_Dialog_Data /* local function prototypes */ static E_Config_Dialog *_create_dialog(E_Config_Data *data); static void *_create_data(E_Config_Dialog *cfd); -static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); +static void _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); static Eina_List *_load_menu(const char *path); static Eina_List *_load_order(const char *path); static int _save_menu(E_Config_Dialog_Data *cfdata); @@ -41,15 +41,15 @@ static void _cb_apps_list_selected(void *data); static void _cb_order_list_selected(void *data); static int _cb_desks_name(const void *data1, const void *data2); static int _cb_desks_sort(const void *data1, const void *data2); -static void _cb_add(void *data, void *data2 __UNUSED__); -static void _cb_del(void *data, void *data2 __UNUSED__); -static void _cb_up(void *data, void *data2 __UNUSED__); -static void _cb_down(void *data, void *data2 __UNUSED__); -static void _cb_order_del(void *data, void *data2 __UNUSED__); +static void _cb_add(void *data, void *data2 EINA_UNUSED); +static void _cb_del(void *data, void *data2 EINA_UNUSED); +static void _cb_up(void *data, void *data2 EINA_UNUSED); +static void _cb_down(void *data, void *data2 EINA_UNUSED); +static void _cb_order_del(void *data, void *data2 EINA_UNUSED); static Eina_Bool _cb_fill_delay(void *data); E_Config_Dialog * -e_int_config_apps_add(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_apps_add(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Desktop_Edit *ed; @@ -58,7 +58,7 @@ e_int_config_apps_add(Evas_Object *parent EINA_UNUSED, const char *params __UNUS } E_Config_Dialog * -e_int_config_apps_favs(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_apps_favs(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Data *data; char buff[PATH_MAX]; @@ -73,7 +73,7 @@ e_int_config_apps_favs(Evas_Object *parent EINA_UNUSED, const char *params __UNU } E_Config_Dialog * -e_int_config_apps_ibar(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_apps_ibar(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Data *data; char buff[PATH_MAX]; @@ -102,7 +102,7 @@ e_int_config_apps_ibar_other(Evas_Object *parent EINA_UNUSED, const char *path) } E_Config_Dialog * -e_int_config_apps_startup(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_apps_startup(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Data *data; char buff[PATH_MAX]; @@ -118,7 +118,7 @@ e_int_config_apps_startup(Evas_Object *parent EINA_UNUSED, const char *params __ } E_Config_Dialog * -e_int_config_apps_restart(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_apps_restart(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Data *data; char buff[PATH_MAX]; @@ -133,7 +133,7 @@ e_int_config_apps_restart(Evas_Object *parent EINA_UNUSED, const char *params __ } E_Config_Dialog * -e_int_config_apps_desk_lock(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_apps_desk_lock(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Data *data; char buff[PATH_MAX]; @@ -148,7 +148,7 @@ e_int_config_apps_desk_lock(Evas_Object *parent EINA_UNUSED, const char *params } E_Config_Dialog * -e_int_config_apps_desk_unlock(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_apps_desk_unlock(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Data *data; char buff[PATH_MAX]; @@ -328,7 +328,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { const char *ext; @@ -709,7 +709,7 @@ _cb_desks_sort(const void *data1, const void *data2) } static void -_cb_add(void *data, void *data2 __UNUSED__) +_cb_add(void *data, void *data2 EINA_UNUSED) { E_Config_App_List *apps; const E_Ilist_Item *it; @@ -739,7 +739,7 @@ _cb_add(void *data, void *data2 __UNUSED__) } static void -_cb_del(void *data, void *data2 __UNUSED__) +_cb_del(void *data, void *data2 EINA_UNUSED) { E_Config_App_List *apps; const E_Ilist_Item *it; @@ -769,7 +769,7 @@ _cb_del(void *data, void *data2 __UNUSED__) } static void -_cb_order_del(void *data, void *data2 __UNUSED__) +_cb_order_del(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; const E_Ilist_Item *it; @@ -798,7 +798,7 @@ _cb_order_del(void *data, void *data2 __UNUSED__) } static void -_cb_up(void *data, void *data2 __UNUSED__) +_cb_up(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Eina_List *l; @@ -845,7 +845,7 @@ _cb_up(void *data, void *data2 __UNUSED__) } static void -_cb_down(void *data, void *data2 __UNUSED__) +_cb_down(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Eina_List *l; diff --git a/src/modules/conf_applications/e_int_config_apps_personal.c b/src/modules/conf_applications/e_int_config_apps_personal.c index a589585b1d..e3a8b15371 100644 --- a/src/modules/conf_applications/e_int_config_apps_personal.c +++ b/src/modules/conf_applications/e_int_config_apps_personal.c @@ -13,17 +13,17 @@ struct _E_Config_Dialog_Data /* local function prototypes */ static void *_create_data(E_Config_Dialog *cfd); -static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata); -static Eina_Bool _desks_update(void *data, int ev_type __UNUSED__, void *ev __UNUSED__); +static void _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata); +static Eina_Bool _desks_update(void *data, int ev_type EINA_UNUSED, void *ev EINA_UNUSED); static int _cb_desks_sort(const void *data1, const void *data2); static void _fill_apps_list(E_Config_Dialog_Data *cfdata, Evas_Object *il); static void _btn_cb_add(void *data, void *data2); static void _btn_cb_del(void *data, void *data2); -static void _widget_list_selection_changed(void *data, Evas_Object *obj __UNUSED__); +static void _widget_list_selection_changed(void *data, Evas_Object *obj EINA_UNUSED); E_Config_Dialog * -e_int_config_apps_personal(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_apps_personal(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -44,7 +44,7 @@ e_int_config_apps_personal(Evas_Object *parent EINA_UNUSED, const char *params _ /* local function prototypes */ static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -56,7 +56,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Efreet_Desktop *desk; @@ -104,7 +104,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) } static Eina_Bool -_desks_update(void *data, int ev_type __UNUSED__, void *ev __UNUSED__) +_desks_update(void *data, int ev_type EINA_UNUSED, void *ev EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; Efreet_Desktop *desk; @@ -180,13 +180,13 @@ _fill_apps_list(E_Config_Dialog_Data *cfdata, Evas_Object *il) } static void -_btn_cb_add(void *data __UNUSED__, void *data2 __UNUSED__) +_btn_cb_add(void *data EINA_UNUSED, void *data2 EINA_UNUSED) { e_desktop_edit(NULL); } static void -_btn_cb_del(void *data, void *data2 __UNUSED__) +_btn_cb_del(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; const Eina_List *l; @@ -207,7 +207,7 @@ _btn_cb_del(void *data, void *data2 __UNUSED__) } static void -_widget_list_selection_changed(void *data, Evas_Object *obj __UNUSED__) +_widget_list_selection_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; diff --git a/src/modules/conf_applications/e_int_config_defapps.c b/src/modules/conf_applications/e_int_config_defapps.c index 5a371887d7..c6d2d28931 100644 --- a/src/modules/conf_applications/e_int_config_defapps.c +++ b/src/modules/conf_applications/e_int_config_defapps.c @@ -43,11 +43,11 @@ struct _E_Config_Dialog_Data /* local function prototypes */ static void *_create_data(E_Config_Dialog *cfd); -static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); +static void _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); -static Eina_Bool _desks_update(void *data, int ev_type __UNUSED__, void *ev __UNUSED__); +static Eina_Bool _desks_update(void *data, int ev_type EINA_UNUSED, void *ev EINA_UNUSED); static void _load_mimes(E_Config_Dialog_Data *cfdata, char *file); static void _load_globs(E_Config_Dialog_Data *cfdata, char *file); static int _sort_mimes(const void *data1, const void *data2); @@ -57,7 +57,7 @@ static int _cb_desks_sort(const void *data1, const void *data2); static void _fill_apps_list(E_Config_Dialog_Data *cfdata, Evas_Object *il, const char **desktop, int general); E_Config_Dialog * -e_int_config_defapps(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_defapps(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -78,7 +78,7 @@ e_int_config_defapps(Evas_Object *parent EINA_UNUSED, const char *params __UNUSE } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Efreet_Ini *ini, *myini; @@ -173,7 +173,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Config_Mime *m; Efreet_Desktop *desk; @@ -209,7 +209,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Eina_Bool -_desks_update(void *data, int ev_type __UNUSED__, void *ev __UNUSED__) +_desks_update(void *data, int ev_type EINA_UNUSED, void *ev EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; Efreet_Desktop *desk; @@ -365,7 +365,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *l; E_Config_Env_Var *evr = NULL; diff --git a/src/modules/conf_applications/e_int_config_deskenv.c b/src/modules/conf_applications/e_int_config_deskenv.c index 0bb949f761..16656335e4 100644 --- a/src/modules/conf_applications/e_int_config_deskenv.c +++ b/src/modules/conf_applications/e_int_config_deskenv.c @@ -23,7 +23,7 @@ struct _E_Config_Dialog_Data /* a nice easy setup function that does the dirty work */ E_Config_Dialog * -e_int_config_deskenv(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_deskenv(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -64,7 +64,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -74,14 +74,14 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { eina_list_free(cfdata->desktop_environments); E_FREE(cfdata); } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->desktop_environment_id > 0) { @@ -105,7 +105,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda /**--APPLY--**/ static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { e_config->deskenv.load_xrdb = cfdata->load_xrdb; e_config->deskenv.load_xmodmap = cfdata->load_xmodmap; @@ -120,7 +120,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) /**--GUI--**/ static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { /* generate the core widget layout for a basic dialog */ Evas_Object *o, *fr, *ob; diff --git a/src/modules/conf_applications/e_mod_main.c b/src/modules/conf_applications/e_mod_main.c index b4376a3526..4d665e3df9 100644 --- a/src/modules/conf_applications/e_mod_main.c +++ b/src/modules/conf_applications/e_mod_main.c @@ -69,7 +69,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -92,7 +92,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/conf_applications/e_mod_main.h b/src/modules/conf_applications/e_mod_main.h index e54e7f877d..0b798aa0f4 100644 --- a/src/modules/conf_applications/e_mod_main.h +++ b/src/modules/conf_applications/e_mod_main.h @@ -1,20 +1,20 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -E_Config_Dialog *e_int_config_apps_favs(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_apps_add(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_apps_ibar(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_apps_favs(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_apps_add(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_apps_ibar(Evas_Object *parent, const char *params EINA_UNUSED); E_Config_Dialog *e_int_config_apps_ibar_other(Evas_Object *parent, const char *path); -E_Config_Dialog *e_int_config_apps_startup(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_apps_restart(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_apps_desk_lock(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_apps_desk_unlock(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_apps_startup(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_apps_restart(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_apps_desk_lock(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_apps_desk_unlock(Evas_Object *parent, const char *params EINA_UNUSED); -E_Config_Dialog *e_int_config_defapps(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_defapps(Evas_Object *parent, const char *params EINA_UNUSED); -E_Config_Dialog *e_int_config_apps_personal(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_apps_personal(Evas_Object *parent, const char *params EINA_UNUSED); -E_Config_Dialog *e_int_config_deskenv(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_deskenv(Evas_Object *parent, const char *params EINA_UNUSED); /** * @addtogroup Optional_Conf diff --git a/src/modules/conf_bindings/e_int_config_acpibindings.c b/src/modules/conf_bindings/e_int_config_acpibindings.c index e94174815b..4c18a51f7b 100644 --- a/src/modules/conf_bindings/e_int_config_acpibindings.c +++ b/src/modules/conf_bindings/e_int_config_acpibindings.c @@ -20,9 +20,9 @@ struct _E_Config_Dialog_Data /* local function prototypes */ static void *_create_data(E_Config_Dialog *cfd); static void _fill_data(E_Config_Dialog_Data *cfdata); -static void _free_data(E_Config_Dialog *cfd __UNUSED__, +static void _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); -static int _basic_apply(E_Config_Dialog *cfd __UNUSED__, +static int _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, @@ -35,13 +35,13 @@ static const char *_binding_label_get(E_Config_Binding_Acpi *bind); static void _cb_bindings_changed(void *data); static void _cb_actions_changed(void *data); static void _cb_entry_changed(void *data, - void *data2 __UNUSED__); + void *data2 EINA_UNUSED); static void _cb_add_binding(void *data, - void *data2 __UNUSED__); + void *data2 EINA_UNUSED); static void _cb_del_binding(void *data, - void *data2 __UNUSED__); + void *data2 EINA_UNUSED); static Eina_Bool _cb_grab_key_down(void *data, - int type __UNUSED__, + int type EINA_UNUSED, void *event); static Eina_Bool _cb_acpi_event(void *data, int type, @@ -54,7 +54,7 @@ static Eina_List *grab_hdls = NULL; E_Config_Dialog * e_int_config_acpibindings(Evas_Object *parent EINA_UNUSED, - const char *params __UNUSED__) + const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -109,7 +109,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Config_Binding_Acpi *binding; @@ -146,7 +146,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Config_Binding_Acpi *binding, *b2; @@ -493,7 +493,7 @@ _cb_actions_changed(void *data) static void _cb_entry_changed(void *data, - void *data2 __UNUSED__) + void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; E_Config_Binding_Acpi *binding; @@ -509,7 +509,7 @@ _cb_entry_changed(void *data, static void _cb_add_binding(void *data, - void *data2 __UNUSED__) + void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -552,7 +552,7 @@ _cb_add_binding(void *data, static void _cb_del_binding(void *data, - void *data2 __UNUSED__) + void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; E_Config_Binding_Acpi *binding, *bind2; @@ -615,7 +615,7 @@ _cb_del_binding(void *data, static Eina_Bool _cb_grab_key_down(void *data, - int type __UNUSED__, + int type EINA_UNUSED, void *event) { E_Config_Dialog_Data *cfdata; @@ -649,7 +649,7 @@ _cb_grab_key_down(void *data, static Eina_Bool _cb_acpi_event(void *data, - __UNUSED__ int type, + EINA_UNUSED int type, void *event) { E_Event_Acpi *ev; diff --git a/src/modules/conf_bindings/e_int_config_edgebindings.c b/src/modules/conf_bindings/e_int_config_edgebindings.c index da1524c165..6c3bca9ce7 100644 --- a/src/modules/conf_bindings/e_int_config_edgebindings.c +++ b/src/modules/conf_bindings/e_int_config_edgebindings.c @@ -164,7 +164,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Config_Binding_Edge *bi; @@ -185,7 +185,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { const Eina_List *l; E_Zone *zone; @@ -352,7 +352,7 @@ _fill_actions_list(E_Config_Dialog_Data *cfdata) /**************** Callbacks *********/ static void -_add_edge_binding_cb(void *data, void *data2 __UNUSED__) +_add_edge_binding_cb(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -365,7 +365,7 @@ _add_edge_binding_cb(void *data, void *data2 __UNUSED__) } static void -_modify_edge_binding_cb(void *data, void *data2 __UNUSED__) +_modify_edge_binding_cb(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -423,7 +423,7 @@ _action_change_cb(void *data) } static void -_delete_all_edge_binding_cb(void *data, void *data2 __UNUSED__) +_delete_all_edge_binding_cb(void *data, void *data2 EINA_UNUSED) { E_Config_Binding_Edge *bi; E_Config_Dialog_Data *cfdata; @@ -451,7 +451,7 @@ _delete_all_edge_binding_cb(void *data, void *data2 __UNUSED__) } static void -_delete_edge_binding_cb(void *data, void *data2 __UNUSED__) +_delete_edge_binding_cb(void *data, void *data2 EINA_UNUSED) { Eina_List *l = NULL; int sel, n; @@ -499,7 +499,7 @@ _delete_edge_binding_cb(void *data, void *data2 __UNUSED__) } static void -_restore_edge_binding_defaults_cb(void *data, void *data2 __UNUSED__) +_restore_edge_binding_defaults_cb(void *data, void *data2 EINA_UNUSED) { E_Config_Bindings *ecb; Eina_Stringshare *prof; @@ -950,7 +950,7 @@ _edge_grab_wnd_hide(E_Config_Dialog_Data *cfdata) } static void -_edge_grab_wnd_cb_apply(void *data, E_Dialog *dia __UNUSED__) +_edge_grab_wnd_cb_apply(void *data, E_Dialog *dia EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -961,7 +961,7 @@ _edge_grab_wnd_cb_apply(void *data, E_Dialog *dia __UNUSED__) } static void -_edge_grab_wnd_cb_close(void *data, E_Dialog *dia __UNUSED__) +_edge_grab_wnd_cb_close(void *data, E_Dialog *dia EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -970,7 +970,7 @@ _edge_grab_wnd_cb_close(void *data, E_Dialog *dia __UNUSED__) } static void -_edge_grab_wnd_slider_changed_cb(void *data, Evas_Object *obj __UNUSED__) +_edge_grab_wnd_slider_changed_cb(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; char *label = NULL; @@ -984,7 +984,7 @@ _edge_grab_wnd_slider_changed_cb(void *data, Evas_Object *obj __UNUSED__) } static void -_edge_grab_wnd_check_changed_cb(void *data, Evas_Object *obj __UNUSED__) +_edge_grab_wnd_check_changed_cb(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; char *label = NULL; @@ -1009,7 +1009,7 @@ _edge_grab_wnd_check_changed_cb(void *data, Evas_Object *obj __UNUSED__) } static void -_edge_grab_wnd_selected_edge_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_edge_grab_wnd_selected_edge_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *event; E_Config_Dialog_Data *cfdata; diff --git a/src/modules/conf_bindings/e_int_config_keybindings.c b/src/modules/conf_bindings/e_int_config_keybindings.c index 43a615c5ee..22899692a3 100644 --- a/src/modules/conf_bindings/e_int_config_keybindings.c +++ b/src/modules/conf_bindings/e_int_config_keybindings.c @@ -155,7 +155,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Config_Binding_Key *bi; @@ -178,7 +178,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *l = NULL; @@ -317,7 +317,7 @@ _fill_actions_list(E_Config_Dialog_Data *cfdata) static void _add_key_binding_cb(void *data, - void *data2 __UNUSED__) + void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -331,7 +331,7 @@ _add_key_binding_cb(void *data, static void _modify_key_binding_cb(void *data, - void *data2 __UNUSED__) + void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -377,7 +377,7 @@ _action_change_cb(void *data) static void _delete_all_key_binding_cb(void *data, - void *data2 __UNUSED__) + void *data2 EINA_UNUSED) { E_Config_Binding_Key *bi; E_Config_Dialog_Data *cfdata; @@ -407,7 +407,7 @@ _delete_all_key_binding_cb(void *data, static void _delete_key_binding_cb(void *data, - void *data2 __UNUSED__) + void *data2 EINA_UNUSED) { Eina_List *l = NULL; const char *n; @@ -460,7 +460,7 @@ _delete_key_binding_cb(void *data, static void _restore_key_binding_defaults_cb(void *data, - void *data2 __UNUSED__) + void *data2 EINA_UNUSED) { E_Config_Bindings *ecb; Eina_Stringshare *prof; @@ -832,7 +832,7 @@ _grab_wnd_show(E_Config_Dialog_Data *cfdata) static Eina_Bool _grab_key_down_cb(void *data, - __UNUSED__ int type, + EINA_UNUSED int type, void *event) { E_Config_Dialog_Data *cfdata; diff --git a/src/modules/conf_bindings/e_int_config_mousebindings.c b/src/modules/conf_bindings/e_int_config_mousebindings.c index 4a5d24245b..fb84a910ca 100644 --- a/src/modules/conf_bindings/e_int_config_mousebindings.c +++ b/src/modules/conf_bindings/e_int_config_mousebindings.c @@ -91,7 +91,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_mousebindings(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_mousebindings(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -168,7 +168,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Config_Binding_Mouse *eb; E_Config_Binding_Wheel *bw; @@ -196,7 +196,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *l, *l2; E_Config_Binding_Mouse *eb, *eb2; @@ -410,7 +410,7 @@ _fill_actions_list(E_Config_Dialog_Data *cfdata) /******************* Callbacks *************/ static void -_add_mouse_binding_cb(void *data, void *data2 __UNUSED__) +_add_mouse_binding_cb(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -422,7 +422,7 @@ _add_mouse_binding_cb(void *data, void *data2 __UNUSED__) } static void -_modify_mouse_binding_cb(void *data, void *data2 __UNUSED__) +_modify_mouse_binding_cb(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -463,7 +463,7 @@ _binding_change_cb(void *data) } static void -_delete_all_mouse_binding_cb(void *data, void *data2 __UNUSED__) +_delete_all_mouse_binding_cb(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; E_Config_Binding_Mouse *eb; @@ -500,7 +500,7 @@ _delete_all_mouse_binding_cb(void *data, void *data2 __UNUSED__) } static void -_delete_mouse_binding_cb(void *data, void *data2 __UNUSED__) +_delete_mouse_binding_cb(void *data, void *data2 EINA_UNUSED) { Eina_List *l; int sel, n; @@ -567,7 +567,7 @@ _delete_mouse_binding_cb(void *data, void *data2 __UNUSED__) } static void -_restore_mouse_binding_defaults_cb(void *data, void *data2 __UNUSED__) +_restore_mouse_binding_defaults_cb(void *data, void *data2 EINA_UNUSED) { E_Config_Bindings *ecb; Eina_Stringshare *prof; @@ -1300,7 +1300,7 @@ _grab_wnd_show(E_Config_Dialog_Data *cfdata) } static Eina_Bool -_grab_mouse_down_cb(void *data, __UNUSED__ int type, void *event) +_grab_mouse_down_cb(void *data, EINA_UNUSED int type, void *event) { Eina_List *l; E_Config_Dialog_Data *cfdata; @@ -1399,7 +1399,7 @@ _grab_mouse_down_cb(void *data, __UNUSED__ int type, void *event) } static Eina_Bool -_grab_mouse_wheel_cb(void *data, int type __UNUSED__, void *event) +_grab_mouse_wheel_cb(void *data, int type EINA_UNUSED, void *event) { Eina_List *l; E_Config_Binding_Wheel *bw = NULL; diff --git a/src/modules/conf_bindings/e_int_config_signalbindings.c b/src/modules/conf_bindings/e_int_config_signalbindings.c index 41b7527f5a..82e456a29b 100644 --- a/src/modules/conf_bindings/e_int_config_signalbindings.c +++ b/src/modules/conf_bindings/e_int_config_signalbindings.c @@ -158,7 +158,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_FREE_LIST(cfdata->binding.signal, _signal_binding_free); @@ -448,7 +448,7 @@ _binding_change_cb(void *data) static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *l; E_Config_Binding_Signal *bi, *bi2; @@ -589,7 +589,7 @@ _signal_add_cb_ok(void *data, E_Dialog *dia) } static void -_signal_add_cb_cancel(void *data __UNUSED__, E_Dialog *dia) +_signal_add_cb_cancel(void *data EINA_UNUSED, E_Dialog *dia) { e_object_del(E_OBJECT(dia)); } @@ -647,7 +647,7 @@ _signal_add_show(E_Config_Dialog_Data *cfdata) } static void -_add_signal_binding_cb(void *data, void *data2 __UNUSED__) +_add_signal_binding_cb(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; @@ -656,7 +656,7 @@ _add_signal_binding_cb(void *data, void *data2 __UNUSED__) } static void -_delete_signal_binding_cb(void *data, void *data2 __UNUSED__) +_delete_signal_binding_cb(void *data, void *data2 EINA_UNUSED) { Eina_List *l = NULL; int sel, n; @@ -699,7 +699,7 @@ _delete_signal_binding_cb(void *data, void *data2 __UNUSED__) static void -_delete_all_signal_binding_cb(void *data, void *data2 __UNUSED__) +_delete_all_signal_binding_cb(void *data, void *data2 EINA_UNUSED) { E_Config_Binding_Signal *bi; E_Config_Dialog_Data *cfdata; @@ -723,7 +723,7 @@ _delete_all_signal_binding_cb(void *data, void *data2 __UNUSED__) static void -_restore_signal_binding_defaults_cb(void *data, void *data2 __UNUSED__) +_restore_signal_binding_defaults_cb(void *data, void *data2 EINA_UNUSED) { E_Config_Bindings *ecb; Eina_Stringshare *prof; diff --git a/src/modules/conf_bindings/e_mod_main.c b/src/modules/conf_bindings/e_mod_main.c index e370c36a8a..287d71bfed 100644 --- a/src/modules/conf_bindings/e_mod_main.c +++ b/src/modules/conf_bindings/e_mod_main.c @@ -46,7 +46,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -74,7 +74,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/conf_bindings/e_mod_main.h b/src/modules/conf_bindings/e_mod_main.h index f254c62f66..d33fab98de 100644 --- a/src/modules/conf_bindings/e_mod_main.h +++ b/src/modules/conf_bindings/e_mod_main.h @@ -1,10 +1,10 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -E_Config_Dialog *e_int_config_acpibindings(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_keybindings(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_mousebindings(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_edgebindings(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_acpibindings(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_keybindings(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_mousebindings(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_edgebindings(Evas_Object *parent, const char *params EINA_UNUSED); E_Config_Dialog *e_int_config_signalbindings(Evas_Object *parent, const char *params); /** diff --git a/src/modules/conf_dialogs/e_int_config_dialogs.c b/src/modules/conf_dialogs/e_int_config_dialogs.c index ad1058b0b7..e929b2c469 100644 --- a/src/modules/conf_dialogs/e_int_config_dialogs.c +++ b/src/modules/conf_dialogs/e_int_config_dialogs.c @@ -20,7 +20,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_dialogs(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_dialogs(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -52,7 +52,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata = E_NEW(E_Config_Dialog_Data, 1); if (!cfdata) return NULL; @@ -61,13 +61,13 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_FREE(cfdata); } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { e_config->cnfmdlg_disabled = cfdata->cnfmdlg_disabled; /* Auto Apply is disabled in E for now */ @@ -84,7 +84,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { int remember = e_config->remember_internal_windows; if (cfdata->remember_windows) @@ -99,7 +99,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ob; E_Radio_Group *rg; diff --git a/src/modules/conf_dialogs/e_int_config_profiles.c b/src/modules/conf_dialogs/e_int_config_profiles.c index 4defb0cdba..938c830576 100644 --- a/src/modules/conf_dialogs/e_int_config_profiles.c +++ b/src/modules/conf_dialogs/e_int_config_profiles.c @@ -37,7 +37,7 @@ struct _Del_Profile_Confirm_Data }; E_Config_Dialog * -e_int_config_profiles(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_profiles(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -68,13 +68,13 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_FREE(cfdata); } static int -_apply_cfdata(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_apply_cfdata(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { const char *cur_profile; E_Action *a; @@ -301,7 +301,7 @@ _ilist_cb_selected(void *data) } static void -_cb_add(void *data, void *data2 __UNUSED__) +_cb_add(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -322,7 +322,7 @@ _cb_add(void *data, void *data2 __UNUSED__) } static void -_cb_delete(void *data, void *data2 __UNUSED__) +_cb_delete(void *data, void *data2 EINA_UNUSED) { Del_Profile_Confirm_Data *d; char buf[4096]; @@ -342,7 +342,7 @@ _cb_delete(void *data, void *data2 __UNUSED__) } static void -_cb_scratch(void *data __UNUSED__, void *data2 __UNUSED__) +_cb_scratch(void *data EINA_UNUSED, void *data2 EINA_UNUSED) { E_Action *a; char *pdir; @@ -362,7 +362,7 @@ _cb_scratch(void *data __UNUSED__, void *data2 __UNUSED__) } static void -_cb_reset(void *data __UNUSED__, void *data2 __UNUSED__) +_cb_reset(void *data EINA_UNUSED, void *data2 EINA_UNUSED) { E_Action *a; char *pdir; diff --git a/src/modules/conf_dialogs/e_mod_main.c b/src/modules/conf_dialogs/e_mod_main.c index dd02242bbd..f949f4e0f5 100644 --- a/src/modules/conf_dialogs/e_mod_main.c +++ b/src/modules/conf_dialogs/e_mod_main.c @@ -24,7 +24,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; while ((cfd = e_config_dialog_get("E", "settings/profiles"))) e_object_del(E_OBJECT(cfd)); @@ -37,7 +37,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/conf_dialogs/e_mod_main.h b/src/modules/conf_dialogs/e_mod_main.h index 90ae3084be..5702552ba0 100644 --- a/src/modules/conf_dialogs/e_mod_main.h +++ b/src/modules/conf_dialogs/e_mod_main.h @@ -1,8 +1,8 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -E_Config_Dialog *e_int_config_profiles(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_dialogs(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_profiles(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_dialogs(Evas_Object *parent, const char *params EINA_UNUSED); /** * @addtogroup Optional_Conf diff --git a/src/modules/conf_display/e_int_config_desk.c b/src/modules/conf_display/e_int_config_desk.c index 4fc00136c8..435f7825b1 100644 --- a/src/modules/conf_display/e_int_config_desk.c +++ b/src/modules/conf_display/e_int_config_desk.c @@ -115,7 +115,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->hdl) ecore_event_handler_del(cfdata->hdl); @@ -126,7 +126,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { char name[40]; @@ -202,7 +202,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) } static void -_cb_config(void *data, void *data2 __UNUSED__) +_cb_config(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; char buf[256]; diff --git a/src/modules/conf_display/e_int_config_desklock.c b/src/modules/conf_display/e_int_config_desklock.c index 58d1a17f22..8e36f88720 100644 --- a/src/modules/conf_display/e_int_config_desklock.c +++ b/src/modules/conf_display/e_int_config_desklock.c @@ -60,7 +60,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_desklock(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_desklock(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -193,7 +193,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Config_Desklock_Background *bg; if (cfdata->bg_fsel) @@ -425,7 +425,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { const Eina_List *l; E_Config_Desklock_Background *cbg; @@ -514,7 +514,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *l, *ll; E_Config_Desklock_Background *cbg; @@ -601,7 +601,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static void -_cb_method_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_method_change(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Eina_List *l; @@ -749,7 +749,7 @@ _login_method_change(void *data, Evas_Object *obj EINA_UNUSED, void *event_info } static void -_cb_login_change(void *data, Evas_Object *obj __UNUSED__) +_cb_login_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -758,7 +758,7 @@ _cb_login_change(void *data, Evas_Object *obj __UNUSED__) } static void -_cb_bg_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event __UNUSED__) +_cb_bg_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) { E_Config_Dialog_Data *cfdata; diff --git a/src/modules/conf_display/e_int_config_desklock_fsel.c b/src/modules/conf_display/e_int_config_desklock_fsel.c index b642e53511..a0a52ea113 100644 --- a/src/modules/conf_display/e_int_config_desklock_fsel.c +++ b/src/modules/conf_display/e_int_config_desklock_fsel.c @@ -66,7 +66,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *ow, *ot, *rt; E_Radio_Group *rg; @@ -131,7 +131,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data } static void -_cb_dir_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_dir_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -141,7 +141,7 @@ _cb_dir_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static void -_cb_sel_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_sel_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Eina_List *sel; @@ -164,7 +164,7 @@ _cb_sel_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) } static void -_cb_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_files_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { E_Config_Dialog_Data *cfdata; const char *p = NULL; @@ -196,7 +196,7 @@ _cb_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED_ } static void -_cb_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_files_deleted(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Eina_List *sel, *all, *n; @@ -221,7 +221,7 @@ _cb_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED_ } static void -_cb_radio_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_cb_radio_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { E_Config_Dialog_Data *cfdata; char path[PATH_MAX]; @@ -235,7 +235,7 @@ _cb_radio_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED_ } static void -_cb_dir_up(void *data1, void *data2 __UNUSED__) +_cb_dir_up(void *data1, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; diff --git a/src/modules/conf_display/e_int_config_desks.c b/src/modules/conf_display/e_int_config_desks.c index 96bc2cbef1..2b54c6be38 100644 --- a/src/modules/conf_display/e_int_config_desks.c +++ b/src/modules/conf_display/e_int_config_desks.c @@ -28,7 +28,7 @@ struct _E_Config_Dialog_Data /* a nice easy setup function that does the dirty work */ E_Config_Dialog * -e_int_config_desks(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_desks(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -92,7 +92,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -102,7 +102,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_FREE_LIST(cfdata->comp_effects, eina_stringshare_del); free(cfdata); @@ -111,7 +111,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) /**--APPLY--**/ static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { /* Actually take our cfdata settings and apply them in real life */ if ((cfdata->x != e_config->zone_desks_x_count) || @@ -142,7 +142,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { const Eina_List *l; E_Zone *zone; @@ -166,7 +166,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda /**--GUI--**/ static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { /* generate the core widget layout for a basic dialog */ Evas_Object *o, *ob, *of, *otb; @@ -245,7 +245,7 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial } static void -_cb_slider_change(void *data, Evas_Object *obj __UNUSED__) +_cb_slider_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; diff --git a/src/modules/conf_display/e_int_config_dpms.c b/src/modules/conf_display/e_int_config_dpms.c index 1a88708f2d..8f8be47712 100644 --- a/src/modules/conf_display/e_int_config_dpms.c +++ b/src/modules/conf_display/e_int_config_dpms.c @@ -37,7 +37,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_dpms(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_dpms(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -85,13 +85,13 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_FREE(cfdata); } static int -_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { e_config->backlight.normal = cfdata->backlight_normal / 100.0; e_config->backlight.dim = cfdata->backlight_dim / 100.0; @@ -121,7 +121,7 @@ _apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) /* advanced window */ static int -_advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_advanced_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { // set state from saved config e_widget_disabled_set(cfdata->backlight_slider_idle, !cfdata->enable_idle_dim); @@ -144,7 +144,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_advanced_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *otb, *o, *ob; Eina_List *devs, *l; @@ -255,7 +255,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D } static void -_cb_disable(void *data, Evas_Object *obj __UNUSED__) +_cb_disable(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; const Eina_List *l; @@ -269,7 +269,7 @@ _cb_disable(void *data, Evas_Object *obj __UNUSED__) } static void -_cb_ask_presentation_changed(void *data, Evas_Object *obj __UNUSED__) +_cb_ask_presentation_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Eina_Bool disable; diff --git a/src/modules/conf_display/e_int_config_screensaver.c b/src/modules/conf_display/e_int_config_screensaver.c index 10587527a7..b06e36aa72 100644 --- a/src/modules/conf_display/e_int_config_screensaver.c +++ b/src/modules/conf_display/e_int_config_screensaver.c @@ -11,7 +11,7 @@ static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static int _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); +static int _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static void _cb_ask_presentation_changed(void *data, Evas_Object *obj); @@ -39,7 +39,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_screensaver(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_screensaver(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -89,13 +89,13 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { free(cfdata); } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { e_config->screensaver_enable = cfdata->enable_screensaver; e_config->screensaver_timeout = lround(cfdata->timeout * 60.0); @@ -140,7 +140,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { return ((e_config->screensaver_enable != cfdata->enable_screensaver) || (e_config->screensaver_timeout != lround(cfdata->timeout * 60.0)) || @@ -156,7 +156,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *otb, *ol, *ow, *oc, *oc2; @@ -234,7 +234,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data } static void -_cb_ask_presentation_changed(void *data, Evas_Object *obj __UNUSED__) +_cb_ask_presentation_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; Eina_Bool disable; diff --git a/src/modules/conf_display/e_mod_main.c b/src/modules/conf_display/e_mod_main.c index 1aaca93a94..ab8c3e351c 100644 --- a/src/modules/conf_display/e_mod_main.c +++ b/src/modules/conf_display/e_mod_main.c @@ -51,7 +51,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -85,7 +85,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/conf_display/e_mod_main.h b/src/modules/conf_display/e_mod_main.h index 8debe7220d..bd1e79643f 100644 --- a/src/modules/conf_display/e_mod_main.h +++ b/src/modules/conf_display/e_mod_main.h @@ -2,11 +2,11 @@ #define E_MOD_MAIN_H E_Config_Dialog *e_int_config_desk(Evas_Object *parent, const char *params); -E_Config_Dialog *e_int_config_screensaver(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_dpms(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_display(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_desks(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_desklock(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_screensaver(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_dpms(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_display(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_desks(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_desklock(Evas_Object *parent, const char *params EINA_UNUSED); void e_int_config_desklock_fsel_done(E_Config_Dialog *cfd, Evas_Object *bg, const char *bg_file, Eina_Bool hide_logo); E_Config_Dialog *e_int_config_desklock_fsel(E_Config_Dialog *parent, Evas_Object *bg); void e_int_config_desklock_fsel_del(E_Config_Dialog *cfd); diff --git a/src/modules/conf_interaction/e_int_config_interaction.c b/src/modules/conf_interaction/e_int_config_interaction.c index 6403316376..62fc2b5184 100644 --- a/src/modules/conf_interaction/e_int_config_interaction.c +++ b/src/modules/conf_interaction/e_int_config_interaction.c @@ -17,7 +17,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_interaction(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_interaction(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -50,7 +50,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -60,13 +60,13 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_FREE(cfdata); } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { return ((cfdata->thumbscroll_enable != e_config->thumbscroll_enable) || (cfdata->thumbscroll_threshhold != e_config->thumbscroll_threshhold) || @@ -75,7 +75,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { e_config->thumbscroll_enable = cfdata->thumbscroll_enable; e_config->thumbscroll_threshhold = cfdata->thumbscroll_threshhold; @@ -87,7 +87,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ob; @@ -140,7 +140,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data } static void -_enabled_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_enabled_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; diff --git a/src/modules/conf_interaction/e_int_config_mouse.c b/src/modules/conf_interaction/e_int_config_mouse.c index 6ad251554b..dadad8cc53 100644 --- a/src/modules/conf_interaction/e_int_config_mouse.c +++ b/src/modules/conf_interaction/e_int_config_mouse.c @@ -27,7 +27,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_mouse(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_mouse(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -76,7 +76,7 @@ _create_data(E_Config_Dialog *cfd) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { return !((cfdata->show_cursor == e_config->show_cursor) && (cfdata->idle_cursor == e_config->idle_cursor) && @@ -89,14 +89,14 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_FREE(cfdata); } /* advanced window */ static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { e_config->use_e_cursor = cfdata->use_e_cursor; e_config->show_cursor = cfdata->show_cursor; @@ -122,7 +122,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) static void -_use_e_cursor_cb_change(void *data, Evas_Object *obj __UNUSED__) +_use_e_cursor_cb_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; Eina_Bool disabled = ((!cfdata->use_e_cursor) || (!cfdata->show_cursor)); @@ -130,7 +130,7 @@ _use_e_cursor_cb_change(void *data, Evas_Object *obj __UNUSED__) } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *otb, *ol, *of, *ob, *oc; E_Radio_Group *rg; diff --git a/src/modules/conf_interaction/e_mod_main.c b/src/modules/conf_interaction/e_mod_main.c index 626c6867fa..25101de451 100644 --- a/src/modules/conf_interaction/e_mod_main.c +++ b/src/modules/conf_interaction/e_mod_main.c @@ -30,7 +30,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -49,7 +49,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/conf_interaction/e_mod_main.h b/src/modules/conf_interaction/e_mod_main.h index 628914dbbd..d0d82e9f4e 100644 --- a/src/modules/conf_interaction/e_mod_main.h +++ b/src/modules/conf_interaction/e_mod_main.h @@ -1,8 +1,8 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -E_Config_Dialog *e_int_config_interaction(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_mouse(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_interaction(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_mouse(Evas_Object *parent, const char *params EINA_UNUSED); /** * @addtogroup Optional_Conf diff --git a/src/modules/conf_intl/e_int_config_imc.c b/src/modules/conf_intl/e_int_config_imc.c index 5baf0801cf..966ccfbdaf 100644 --- a/src/modules/conf_intl/e_int_config_imc.c +++ b/src/modules/conf_intl/e_int_config_imc.c @@ -30,8 +30,8 @@ static void _e_imc_change_enqueue(E_Config_Dialog_Data *cfdata); static void _e_imc_entry_change_cb(void *data, Evas_Object *obj); static void _e_imc_form_fill(E_Config_Dialog_Data *cfdata); static const char *_e_imc_file_name_new_get(void); -static Eina_Bool _change_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__); -static Eina_Bool _change_hash_apply_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata __UNUSED__); +static Eina_Bool _change_hash_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED); +static Eina_Bool _change_hash_apply_cb(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata EINA_UNUSED); struct _E_Config_Dialog_Data { @@ -84,7 +84,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_imc(Evas_Object *parent, const char *params __UNUSED__) +e_int_config_imc(Evas_Object *parent, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -134,7 +134,7 @@ _create_data(E_Config_Dialog *cfd) } static Eina_Bool -_change_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) +_change_hash_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED) { E_Input_Method_Config *imc; @@ -144,7 +144,7 @@ _change_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED_ } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->win_import) e_int_config_imc_import_del(cfdata->win_import); @@ -174,7 +174,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) /*** Start Basic Dialog Logic ***/ static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { eina_stringshare_replace(&e_config->input_method, NULL); if (!cfdata->imc_disable) @@ -210,7 +210,7 @@ _e_imc_setup_button_toggle(Evas_Object *button, E_Input_Method_Config *imc) } static void -_e_imc_list_change_cb(void *data, Evas_Object *obj __UNUSED__) +_e_imc_list_change_cb(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; E_Input_Method_Config *imc; @@ -226,7 +226,7 @@ _e_imc_list_change_cb(void *data, Evas_Object *obj __UNUSED__) } static void -_e_imc_imc_toggle(void *data, Evas_Object *obj __UNUSED__) +_e_imc_imc_toggle(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -246,7 +246,7 @@ _e_imc_imc_toggle(void *data, Evas_Object *obj __UNUSED__) } static void -_e_imc_setup_cb(void *data, void *data2 __UNUSED__) +_e_imc_setup_cb(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -391,7 +391,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia /*** Start Advanced Dialog Logic ***/ static Eina_Bool -_change_hash_apply_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata __UNUSED__) +_change_hash_apply_cb(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata EINA_UNUSED) { E_Input_Method_Config *imc; Eet_File *ef; @@ -436,7 +436,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) /* Radio Toggled */ static void -_cb_dir(void *data, Evas_Object *obj __UNUSED__) +_cb_dir(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; const char *path; @@ -451,7 +451,7 @@ _cb_dir(void *data, Evas_Object *obj __UNUSED__) /* Directory Navigator */ static void -_cb_button_up(void *data, void *data2 __UNUSED__) +_cb_button_up(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -464,7 +464,7 @@ _cb_button_up(void *data, void *data2 __UNUSED__) /* Entry chagned */ static void -_e_imc_entry_change_cb(void *data, Evas_Object *obj __UNUSED__) +_e_imc_entry_change_cb(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -474,7 +474,7 @@ _e_imc_entry_change_cb(void *data, Evas_Object *obj __UNUSED__) /* Creating a new IMC */ static void -_cb_new(void *data, void *data2 __UNUSED__) +_cb_new(void *data, void *data2 EINA_UNUSED) { E_Input_Method_Config *imc_new; Eet_File *ef; @@ -501,7 +501,7 @@ _cb_new(void *data, void *data2 __UNUSED__) } static void -_e_imc_adv_setup_cb(void *data, void *data2 __UNUSED__) +_e_imc_adv_setup_cb(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -528,7 +528,7 @@ _e_imc_adv_setup_cb(void *data, void *data2 __UNUSED__) /** Start IMC FM2 Callbacks **/ static void -_cb_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_files_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -549,7 +549,7 @@ _cb_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN } static void -_cb_files_selection_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_files_selection_change(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Eina_List *selected; @@ -583,7 +583,7 @@ _cb_files_selection_change(void *data, Evas_Object *obj __UNUSED__, void *event_ } static void -_cb_files_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_files_files_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { const char *buf; const char *p; @@ -613,7 +613,7 @@ _cb_files_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_inf } static void -_cb_files_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_files_files_deleted(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Eina_List *sel, *all, *n; @@ -766,7 +766,7 @@ e_int_config_imc_import_done(E_Config_Dialog *dia) } static void -_cb_import(void *data1, void *data2 __UNUSED__) +_cb_import(void *data1, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; diff --git a/src/modules/conf_intl/e_int_config_imc_import.c b/src/modules/conf_intl/e_int_config_imc_import.c index 5905aa80a0..aff37ad012 100644 --- a/src/modules/conf_intl/e_int_config_imc_import.c +++ b/src/modules/conf_intl/e_int_config_imc_import.c @@ -180,7 +180,7 @@ _imc_import_cb_wid_focus(void *data, Evas_Object *obj) } static void -_imc_import_cb_selected(void *data, Evas_Object *obj __UNUSED__) +_imc_import_cb_selected(void *data, Evas_Object *obj EINA_UNUSED) { Import *import; @@ -189,7 +189,7 @@ _imc_import_cb_selected(void *data, Evas_Object *obj __UNUSED__) } static void -_imc_import_cb_changed(void *data, Evas_Object *obj __UNUSED__) +_imc_import_cb_changed(void *data, Evas_Object *obj EINA_UNUSED) { Import *import; const char *path; @@ -229,7 +229,7 @@ _imc_import_cb_changed(void *data, Evas_Object *obj __UNUSED__) } static void -_imc_import_cb_ok(void *data, void *data2 __UNUSED__) +_imc_import_cb_ok(void *data, void *data2 EINA_UNUSED) { Import *import; Evas_Object *win; @@ -298,13 +298,13 @@ _imc_import_cb_ok(void *data, void *data2 __UNUSED__) } static void -_imc_import_cb_close(void *data, void *data2 __UNUSED__) +_imc_import_cb_close(void *data, void *data2 EINA_UNUSED) { e_int_config_imc_import_del(data); } static void -_imc_import_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_imc_import_cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Key_Down *ev; Import *import; diff --git a/src/modules/conf_intl/e_int_config_intl.c b/src/modules/conf_intl/e_int_config_intl.c index 53e8cf31e5..2843900fa2 100644 --- a/src/modules/conf_intl/e_int_config_intl.c +++ b/src/modules/conf_intl/e_int_config_intl.c @@ -26,10 +26,10 @@ static int _basic_lang_list_sort(const void *data1, const void *data2); /* Fill the clear lists, fill with language, select */ /* Update lanague */ static void _cfdata_language_go(const char *lang, const char *region, const char *codeset, const char *modifier, E_Config_Dialog_Data *cfdata); -static Eina_Bool _lang_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata); -static Eina_Bool _region_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata); -static Eina_Bool _language_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__); -static Eina_Bool _region_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__); +static Eina_Bool _lang_hash_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata); +static Eina_Bool _region_hash_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata); +static Eina_Bool _language_hash_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED); +static Eina_Bool _region_hash_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED); static void _intl_current_locale_setup(E_Config_Dialog_Data *cfdata); static const char *_intl_charset_upper_get(const char *charset); @@ -579,7 +579,7 @@ const E_Intl_Pair charset_predefined_pairs[] = { }; E_Config_Dialog * -e_int_config_intl(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_intl(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -604,7 +604,7 @@ e_int_config_intl(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__ } E_Config_Dialog * -e_int_config_desklock_intl(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_desklock_intl(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -859,7 +859,7 @@ _create_desklock_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_FREE(cfdata->cur_language); @@ -880,7 +880,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Eina_Bool -_language_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) +_language_hash_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED) { E_Intl_Language_Node *node; @@ -894,7 +894,7 @@ _language_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSE } static Eina_Bool -_region_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) +_region_hash_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED) { E_Intl_Region_Node *node; @@ -925,7 +925,7 @@ _region_hash_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED_ } static void -_lc_check_del(void *data __UNUSED__) +_lc_check_del(void *data EINA_UNUSED) { E_Action *a; a = e_action_find("restart"); @@ -968,7 +968,7 @@ _lc_check(void) } static int -_basic_advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_advanced_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { const char *previous; @@ -983,7 +983,7 @@ _basic_advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_D } static int -_basic_advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_advanced_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->cur_language) { @@ -1198,7 +1198,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data } static void -_ilist_basic_language_cb_change(void *data, Evas_Object *obj __UNUSED__) +_ilist_basic_language_cb_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -1207,7 +1207,7 @@ _ilist_basic_language_cb_change(void *data, Evas_Object *obj __UNUSED__) } static void -_ilist_language_cb_change(void *data, Evas_Object *obj __UNUSED__) +_ilist_language_cb_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -1221,7 +1221,7 @@ _ilist_language_cb_change(void *data, Evas_Object *obj __UNUSED__) } static void -_ilist_region_cb_change(void *data, Evas_Object *obj __UNUSED__) +_ilist_region_cb_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; char locale[32]; @@ -1244,7 +1244,7 @@ _ilist_region_cb_change(void *data, Evas_Object *obj __UNUSED__) } static void -_ilist_codeset_cb_change(void *data, Evas_Object *obj __UNUSED__) +_ilist_codeset_cb_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; char locale[32]; @@ -1264,7 +1264,7 @@ _ilist_codeset_cb_change(void *data, Evas_Object *obj __UNUSED__) } static void -_ilist_modifier_cb_change(void *data, Evas_Object *obj __UNUSED__) +_ilist_modifier_cb_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; char locale[32]; @@ -1395,7 +1395,7 @@ _cfdata_language_go(const char *lang, const char *region, const char *codeset, c } static Eina_Bool -_lang_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) +_lang_hash_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata) { E_Config_Dialog_Data *cfdata; E_Intl_Language_Node *lang_node; @@ -1408,7 +1408,7 @@ _lang_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void } static Eina_Bool -_region_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) +_region_hash_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata) { E_Config_Dialog_Data *cfdata; E_Intl_Region_Node *reg_node; diff --git a/src/modules/conf_intl/e_mod_main.c b/src/modules/conf_intl/e_mod_main.c index 517447db02..c960a48d9f 100644 --- a/src/modules/conf_intl/e_mod_main.c +++ b/src/modules/conf_intl/e_mod_main.c @@ -34,7 +34,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -54,7 +54,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/conf_intl/e_mod_main.h b/src/modules/conf_intl/e_mod_main.h index eec806a3fb..3f46802fc2 100644 --- a/src/modules/conf_intl/e_mod_main.h +++ b/src/modules/conf_intl/e_mod_main.h @@ -1,15 +1,15 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -E_Config_Dialog *e_int_config_imc(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_imc(Evas_Object *parent, const char *params EINA_UNUSED); void e_int_config_imc_import_done(E_Config_Dialog *dia); void e_int_config_imc_update(E_Config_Dialog *dia, const char *file); Evas_Object *e_int_config_imc_import(E_Config_Dialog *parent); void e_int_config_imc_import_del(Evas_Object *); -E_Config_Dialog *e_int_config_intl(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_desklock_intl(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_intl(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_desklock_intl(Evas_Object *parent, const char *params EINA_UNUSED); /** * @addtogroup Optional_Conf diff --git a/src/modules/conf_menus/e_int_config_menus.c b/src/modules/conf_menus/e_int_config_menus.c index c3db9df527..39ab2f5105 100644 --- a/src/modules/conf_menus/e_int_config_menus.c +++ b/src/modules/conf_menus/e_int_config_menus.c @@ -21,7 +21,7 @@ static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); E_Config_Dialog * -e_int_config_menus(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_menus(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -42,7 +42,7 @@ e_int_config_menus(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED_ /* local functions */ static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -52,7 +52,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_fill_data(E_Config_Dialog_Data *cfdata __UNUSED__) +_fill_data(E_Config_Dialog_Data *cfdata EINA_UNUSED) { if (e_config->default_system_menu) cfdata->default_system_menu = @@ -75,7 +75,7 @@ _fill_data(E_Config_Dialog_Data *cfdata __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->default_system_menu) eina_stringshare_del(cfdata->default_system_menu); @@ -248,7 +248,7 @@ _create_menus_list(Evas *evas, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *otb, *ol, *of, *ow; @@ -325,7 +325,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { e_config->menu_favorites_show = cfdata->show_favs; e_config->menu_apps_show = cfdata->show_apps; @@ -366,7 +366,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { double scroll_speed, move_threshold; diff --git a/src/modules/conf_menus/e_mod_main.c b/src/modules/conf_menus/e_mod_main.c index a80334ad6b..74890deb8d 100644 --- a/src/modules/conf_menus/e_mod_main.c +++ b/src/modules/conf_menus/e_mod_main.c @@ -22,7 +22,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; while ((cfd = e_config_dialog_get("E", "menus/menu_settings"))) e_object_del(E_OBJECT(cfd)); @@ -33,7 +33,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/conf_menus/e_mod_main.h b/src/modules/conf_menus/e_mod_main.h index 4bf6738af6..6a923196da 100644 --- a/src/modules/conf_menus/e_mod_main.h +++ b/src/modules/conf_menus/e_mod_main.h @@ -1,7 +1,7 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -E_Config_Dialog *e_int_config_menus(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_menus(Evas_Object *parent, const char *params EINA_UNUSED); /** * @addtogroup Optional_Conf diff --git a/src/modules/conf_paths/e_int_config_env.c b/src/modules/conf_paths/e_int_config_env.c index 9f7c850ff4..4474a1bfd8 100644 --- a/src/modules/conf_paths/e_int_config_env.c +++ b/src/modules/conf_paths/e_int_config_env.c @@ -20,7 +20,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_env(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_env(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -67,7 +67,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Config_Env_Var *evr; @@ -83,7 +83,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *l, *l2; E_Config_Env_Var *evr, *evr2; @@ -148,7 +148,7 @@ _sel_cb(void *data) } static void -_add_cb(void *data, void *data2 __UNUSED__) +_add_cb(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; Eina_List *l; @@ -212,7 +212,7 @@ _add_cb(void *data, void *data2 __UNUSED__) } static void -_del_cb(void *data, void *data2 __UNUSED__) +_del_cb(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; Eina_List *l; @@ -258,13 +258,13 @@ _del_cb(void *data, void *data2 __UNUSED__) } static void -_mod_cb(void *data, void *data2 __UNUSED__) +_mod_cb(void *data, void *data2 EINA_UNUSED) { _add_cb(data, data2); } static void -_unset_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_unset_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; if (cfdata->unset) e_widget_entry_text_set(cfdata->gui.val_en, ""); diff --git a/src/modules/conf_paths/e_int_config_paths.c b/src/modules/conf_paths/e_int_config_paths.c index 808f772795..4b67fe36c0 100644 --- a/src/modules/conf_paths/e_int_config_paths.c +++ b/src/modules/conf_paths/e_int_config_paths.c @@ -43,7 +43,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_paths(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_paths(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -97,7 +97,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { while (cfdata->pcd_list) { @@ -122,7 +122,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *l; Eina_List *ll; diff --git a/src/modules/conf_paths/e_mod_main.c b/src/modules/conf_paths/e_mod_main.c index 395f00afc2..16166f968e 100644 --- a/src/modules/conf_paths/e_mod_main.c +++ b/src/modules/conf_paths/e_mod_main.c @@ -31,7 +31,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -48,7 +48,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/conf_paths/e_mod_main.h b/src/modules/conf_paths/e_mod_main.h index 2a23f84783..dc59004993 100644 --- a/src/modules/conf_paths/e_mod_main.h +++ b/src/modules/conf_paths/e_mod_main.h @@ -1,8 +1,8 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -E_Config_Dialog *e_int_config_env(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_paths(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_env(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_paths(Evas_Object *parent, const char *params EINA_UNUSED); /** * @addtogroup Optional_Conf diff --git a/src/modules/conf_performance/e_int_config_performance.c b/src/modules/conf_performance/e_int_config_performance.c index ce0e49eace..f99c84bc5d 100644 --- a/src/modules/conf_performance/e_int_config_performance.c +++ b/src/modules/conf_performance/e_int_config_performance.c @@ -19,7 +19,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_performance(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_performance(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -40,7 +40,7 @@ e_int_config_performance(Evas_Object *parent EINA_UNUSED, const char *params __U } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -58,13 +58,13 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_FREE(cfdata); } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->framerate <= 0.0) cfdata->framerate = 1.0; e_config->framerate = cfdata->framerate; @@ -84,7 +84,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->framerate <= 0.0) cfdata->framerate = 1.0; return ((e_config->framerate != cfdata->framerate) || @@ -98,7 +98,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *otb, *ob, *ol; diff --git a/src/modules/conf_performance/e_int_config_powermanagement.c b/src/modules/conf_performance/e_int_config_powermanagement.c index 4d1b6739ff..7bae62929b 100644 --- a/src/modules/conf_performance/e_int_config_powermanagement.c +++ b/src/modules/conf_performance/e_int_config_powermanagement.c @@ -24,7 +24,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_powermanagement(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_powermanagement(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -45,7 +45,7 @@ e_int_config_powermanagement(Evas_Object *parent EINA_UNUSED, const char *params } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -60,7 +60,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { eina_list_free(cfdata->gui.rmin); eina_list_free(cfdata->gui.rmax); @@ -68,7 +68,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { e_config->powersave.none = cfdata->powersave_none; e_config->powersave.low = cfdata->powersave_low; @@ -90,7 +90,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { return ((e_config->powersave.min != cfdata->powersave_min) || (e_config->powersave.max != cfdata->powersave_max) || @@ -102,7 +102,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *ob, *ol; E_Radio_Group *rmin, *rmax; @@ -372,7 +372,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data static void -_cb_min_changed(void *data, Evas_Object *obj __UNUSED__) +_cb_min_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Evas_Object *o; @@ -388,7 +388,7 @@ _cb_min_changed(void *data, Evas_Object *obj __UNUSED__) } static void -_cb_max_changed(void *data, Evas_Object *obj __UNUSED__) +_cb_max_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Evas_Object *o; diff --git a/src/modules/conf_performance/e_mod_main.c b/src/modules/conf_performance/e_mod_main.c index 21eecd48bf..882c416d53 100644 --- a/src/modules/conf_performance/e_mod_main.c +++ b/src/modules/conf_performance/e_mod_main.c @@ -23,7 +23,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; while ((cfd = e_config_dialog_get("E", "advanced/performance"))) e_object_del(E_OBJECT(cfd)); @@ -35,7 +35,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/conf_performance/e_mod_main.h b/src/modules/conf_performance/e_mod_main.h index 80b19ee91f..6e6ac24380 100644 --- a/src/modules/conf_performance/e_mod_main.h +++ b/src/modules/conf_performance/e_mod_main.h @@ -1,9 +1,9 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -E_Config_Dialog *e_int_config_engine(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_performance(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_powermanagement(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_engine(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_performance(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_powermanagement(Evas_Object *parent, const char *params EINA_UNUSED); /** * @addtogroup Optional_Conf diff --git a/src/modules/conf_randr/e_int_config_randr.h b/src/modules/conf_randr/e_int_config_randr.h index a0d91f841f..0a25973af0 100644 --- a/src/modules/conf_randr/e_int_config_randr.h +++ b/src/modules/conf_randr/e_int_config_randr.h @@ -3,7 +3,7 @@ # ifndef E_INT_CONFIG_RANDR_H # define E_INT_CONFIG_RANDR_H -E_Config_Dialog *e_int_config_randr(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_randr(Evas_Object *parent, const char *params EINA_UNUSED); # endif #endif diff --git a/src/modules/conf_randr/e_mod_main.c b/src/modules/conf_randr/e_mod_main.c index d8cb733ac3..30bf5fcbfa 100644 --- a/src/modules/conf_randr/e_mod_main.c +++ b/src/modules/conf_randr/e_mod_main.c @@ -25,7 +25,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -38,7 +38,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c index 64c45eaf4f..63f8f85a96 100644 --- a/src/modules/conf_shelves/e_int_config_shelf.c +++ b/src/modules/conf_shelves/e_int_config_shelf.c @@ -39,7 +39,7 @@ struct _E_Config_Dialog_Data static E_Config_Dialog_Data *_cfdata; E_Config_Dialog * -e_int_config_shelf(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_shelf(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -59,7 +59,7 @@ e_int_config_shelf(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED_ } static Eina_Bool -_shelf_handler_rename_cb(E_Config_Dialog_Data *cfdata, int type __UNUSED__, E_Event_Shelf *ev) +_shelf_handler_rename_cb(E_Config_Dialog_Data *cfdata, int type EINA_UNUSED, E_Event_Shelf *ev) { const Eina_List *l; E_Ilist_Item *ili; @@ -74,7 +74,7 @@ _shelf_handler_rename_cb(E_Config_Dialog_Data *cfdata, int type __UNUSED__, E_Ev } static Eina_Bool -_shelf_handler_cb(E_Config_Dialog_Data *cfdata, int type __UNUSED__, E_Event_Shelf_Add *ev) +_shelf_handler_cb(E_Config_Dialog_Data *cfdata, int type EINA_UNUSED, E_Event_Shelf_Add *ev) { E_Zone *zone; @@ -101,7 +101,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Shelf *es; EINA_LIST_FREE(cfdata->shelves, es) @@ -116,7 +116,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *ol, *ow, *ot, *of; char buf[64]; @@ -161,7 +161,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data /* private functions */ static void -_ilist_refresh(E_Shelf *es __UNUSED__) +_ilist_refresh(E_Shelf *es EINA_UNUSED) { _ilist_empty(_cfdata); _ilist_fill(_cfdata); @@ -316,7 +316,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata) } static void -_ilist_cb_selected(void *data __UNUSED__) +_ilist_cb_selected(void *data EINA_UNUSED) { _widgets_disable(_cfdata, 0, EINA_TRUE); } @@ -338,7 +338,7 @@ _new_shelf_cb_close(void *data) } static void -_cb_add(void *data, void *data2 __UNUSED__) +_cb_add(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; E_Zone *zone; @@ -355,7 +355,7 @@ _cb_add(void *data, void *data2 __UNUSED__) } static void -_cb_rename(void *data, void *d __UNUSED__) +_cb_rename(void *data, void *d EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; E_Shelf *es; @@ -364,7 +364,7 @@ _cb_rename(void *data, void *d __UNUSED__) } static void -_cb_delete(void *data, void *data2 __UNUSED__) +_cb_delete(void *data, void *data2 EINA_UNUSED) { char buf[1024]; E_Config_Dialog_Data *cfdata = data; @@ -424,13 +424,13 @@ _cb_dialog_destroy(void *data) } static void -_cb_config_end(void *data __UNUSED__) +_cb_config_end(void *data EINA_UNUSED) { e_widget_disabled_set(_cfdata->o_list, 0); } static void -_cb_config(void *data, void *data2 __UNUSED__) +_cb_config(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; E_Shelf *es; @@ -446,13 +446,13 @@ _cb_config(void *data, void *data2 __UNUSED__) } static void -_cb_contents_end(void *data __UNUSED__) +_cb_contents_end(void *data EINA_UNUSED) { e_widget_disabled_set(_cfdata->o_list, 0); } static void -_cb_contents(void *data, void *data2 __UNUSED__) +_cb_contents(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; E_Shelf *es; diff --git a/src/modules/conf_shelves/e_int_config_shelf.h b/src/modules/conf_shelves/e_int_config_shelf.h index 5ac7a3fcba..561b121618 100644 --- a/src/modules/conf_shelves/e_int_config_shelf.h +++ b/src/modules/conf_shelves/e_int_config_shelf.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_SHELF_H #define E_INT_CONFIG_SHELF_H -E_Config_Dialog *e_int_config_shelf(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_shelf(Evas_Object *parent, const char *params EINA_UNUSED); #endif #endif diff --git a/src/modules/conf_shelves/e_mod_main.c b/src/modules/conf_shelves/e_mod_main.c index 7f794127f8..92875b665f 100644 --- a/src/modules/conf_shelves/e_mod_main.c +++ b/src/modules/conf_shelves/e_mod_main.c @@ -34,7 +34,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -54,21 +54,21 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } /* menu item callback(s) */ static void -_e_mod_run_cb(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +_e_mod_run_cb(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_configure_registry_call("extensions/shelves", NULL, NULL); } /* menu item add hook */ static void -_e_mod_menu_add(void *data __UNUSED__, E_Menu *m) +_e_mod_menu_add(void *data EINA_UNUSED, E_Menu *m) { E_Menu_Item *mi; diff --git a/src/modules/conf_shelves/e_mod_main.h b/src/modules/conf_shelves/e_mod_main.h index 5058fd6648..2b8cf22388 100644 --- a/src/modules/conf_shelves/e_mod_main.h +++ b/src/modules/conf_shelves/e_mod_main.h @@ -1,7 +1,7 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -E_Config_Dialog *e_int_config_shelf(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_shelf(Evas_Object *parent, const char *params EINA_UNUSED); /** * @addtogroup Optional_Conf diff --git a/src/modules/conf_theme/e_int_config_borders.c b/src/modules/conf_theme/e_int_config_borders.c index cac3c7681c..59f5836e9d 100644 --- a/src/modules/conf_theme/e_int_config_borders.c +++ b/src/modules/conf_theme/e_int_config_borders.c @@ -18,7 +18,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_borders(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_borders(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -33,7 +33,7 @@ e_int_config_borders(Evas_Object *parent EINA_UNUSED, const char *params __UNUSE } E_Config_Dialog * -e_int_config_borders_border(E_Comp *comp __UNUSED__, const char *params) +e_int_config_borders_border(E_Comp *comp EINA_UNUSED, const char *params) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -100,7 +100,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->client) cfdata->client->border_border_dialog = NULL; @@ -110,7 +110,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_Bool remch = ((cfdata->remember_border && !((cfdata->client->remember) && @@ -125,7 +125,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->client) _basic_apply_border(cfdata); diff --git a/src/modules/conf_theme/e_int_config_color_classes.c b/src/modules/conf_theme/e_int_config_color_classes.c index a927360f99..f891cd77b4 100644 --- a/src/modules/conf_theme/e_int_config_color_classes.c +++ b/src/modules/conf_theme/e_int_config_color_classes.c @@ -146,7 +146,7 @@ static Eina_Bool _fill_data_delayed(void *data); static Eina_Bool _color_changed_delay(void *data); E_Config_Dialog * -e_int_config_color_classes(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_color_classes(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -166,7 +166,7 @@ e_int_config_color_classes(Evas_Object *parent EINA_UNUSED, const char *params _ } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata = E_NEW(E_Config_Dialog_Data, 1); if (!cfdata) return NULL; @@ -174,7 +174,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { CFColor_Class *ccc; @@ -322,7 +322,7 @@ _color_class_list_selection_idler(void *data) } static void -_color_class_list_selection_changed(void *data, Evas_Object *obj __UNUSED__) +_color_class_list_selection_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; @@ -369,7 +369,7 @@ _config_color_class_color_reset(CFColor_Class *ccc) } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { CFColor_Class *ccc; diff --git a/src/modules/conf_theme/e_int_config_fonts.c b/src/modules/conf_theme/e_int_config_fonts.c index df8d388c3e..ed7ba040b1 100644 --- a/src/modules/conf_theme/e_int_config_fonts.c +++ b/src/modules/conf_theme/e_int_config_fonts.c @@ -28,7 +28,7 @@ static void _size_list_load(E_Config_Dialog_Data *cfdata, Eina_List *siz static void _class_list_load(E_Config_Dialog_Data *cfdata); static void _font_preview_update(E_Config_Dialog_Data *cfdata); -static Eina_Bool _font_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata); +static Eina_Bool _font_hash_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata); struct _E_Font_Size_Data { @@ -149,7 +149,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_fonts(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_fonts(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -310,7 +310,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Font_Size_Data *size_data; CFText_Class *tc; @@ -343,7 +343,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { CFText_Class *tc; Eina_List *next; @@ -403,7 +403,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Eina_Bool -_font_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) +_font_hash_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata) { E_Config_Dialog_Data *cfdata; E_Font_Properties *efp; @@ -462,7 +462,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia } static void -_basic_font_cb_change(void *data, Evas_Object *obj __UNUSED__) +_basic_font_cb_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -472,7 +472,7 @@ _basic_font_cb_change(void *data, Evas_Object *obj __UNUSED__) } static void -_basic_enable_cb_change(void *data, Evas_Object *obj __UNUSED__) +_basic_enable_cb_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -537,7 +537,7 @@ _basic_init_data_fill(E_Config_Dialog_Data *cfdata) } static int -_advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_advanced_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { int i; const Eina_List *l; @@ -776,7 +776,7 @@ _class_list_load(E_Config_Dialog_Data *cfdata) /* Called whenever class list selection changes */ static void -_adv_class_cb_change(void *data, Evas_Object *obj __UNUSED__) +_adv_class_cb_change(void *data, Evas_Object *obj EINA_UNUSED) { int indx; E_Config_Dialog_Data *cfdata; @@ -847,7 +847,7 @@ _adv_class_cb_change(void *data, Evas_Object *obj __UNUSED__) } static void -_adv_enabled_font_cb_change(void *data, Evas_Object *obj __UNUSED__) +_adv_enabled_font_cb_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; CFText_Class *tc; @@ -917,7 +917,7 @@ _size_cb_change(void *data) } static void -_adv_font_cb_change(void *data, Evas_Object *obj __UNUSED__) +_adv_font_cb_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; CFText_Class *tc; @@ -1095,7 +1095,7 @@ _font_list_load(E_Config_Dialog_Data *cfdata, const char *cur_font) } static void -_adv_style_cb_change(void *data, Evas_Object *obj __UNUSED__) +_adv_style_cb_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; E_Ilist_Item *i; @@ -1124,7 +1124,7 @@ _adv_style_cb_change(void *data, Evas_Object *obj __UNUSED__) /* Private Font Fallback Functions */ static void -_adv_enabled_fallback_cb_change(void *data, Evas_Object *obj __UNUSED__) +_adv_enabled_fallback_cb_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; diff --git a/src/modules/conf_theme/e_int_config_scale.c b/src/modules/conf_theme/e_int_config_scale.c index d7655ff017..548540dd23 100644 --- a/src/modules/conf_theme/e_int_config_scale.c +++ b/src/modules/conf_theme/e_int_config_scale.c @@ -3,13 +3,13 @@ /* local function prototypes */ static void *_create_data(E_Config_Dialog *cfd); static void _fill_data(E_Config_Dialog_Data *cfdata); -static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static Evas_Object *_adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static int _adv_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static void _adv_policy_changed(void *data, Evas_Object *obj __UNUSED__); +static void _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static Evas_Object *_adv_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _adv_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static int _adv_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static void _adv_policy_changed(void *data, Evas_Object *obj EINA_UNUSED); struct _E_Config_Dialog_Data { @@ -77,7 +77,7 @@ _scale_preview_sel_set(Evas_Object *ob, int sel) } static void -_scale_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_scale_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Evas_Object *ob = data; @@ -161,7 +161,7 @@ _scale_preview_new(E_Config_Dialog_Data *cfdata, Evas *e, double sc, double *scp } E_Config_Dialog * -e_int_config_scale(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_scale(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -209,14 +209,14 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { eina_list_free(cfdata->obs); E_FREE(cfdata); } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *ob; double sc = 1.0; @@ -258,7 +258,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Action *a; @@ -288,7 +288,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_adv_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *otb, *ow; E_Radio_Group *rg; @@ -383,7 +383,7 @@ _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static int -_adv_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_adv_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { int use_dpi = 0, use_custom = 0; @@ -401,7 +401,7 @@ _adv_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static void -_adv_policy_changed(void *data, Evas_Object *obj __UNUSED__) +_adv_policy_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c index b4c7c1ca39..e5d3225cb6 100644 --- a/src/modules/conf_theme/e_int_config_theme.c +++ b/src/modules/conf_theme/e_int_config_theme.c @@ -305,7 +305,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) } E_Config_Dialog * -e_int_config_theme(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_theme(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -358,13 +358,13 @@ e_int_config_theme_update(E_Config_Dialog *dia, char *file) } static Eina_Bool -_eio_filter_cb(void *data __UNUSED__, Eio_File *handler __UNUSED__, const char *file) +_eio_filter_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, const char *file) { return eina_str_has_extension(file, ".edj"); } static void -_cb_button_up(void *data1, void *data2 __UNUSED__) +_cb_button_up(void *data1, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -373,7 +373,7 @@ _cb_button_up(void *data1, void *data2 __UNUSED__) } static void -_cb_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_files_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -385,7 +385,7 @@ _cb_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN } static void -_cb_files_selection_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_files_selection_change(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Eina_List *selected; @@ -429,7 +429,7 @@ _cb_files_selected(void *data, Evas_Object *obj, void *event_info) #endif static void -_cb_files_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_files_files_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; const char *p; @@ -464,7 +464,7 @@ _cb_files_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_inf } static void -_cb_dir(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_dir(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; char path[PATH_MAX]; @@ -481,7 +481,7 @@ _cb_dir(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) } static void -_cb_files_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_files_files_deleted(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Eina_List *sel, *all, *n; @@ -514,7 +514,7 @@ _cb_files_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_inf } static void -_cb_import(void *data1, void *data2 __UNUSED__) +_cb_import(void *data1, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -584,7 +584,7 @@ _open_done_cb(void *data, Eio_File *handler, Eet_File *file) } static void -_open_error_cb(void *data, Eio_File *handler, int error __UNUSED__) +_open_error_cb(void *data, Eio_File *handler, int error EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; cfdata->theme_init = eina_list_remove(cfdata->theme_init, handler); @@ -592,7 +592,7 @@ _open_error_cb(void *data, Eio_File *handler, int error __UNUSED__) } static void -_init_main_cb(void *data, Eio_File *handler __UNUSED__, const char *file) +_init_main_cb(void *data, Eio_File *handler EINA_UNUSED, const char *file) { E_Config_Dialog_Data *cfdata = data; cfdata->theme_init = eina_list_append(cfdata->theme_init, eio_eet_open(file, EET_FILE_MODE_READ, _open_done_cb, _open_error_cb, cfdata)); @@ -610,7 +610,7 @@ _init_done_cb(void *data, Eio_File *handler) } static void -_init_error_cb(void *data, Eio_File *handler, int error __UNUSED__) +_init_error_cb(void *data, Eio_File *handler, int error EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; if (cfdata->init[0] == handler) @@ -638,7 +638,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *l; Eio_File *ls; @@ -752,7 +752,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Action *a; const char *file; diff --git a/src/modules/conf_theme/e_int_config_theme_import.c b/src/modules/conf_theme/e_int_config_theme_import.c index 4da72b3ed3..95d4dc3987 100644 --- a/src/modules/conf_theme/e_int_config_theme_import.c +++ b/src/modules/conf_theme/e_int_config_theme_import.c @@ -174,7 +174,7 @@ _theme_import_cb_wid_focus(void *data, Evas_Object *obj) } static void -_theme_import_cb_selected(void *data, Evas_Object *obj __UNUSED__) +_theme_import_cb_selected(void *data, Evas_Object *obj EINA_UNUSED) { Import *import; @@ -183,7 +183,7 @@ _theme_import_cb_selected(void *data, Evas_Object *obj __UNUSED__) } static void -_theme_import_cb_changed(void *data, Evas_Object *obj __UNUSED__) +_theme_import_cb_changed(void *data, Evas_Object *obj EINA_UNUSED) { Import *import; const char *path; @@ -224,7 +224,7 @@ _theme_import_cb_changed(void *data, Evas_Object *obj __UNUSED__) } static void -_theme_import_cb_ok(void *data, void *data2 __UNUSED__) +_theme_import_cb_ok(void *data, void *data2 EINA_UNUSED) { Import *import; Evas_Object *win; @@ -284,13 +284,13 @@ _theme_import_cb_ok(void *data, void *data2 __UNUSED__) } static void -_theme_import_cb_close(void *data, void *data2 __UNUSED__) +_theme_import_cb_close(void *data, void *data2 EINA_UNUSED) { evas_object_del(data); } static void -_theme_import_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_theme_import_cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Key_Down *ev; Import *import; diff --git a/src/modules/conf_theme/e_int_config_transitions.c b/src/modules/conf_theme/e_int_config_transitions.c index 7c56a44f85..256726b585 100644 --- a/src/modules/conf_theme/e_int_config_transitions.c +++ b/src/modules/conf_theme/e_int_config_transitions.c @@ -28,7 +28,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_transitions(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_transitions(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -61,7 +61,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -71,7 +71,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_FREE(cfdata->transition_start); E_FREE(cfdata->transition_desk); @@ -80,7 +80,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { return (!cfdata->transition_start && e_config->transition_start) || (cfdata->transition_start && !e_config->transition_start) || @@ -97,7 +97,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *trans = NULL; const char *str; @@ -369,7 +369,7 @@ _trans_preview_trans_set(E_Config_Dialog_Data *cfdata, const char *trans) } static void -_e_wid_done(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_wid_done(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Evas_Object *o; diff --git a/src/modules/conf_theme/e_int_config_wallpaper.c b/src/modules/conf_theme/e_int_config_wallpaper.c index f736d7aa89..467b209635 100644 --- a/src/modules/conf_theme/e_int_config_wallpaper.c +++ b/src/modules/conf_theme/e_int_config_wallpaper.c @@ -52,7 +52,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_wallpaper(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_wallpaper(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { return _e_int_config_wallpaper_desk(NULL, -1, -1, -1, -1); } @@ -131,7 +131,7 @@ _bg_set(E_Config_Dialog_Data *cfdata) } static void -_cb_button_up(void *data1, void *data2 __UNUSED__) +_cb_button_up(void *data1, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -140,7 +140,7 @@ _cb_button_up(void *data1, void *data2 __UNUSED__) } static void -_cb_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_files_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -152,7 +152,7 @@ _cb_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN } static void -_cb_files_selection_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_files_selection_change(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Eina_List *selected; @@ -181,7 +181,7 @@ _cb_files_selection_change(void *data, Evas_Object *obj __UNUSED__, void *event_ } static void -_cb_files_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_files_files_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; const char *p = NULL; @@ -214,7 +214,7 @@ _cb_files_files_changed(void *data, Evas_Object *obj __UNUSED__, void *event_inf } static void -_cb_files_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_files_files_deleted(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Eina_List *sel, *all, *n; @@ -246,7 +246,7 @@ _cb_files_files_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_inf } static void -_cb_theme_wallpaper(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_theme_wallpaper(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; const char *f; @@ -268,7 +268,7 @@ _cb_theme_wallpaper(void *data, Evas_Object *obj __UNUSED__, void *event_info __ } static void -_cb_dir(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_dir(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; char path[PATH_MAX]; @@ -307,7 +307,7 @@ _cb_import_del(void *data) } static void -_cb_import(void *data1, void *data2 __UNUSED__) +_cb_import(void *data1, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -647,7 +647,7 @@ _adv_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data * } static int -_adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_adv_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *fl = NULL, *l; E_Zone *z; diff --git a/src/modules/conf_theme/e_int_config_xsettings.c b/src/modules/conf_theme/e_int_config_xsettings.c index 8ab39606f7..e5cf725cdc 100644 --- a/src/modules/conf_theme/e_int_config_xsettings.c +++ b/src/modules/conf_theme/e_int_config_xsettings.c @@ -44,7 +44,7 @@ static const char *_icon_previews[4] = #define PREVIEW_SIZE (48) E_Config_Dialog * -e_int_config_xsettings(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_xsettings(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -82,7 +82,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->fill_icon_themes_delayed) free(ecore_idler_del(cfdata->fill_icon_themes_delayed)); @@ -94,7 +94,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->match_e17_icon_theme != e_config->xsettings.match_e17_icon_theme) return 1; @@ -443,7 +443,7 @@ _fill_icon_themes(void *data) } static void -_icon_theme_changed(void *data, Evas_Object *o __UNUSED__) +_icon_theme_changed(void *data, Evas_Object *o EINA_UNUSED) { E_Config_Dialog_Data *cfdata; diff --git a/src/modules/conf_theme/e_mod_main.c b/src/modules/conf_theme/e_mod_main.c index d36f20efa3..c638115b8c 100644 --- a/src/modules/conf_theme/e_mod_main.c +++ b/src/modules/conf_theme/e_mod_main.c @@ -14,13 +14,13 @@ EAPI E_Module_Api e_modapi = /* menu item add hook */ static void -_e_mod_run_wallpaper_cb(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +_e_mod_run_wallpaper_cb(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_configure_registry_call("appearance/wallpaper", NULL, NULL); } static void -_e_mod_menu_wallpaper_add(void *data __UNUSED__, E_Menu *m) +_e_mod_menu_wallpaper_add(void *data EINA_UNUSED, E_Menu *m) { E_Menu_Item *mi; @@ -31,13 +31,13 @@ _e_mod_menu_wallpaper_add(void *data __UNUSED__, E_Menu *m) } static void -_e_mod_run_theme_cb(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +_e_mod_run_theme_cb(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_configure_registry_call("appearance/theme", NULL, NULL); } static void -_e_mod_menu_theme_add(void *data __UNUSED__, E_Menu *m) +_e_mod_menu_theme_add(void *data EINA_UNUSED, E_Menu *m) { E_Menu_Item *mi; @@ -98,7 +98,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; diff --git a/src/modules/conf_theme/e_mod_main.h b/src/modules/conf_theme/e_mod_main.h index 4ffd8402a6..f4a3e2fb6e 100644 --- a/src/modules/conf_theme/e_mod_main.h +++ b/src/modules/conf_theme/e_mod_main.h @@ -3,7 +3,7 @@ typedef struct _E_Config_Wallpaper E_Config_Wallpaper; -E_Config_Dialog *e_int_config_xsettings(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_xsettings(Evas_Object *parent, const char *params EINA_UNUSED); /** * @addtogroup Optional_Conf @@ -16,25 +16,25 @@ E_Config_Dialog *e_int_config_xsettings(Evas_Object *parent, const char *params * @} */ -E_Config_Dialog *e_int_config_borders(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_borders(Evas_Object *parent, const char *params EINA_UNUSED); E_Config_Dialog *e_int_config_borders_border(Evas_Object *parent, const char *params); -E_Config_Dialog *e_int_config_color_classes(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_color_classes(Evas_Object *parent, const char *params EINA_UNUSED); -E_Config_Dialog *e_int_config_fonts(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_fonts(Evas_Object *parent, const char *params EINA_UNUSED); -E_Config_Dialog *e_int_config_scale(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_scale(Evas_Object *parent, const char *params EINA_UNUSED); -E_Config_Dialog *e_int_config_theme(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_theme(Evas_Object *parent, const char *params EINA_UNUSED); void e_int_config_theme_import_done(E_Config_Dialog *dia); void e_int_config_theme_update(E_Config_Dialog *dia, char *file); Evas_Object *e_int_config_theme_import(E_Config_Dialog *parent); -E_Config_Dialog *e_int_config_transitions(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_transitions(Evas_Object *parent, const char *params EINA_UNUSED); -E_Config_Dialog *e_int_config_wallpaper(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_wallpaper(Evas_Object *parent, const char *params EINA_UNUSED); E_Config_Dialog *e_int_config_wallpaper_desk(Evas_Object *parent, const char *params); void e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file); diff --git a/src/modules/conf_window_manipulation/e_int_config_clientlist.c b/src/modules/conf_window_manipulation/e_int_config_clientlist.c index 7494c6f4dd..adc3bd5ca2 100644 --- a/src/modules/conf_window_manipulation/e_int_config_clientlist.c +++ b/src/modules/conf_window_manipulation/e_int_config_clientlist.c @@ -20,7 +20,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_clientlist(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_clientlist(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -55,7 +55,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -65,13 +65,13 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_FREE(cfdata); } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { return (e_config->clientlist_group_by != cfdata->group_by) || (e_config->clientlist_include_all_zones != cfdata->include_all_zones) || @@ -86,7 +86,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { e_config->clientlist_group_by = cfdata->group_by; e_config->clientlist_include_all_zones = cfdata->include_all_zones; @@ -103,7 +103,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *otb, *ol, *of, *ow; E_Radio_Group *rg; diff --git a/src/modules/conf_window_manipulation/e_int_config_focus.c b/src/modules/conf_window_manipulation/e_int_config_focus.c index 0a27e61b1d..ceb84f3ed3 100644 --- a/src/modules/conf_window_manipulation/e_int_config_focus.c +++ b/src/modules/conf_window_manipulation/e_int_config_focus.c @@ -36,7 +36,7 @@ struct _E_Config_Dialog_Data /* a nice easy setup function that does the dirty work */ E_Config_Dialog * -e_int_config_focus(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_focus(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -89,7 +89,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { /* Create cfdata - cfdata is a temporary block of config data that this * dialog will be dealing with while configuring. it will be applied to @@ -103,14 +103,14 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { free(cfdata); } /**--APPLY--**/ static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { /* Actually take our cfdata settings and apply them in real life */ e_comp_button_bindings_ungrab_all(); @@ -160,14 +160,14 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { return (e_config->focus_policy != cfdata->mode) || (e_config->use_auto_raise != cfdata->use_auto_raise); } static int -_advanced_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_advanced_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { /* Actually take our cfdata settings and apply them in real life */ e_comp_button_bindings_ungrab_all(); @@ -195,7 +195,7 @@ _advanced_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_advanced_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { return (e_config->focus_policy != cfdata->focus_policy) || (e_config->focus_setting != cfdata->focus_setting) || @@ -216,7 +216,7 @@ _advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *c /**--GUI--**/ static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { /* generate the core widget layout for a basic dialog */ Evas_Object *o, *ob; @@ -239,7 +239,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data } static Evas_Object * -_advanced_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_advanced_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { /* generate the core widget layout for an advanced dialog */ Evas_Object *otb, *ol, *ob, *obp, *of; diff --git a/src/modules/conf_window_manipulation/e_int_config_window_display.c b/src/modules/conf_window_manipulation/e_int_config_window_display.c index 0e3e52d081..a3c49619d0 100644 --- a/src/modules/conf_window_manipulation/e_int_config_window_display.c +++ b/src/modules/conf_window_manipulation/e_int_config_window_display.c @@ -25,7 +25,7 @@ struct _E_Config_Dialog_Data /* a nice easy setup function that does the dirty work */ E_Config_Dialog * -e_int_config_window_display(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_window_display(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -48,7 +48,7 @@ e_int_config_window_display(Evas_Object *parent EINA_UNUSED, const char *params } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -75,13 +75,13 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { free(cfdata); } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { e_config->window_placement_policy = cfdata->window_placement_policy; e_config->window_grouping = cfdata->window_grouping; @@ -101,7 +101,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { return (e_config->window_placement_policy != cfdata->window_placement_policy) || (e_config->window_grouping != cfdata->window_grouping) || @@ -118,7 +118,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *otb, *ol, *of, *ow, *oc; E_Radio_Group *rg; diff --git a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c index 6f63a9fa6a..b30e4f59fc 100644 --- a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c +++ b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c @@ -45,7 +45,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_window_geometry(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_window_geometry(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -68,7 +68,7 @@ e_int_config_window_geometry(Evas_Object *parent EINA_UNUSED, const char *params } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata = E_NEW(E_Config_Dialog_Data, 1); if (!cfdata) return NULL; @@ -102,13 +102,13 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { free(cfdata); } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { e_config->use_resist = cfdata->use_resist; e_config->desk_resist = cfdata->desk_resist; @@ -138,7 +138,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { return ((e_config->use_resist != cfdata->use_resist) || (e_config->desk_resist != cfdata->desk_resist) || @@ -165,7 +165,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *otb, *ol, *of, *ow, *oc; E_Radio_Group *rg; diff --git a/src/modules/conf_window_manipulation/e_int_config_window_process.c b/src/modules/conf_window_manipulation/e_int_config_window_process.c index 373bf19555..2620252cbd 100644 --- a/src/modules/conf_window_manipulation/e_int_config_window_process.c +++ b/src/modules/conf_window_manipulation/e_int_config_window_process.c @@ -19,7 +19,7 @@ struct _E_Config_Dialog_Data /* a nice easy setup function that does the dirty work */ E_Config_Dialog * -e_int_config_window_process(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_window_process(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -43,7 +43,7 @@ e_int_config_window_process(Evas_Object *parent EINA_UNUSED, const char *params } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -58,13 +58,13 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_FREE(cfdata); } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { e_config->kill_if_close_not_possible = cfdata->kill_if_close_not_possible; e_config->kill_process = cfdata->kill_process; @@ -76,7 +76,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { return ((e_config->kill_if_close_not_possible != cfdata->kill_if_close_not_possible) || (e_config->kill_process != cfdata->kill_process) || @@ -86,7 +86,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *ob; diff --git a/src/modules/conf_window_manipulation/e_mod_main.c b/src/modules/conf_window_manipulation/e_mod_main.c index 519c593c58..7376a9166b 100644 --- a/src/modules/conf_window_manipulation/e_mod_main.c +++ b/src/modules/conf_window_manipulation/e_mod_main.c @@ -26,7 +26,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; while ((cfd = e_config_dialog_get("E", "windows/window_process"))) e_object_del(E_OBJECT(cfd)); @@ -45,7 +45,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/conf_window_manipulation/e_mod_main.h b/src/modules/conf_window_manipulation/e_mod_main.h index 273d7a787a..b095af9f9e 100644 --- a/src/modules/conf_window_manipulation/e_mod_main.h +++ b/src/modules/conf_window_manipulation/e_mod_main.h @@ -1,14 +1,14 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -E_Config_Dialog *e_int_config_window_geometry(Evas_Object *parent, const char *params __UNUSED__); -E_Config_Dialog *e_int_config_window_process(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_window_geometry(Evas_Object *parent, const char *params EINA_UNUSED); +E_Config_Dialog *e_int_config_window_process(Evas_Object *parent, const char *params EINA_UNUSED); -E_Config_Dialog *e_int_config_window_display(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_window_display(Evas_Object *parent, const char *params EINA_UNUSED); -E_Config_Dialog *e_int_config_focus(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_focus(Evas_Object *parent, const char *params EINA_UNUSED); -E_Config_Dialog *e_int_config_clientlist(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_clientlist(Evas_Object *parent, const char *params EINA_UNUSED); /** * @addtogroup Optional_Conf diff --git a/src/modules/conf_window_remembers/e_int_config_remembers.c b/src/modules/conf_window_remembers/e_int_config_remembers.c index 8172b86bb4..82e6dc5991 100644 --- a/src/modules/conf_window_remembers/e_int_config_remembers.c +++ b/src/modules/conf_window_remembers/e_int_config_remembers.c @@ -3,11 +3,11 @@ /* function protos */ static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static int _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); +static int _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static void _fill_remembers(E_Config_Dialog_Data *cfdata); -static void _cb_edit(void *data, void *data2 __UNUSED__); +static void _cb_edit(void *data, void *data2 EINA_UNUSED); static void _cb_delete(void *data, void *data2); static void _cb_list_change(void *data, Evas_Object *obj); @@ -21,7 +21,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_remembers(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_remembers(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -78,7 +78,7 @@ _cb_sort(const void *data1, const void *data2) } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -99,7 +99,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { return (cfdata->remember_dialogs != e_config->remember_internal_windows) || (cfdata->remember_fm_wins != e_config->remember_internal_fm_windows) || @@ -107,7 +107,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { e_config->remember_internal_windows = cfdata->remember_dialogs; e_config->remember_internal_fm_windows = cfdata->remember_fm_wins; @@ -294,7 +294,7 @@ _cb_edit_del(void *obj) } static void -_cb_edit(void *data, void *data2 __UNUSED__) +_cb_edit(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; const Eina_List *l; @@ -314,7 +314,7 @@ _cb_edit(void *data, void *data2 __UNUSED__) } static void -_cb_delete(void *data, void *data2 __UNUSED__) +_cb_delete(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; const Eina_List *l = NULL; @@ -348,7 +348,7 @@ _cb_delete(void *data, void *data2 __UNUSED__) } static void -_cb_list_change(void *data, Evas_Object *obj __UNUSED__) +_cb_list_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; E_Remember *rem = NULL; diff --git a/src/modules/conf_window_remembers/e_mod_main.c b/src/modules/conf_window_remembers/e_mod_main.c index c8377cd375..fb2d4e8c5c 100644 --- a/src/modules/conf_window_remembers/e_mod_main.c +++ b/src/modules/conf_window_remembers/e_mod_main.c @@ -24,7 +24,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -38,7 +38,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/conf_window_remembers/e_mod_main.h b/src/modules/conf_window_remembers/e_mod_main.h index cf3db0d809..d8a3191c86 100644 --- a/src/modules/conf_window_remembers/e_mod_main.h +++ b/src/modules/conf_window_remembers/e_mod_main.h @@ -1,7 +1,7 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -E_Config_Dialog *e_int_config_remembers(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_remembers(Evas_Object *parent, const char *params EINA_UNUSED); /** * @addtogroup Optional_Conf * @{ diff --git a/src/modules/connman/agent.c b/src/modules/connman/agent.c index 707bab6f86..dfc75539a0 100644 --- a/src/modules/connman/agent.c +++ b/src/modules/connman/agent.c @@ -103,7 +103,7 @@ _dialog_cancel_cb(void *data, E_Dialog *dialog) } static void -_dialog_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, +_dialog_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event) { Evas_Event_Key_Down *ev = event; @@ -141,7 +141,7 @@ _dialog_del_cb(void *data) } static void -_page_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_page_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { E_Connman_Agent_Input *input; Eina_List *input_list; @@ -155,7 +155,7 @@ _page_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *eve } static void -_show_password_cb(void *data, Evas_Object *obj, void *event __UNUSED__) +_show_password_cb(void *data, Evas_Object *obj, void *event EINA_UNUSED) { Evas_Object *entry = data; int hidden; diff --git a/src/modules/contact/e_edges.c b/src/modules/contact/e_edges.c index 8301db415e..33bdaabc66 100644 --- a/src/modules/contact/e_edges.c +++ b/src/modules/contact/e_edges.c @@ -26,9 +26,9 @@ static Edgehandler *_handler_find(E_Edges_Event event); static Evas_Object *_input_obj(Edgeset *es, int x, int y, int w, int h); static Edgeset *_edgeset_new(E_Zone *zone); static void _edgeset_free(Edgeset *es); -static void _cb_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event); -static void _cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event); -static void _cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event); +static void _cb_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event); +static void _cb_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event); +static void _cb_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event); static Eina_List *edges = NULL; static Eina_List *handlers = NULL; @@ -142,7 +142,7 @@ _edgeset_free(Edgeset *es) } static void -_cb_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_cb_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Edgeset *es = data; Evas_Event_Mouse_Down *ev = event; @@ -154,7 +154,7 @@ _cb_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *even } static void -_cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_cb_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Edgeset *es = data; Evas_Event_Mouse_Up *ev = event; @@ -163,7 +163,7 @@ _cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) } static void -_cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event) +_cb_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event) { Edgeset *es = data; Evas_Event_Mouse_Move *ev = event; diff --git a/src/modules/contact/e_mod_main.c b/src/modules/contact/e_mod_main.c index def007e6c9..90784a8d26 100644 --- a/src/modules/contact/e_mod_main.c +++ b/src/modules/contact/e_mod_main.c @@ -3,7 +3,7 @@ EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Contact" }; static void -_cb_in_left(void *data __UNUSED__, int d __UNUSED__, double v __UNUSED__) +_cb_in_left(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) { // show PREV window in list from urrent focused window on top of current // window but in an inital "off to the right" state in comp @@ -32,14 +32,14 @@ _cb_in_left(void *data __UNUSED__, int d __UNUSED__, double v __UNUSED__) } static void -_cb_in_left_go(void *data __UNUSED__, int d __UNUSED__, double v __UNUSED__) +_cb_in_left_go(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) { // as v > 0 (and heads towards 1.0) flip/slide new window in unbtil v > 1.0 // and once over 1.0 just do transition until end } static void -_cb_in_right(void *data __UNUSED__, int d __UNUSED__, double v __UNUSED__) +_cb_in_right(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) { // show NEXT window in list from urrent focused window on top of current // window but in an inital "off to the right" state in comp @@ -68,27 +68,27 @@ _cb_in_right(void *data __UNUSED__, int d __UNUSED__, double v __UNUSED__) } static void -_cb_in_right_go(void *data __UNUSED__, int d __UNUSED__, double v __UNUSED__) +_cb_in_right_go(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) { // as v > 0 (and heads towards 1.0) flip/slide new window in unbtil v > 1.0 // and once over 1.0 just do transition until end } static void -_cb_in_top(void *data __UNUSED__, int d __UNUSED__, double v __UNUSED__) +_cb_in_top(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) { // show/populate top controls if not already there and start in offscreen // state and beign slide in anim and place controls at final spot } static void -_cb_in_top_go(void *data __UNUSED__, int d __UNUSED__, double v __UNUSED__) +_cb_in_top_go(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) { // for now nothing - but animation would be nice for top controls } static void -_cb_in_bottom(void *data __UNUSED__, int d __UNUSED__, double v __UNUSED__) +_cb_in_bottom(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) { // force kbd activation if no kbd e_policy_kbd_override_set(EINA_TRUE); @@ -96,13 +96,13 @@ _cb_in_bottom(void *data __UNUSED__, int d __UNUSED__, double v __UNUSED__) } static void -_cb_in_bottom_go(void *data __UNUSED__, int d __UNUSED__, double v __UNUSED__) +_cb_in_bottom_go(void *data EINA_UNUSED, int d EINA_UNUSED, double v EINA_UNUSED) { // for now nothing - but slide animation is nice } EAPI void * -e_modapi_init(E_Module *m __UNUSED__) +e_modapi_init(E_Module *m EINA_UNUSED) { e_policy_init(); e_edges_init(); @@ -119,7 +119,7 @@ e_modapi_init(E_Module *m __UNUSED__) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_edges_shutdown(); e_policy_shutdown(); @@ -127,7 +127,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/contact/e_policy.c b/src/modules/contact/e_policy.c index 69ac664bb8..473ade7ed7 100644 --- a/src/modules/contact/e_policy.c +++ b/src/modules/contact/e_policy.c @@ -2,12 +2,12 @@ #include "e_mod_main.h" -static Eina_Bool _cb_event_add(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _cb_event_del(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _cb_event_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _cb_event_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event); -static void _cb_hook_post_fetch(void *data __UNUSED__, E_Client *ec); -static void _cb_hook_post_assign(void *data __UNUSED__, E_Client *ec); +static Eina_Bool _cb_event_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _cb_event_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _cb_event_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _cb_event_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static void _cb_hook_post_fetch(void *data EINA_UNUSED, E_Client *ec); +static void _cb_hook_post_assign(void *data EINA_UNUSED, E_Client *ec); static void _cb_hook_layout(void); static Eina_List *hooks = NULL; @@ -86,7 +86,7 @@ e_policy_client_active_get(void) } static Eina_Bool -_cb_event_add(void *data __UNUSED__, int type __UNUSED__, void *event) +_cb_event_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; E_Client *ec = ev->ec; @@ -97,7 +97,7 @@ _cb_event_add(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_cb_event_del(void *data __UNUSED__, int type __UNUSED__, void *event) +_cb_event_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; E_Client *ec = ev->ec; @@ -108,7 +108,7 @@ _cb_event_del(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_cb_event_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event) +_cb_event_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; E_Client *ec = ev->ec; @@ -118,7 +118,7 @@ _cb_event_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_cb_event_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event) +_cb_event_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; E_Client *ec = ev->ec; @@ -129,7 +129,7 @@ _cb_event_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event) } static void -_cb_hook_post_fetch(void *data __UNUSED__, E_Client *ec) +_cb_hook_post_fetch(void *data EINA_UNUSED, E_Client *ec) { /* NB: for this policy we disable all remembers set on a client */ if (ec->remember) e_remember_del(ec->remember); @@ -141,7 +141,7 @@ _cb_hook_post_fetch(void *data __UNUSED__, E_Client *ec) } static void -_cb_hook_post_assign(void *data __UNUSED__, E_Client *ec) +_cb_hook_post_assign(void *data EINA_UNUSED, E_Client *ec) { ec->internal_no_remember = 1; diff --git a/src/modules/cpufreq/e_mod_config.c b/src/modules/cpufreq/e_mod_config.c index f2731b33dd..fe7df18b66 100644 --- a/src/modules/cpufreq/e_mod_config.c +++ b/src/modules/cpufreq/e_mod_config.c @@ -20,7 +20,7 @@ static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); E_Config_Dialog * -e_int_config_cpufreq_module(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_cpufreq_module(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -58,7 +58,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -68,7 +68,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (!cpufreq_config) return; cpufreq_config->config_dialog = NULL; @@ -76,7 +76,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *ob, *of; E_Radio_Group *rg; @@ -124,7 +124,7 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (!cpufreq_config) return 0; cpufreq_config->poll_interval = cfdata->poll_interval; @@ -148,7 +148,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata EINA_UNUSED) { Eina_Bool ret = EINA_TRUE; return ret; diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c index b7453974d5..2e7fe5caf9 100644 --- a/src/modules/cpufreq/e_mod_main.c +++ b/src/modules/cpufreq/e_mod_main.c @@ -49,7 +49,7 @@ static void _cpufreq_face_update_available(Instance *inst); static void _cpufreq_face_update_current(Instance *inst); static void _cpufreq_face_cb_set_frequency(void *data, Evas_Object *o, const char *emission, const char *source); static void _cpufreq_face_cb_set_governor(void *data, Evas_Object *o, const char *emission, const char *source); -static Eina_Bool _cpufreq_event_cb_powersave(void *data __UNUSED__, int type, void *event); +static Eina_Bool _cpufreq_event_cb_powersave(void *data EINA_UNUSED, int type, void *event); static void _cpufreq_menu_fast(void *data, E_Menu *m, E_Menu_Item *mi); static void _cpufreq_menu_medium(void *data, E_Menu *m, E_Menu_Item *mi); @@ -124,20 +124,20 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { e_gadcon_client_aspect_set(gcc, 16, 16); e_gadcon_client_min_size_set(gcc, 16, 16); } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("Cpufreq"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o; char buf[PATH_MAX]; @@ -150,7 +150,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { static char idbuff[32]; @@ -160,7 +160,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) } static void -_cpufreq_cb_menu_configure(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +_cpufreq_cb_menu_configure(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { if (!cpufreq_config) return; if (cpufreq_config->config_dialog) return; @@ -168,7 +168,7 @@ _cpufreq_cb_menu_configure(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_ } static void -_button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_button_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Instance *inst; Evas_Event_Mouse_Down *ev; @@ -459,7 +459,7 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_ } static void -_menu_cb_post(void *data, E_Menu *m __UNUSED__) +_menu_cb_post(void *data, E_Menu *m EINA_UNUSED) { Instance *inst = data; @@ -592,7 +592,7 @@ _cpufreq_set_pstate(int min, int max, int turbo) } static Eina_Bool -_cpufreq_cb_check(void *data __UNUSED__) +_cpufreq_cb_check(void *data EINA_UNUSED) { Instance *inst; Eina_List *l; @@ -1080,7 +1080,7 @@ _cpufreq_face_update_current(Instance *inst) } static void -_cpufreq_face_cb_set_frequency(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *emission, const char *src __UNUSED__) +_cpufreq_face_cb_set_frequency(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *emission, const char *src EINA_UNUSED) { Eina_List *l; int next_frequency = 0; @@ -1107,7 +1107,7 @@ _cpufreq_face_cb_set_frequency(void *data __UNUSED__, Evas_Object *obj __UNUSED_ } static void -_cpufreq_face_cb_set_governor(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *src __UNUSED__) +_cpufreq_face_cb_set_governor(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *src EINA_UNUSED) { Eina_List *l; char *next_governor = NULL; @@ -1127,7 +1127,7 @@ _cpufreq_face_cb_set_governor(void *data __UNUSED__, Evas_Object *obj __UNUSED__ } static Eina_Bool -_cpufreq_event_cb_powersave(void *data __UNUSED__, int type, void *event) +_cpufreq_event_cb_powersave(void *data EINA_UNUSED, int type, void *event) { E_Event_Powersave_Update *ev; Eina_List *l; @@ -1181,42 +1181,42 @@ _cpufreq_event_cb_powersave(void *data __UNUSED__, int type, void *event) } static void -_cpufreq_menu_fast(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_cpufreq_menu_fast(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { cpufreq_config->poll_interval = 4; _cpufreq_poll_interval_update(); } static void -_cpufreq_menu_medium(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_cpufreq_menu_medium(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { cpufreq_config->poll_interval = 8; _cpufreq_poll_interval_update(); } static void -_cpufreq_menu_normal(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_cpufreq_menu_normal(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { cpufreq_config->poll_interval = 32; _cpufreq_poll_interval_update(); } static void -_cpufreq_menu_slow(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_cpufreq_menu_slow(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { cpufreq_config->poll_interval = 64; _cpufreq_poll_interval_update(); } static void -_cpufreq_menu_very_slow(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_cpufreq_menu_very_slow(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { cpufreq_config->poll_interval = 256; _cpufreq_poll_interval_update(); } static void -_cpufreq_menu_restore_governor(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_cpufreq_menu_restore_governor(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { cpufreq_config->restore_governor = e_menu_item_toggle_get(mi); if ((!cpufreq_config->governor) || @@ -1229,14 +1229,14 @@ _cpufreq_menu_restore_governor(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Me } static void -_cpufreq_menu_auto_powersave(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_cpufreq_menu_auto_powersave(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { cpufreq_config->auto_powersave = e_menu_item_toggle_get(mi); e_config_save_queue(); } static void -_cpufreq_menu_governor(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_cpufreq_menu_governor(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { const char *governor; @@ -1250,7 +1250,7 @@ _cpufreq_menu_governor(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSE } static void -_cpufreq_menu_powersave_governor(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_cpufreq_menu_powersave_governor(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { const char *governor; @@ -1261,7 +1261,7 @@ _cpufreq_menu_powersave_governor(void *data, E_Menu *m __UNUSED__, E_Menu_Item * } static void -_cpufreq_menu_frequency(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_cpufreq_menu_frequency(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { int frequency; @@ -1270,7 +1270,7 @@ _cpufreq_menu_frequency(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUS } static void -_cpufreq_menu_pstate_min(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_cpufreq_menu_pstate_min(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { int min = (long)data; cpufreq_config->pstate_min = min + 1; @@ -1282,7 +1282,7 @@ _cpufreq_menu_pstate_min(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNU } static void -_cpufreq_menu_pstate_max(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_cpufreq_menu_pstate_max(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { int max = (long)data; cpufreq_config->pstate_max = max + 1; @@ -1415,7 +1415,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_configure_registry_item_del("advanced/cpufreq"); e_configure_registry_category_del("advanced"); @@ -1469,7 +1469,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.cpufreq", conf_edd, cpufreq_config); return 1; diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c index 7839bf59df..77ee737c46 100644 --- a/src/modules/everything/e_mod_main.c +++ b/src/modules/everything/e_mod_main.c @@ -148,7 +148,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; const char *t; @@ -229,7 +229,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.everything", conf_edd, evry_conf); @@ -331,7 +331,7 @@ evry_view_unregister(Evry_View *view) /***************************************************************************/ static Eina_Bool -_cleanup_history(void *data __UNUSED__) +_cleanup_history(void *data EINA_UNUSED) { /* evrything is active */ if (evry_hist) @@ -558,7 +558,7 @@ _e_mod_action_cb(E_Object *obj EINA_UNUSED, const char *params) } static void -_e_mod_action_cb_edge(E_Object *obj __UNUSED__, const char *params, E_Event_Zone_Edge *ev) +_e_mod_action_cb_edge(E_Object *obj EINA_UNUSED, const char *params, E_Event_Zone_Edge *ev) { IF_RELEASE(_params); if (params && params[0]) @@ -571,7 +571,7 @@ _e_mod_action_cb_edge(E_Object *obj __UNUSED__, const char *params, E_Event_Zon /* menu item callback(s) */ static void -_e_mod_run_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) +_e_mod_run_cb(void *data EINA_UNUSED, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) { IF_RELEASE(_params); ecore_idle_enterer_add(_e_mod_run_defer_cb, m->zone); @@ -579,7 +579,7 @@ _e_mod_run_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) /* menu item add hook */ static void -_e_mod_menu_add(void *data __UNUSED__, E_Menu *m) +_e_mod_menu_add(void *data EINA_UNUSED, E_Menu *m) { E_Menu_Item *mi; diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c index 9982249418..670d52b3a3 100644 --- a/src/modules/everything/evry.c +++ b/src/modules/everything/evry.c @@ -19,7 +19,7 @@ #define DBG(...) #endif -static Eina_Bool _evry_cb_desklock(Evry_Window *win, int type __UNUSED__, E_Event_Desklock *ev); +static Eina_Bool _evry_cb_desklock(Evry_Window *win, int type EINA_UNUSED, E_Event_Desklock *ev); static void _evry_matches_update(Evry_Selector *sel, int async); static void _evry_plugin_action(Evry_Selector *sel, int finished); static void _evry_plugin_select(Evry_State *s, Evry_Plugin *p); @@ -132,7 +132,7 @@ _evry_aggregator_fetch(Evry_State *s) } static Eina_Bool -_evry_cb_item_changed(__UNUSED__ void *data, __UNUSED__ int type, void *event) +_evry_cb_item_changed(EINA_UNUSED void *data, EINA_UNUSED int type, void *event) { Evry_Event_Item_Changed *ev = event; Evry_Selector *sel; @@ -871,7 +871,7 @@ _evry_cb_drag_finished(E_Drag *drag, int dropped) #endif static Eina_Bool -_evry_cb_desklock(Evry_Window *win, int type __UNUSED__, E_Event_Desklock *ev) +_evry_cb_desklock(Evry_Window *win, int type EINA_UNUSED, E_Event_Desklock *ev) { if (ev->on) evry_hide(win, 0); return ECORE_CALLBACK_RENEW; @@ -987,7 +987,7 @@ _evry_window_free(Evry_Window *win) } static void -_evry_selector_cb_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_evry_selector_cb_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev = event_info; Evry_Selector *sel = data; @@ -1000,7 +1000,7 @@ _evry_selector_cb_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED } static void -_evry_selector_cb_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_evry_selector_cb_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Wheel *ev = event_info; Evry_Selector *sel = data; @@ -1019,7 +1019,7 @@ _evry_selector_cb_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE } static void -_evry_selector_cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_evry_selector_cb_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Up *ev = event_info; Evry_Selector *sel = data; @@ -1211,7 +1211,7 @@ _evry_selector_activate(Evry_Selector *sel, int slide) } static void -_evry_selector_thumb_gen(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_evry_selector_thumb_gen(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Evas_Coord w, h; Evry_Selector *sel = data; @@ -1902,7 +1902,7 @@ _evry_cheat_history(Evry_State *s, int promote, int delete) } static Eina_Bool -_evry_cb_key_down(void *data, int type __UNUSED__, void *event) +_evry_cb_key_down(void *data, int type EINA_UNUSED, void *event) { Ecore_Event_Key *ev = event; Evry_State *s; @@ -2307,7 +2307,7 @@ _evry_clear(Evry_Selector *sel) } static void -_evry_cb_free_action_performed(void *data __UNUSED__, void *event) +_evry_cb_free_action_performed(void *data EINA_UNUSED, void *event) { Evry_Event_Action_Performed *ev = event; @@ -2980,7 +2980,7 @@ _evry_plugin_select(Evry_State *s, Evry_Plugin *p) } static void -_evry_cb_free_plugin_selected(void *data __UNUSED__, void *event) +_evry_cb_free_plugin_selected(void *data EINA_UNUSED, void *event) { Evry_Event_Item_Selected *ev = event; @@ -3041,7 +3041,7 @@ _evry_cb_show(Evry_Window *win, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSE #ifndef HAVE_WAYLAND_ONLY static Eina_Bool -_evry_cb_selection_notify(void *data, int type __UNUSED__, void *event) +_evry_cb_selection_notify(void *data, int type EINA_UNUSED, void *event) { Ecore_X_Event_Selection_Notify *ev; Evry_Window *win = data; diff --git a/src/modules/everything/evry_config.c b/src/modules/everything/evry_config.c index eb5d8a01e7..fb02a40871 100644 --- a/src/modules/everything/evry_config.c +++ b/src/modules/everything/evry_config.c @@ -60,7 +60,7 @@ struct _E_Config_Dialog_Data }; EAPI E_Config_Dialog * -evry_config_dialog(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +evry_config_dialog(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -108,7 +108,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -118,7 +118,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->page[0].configs) eina_list_free(cfdata->page[0].configs); if (cfdata->page[1].configs) eina_list_free(cfdata->page[1].configs); @@ -128,7 +128,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { int i; Plugin_Config *pc; @@ -185,7 +185,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static void -_fill_list(Eina_List *plugins, Evas_Object *obj, int enabled __UNUSED__) +_fill_list(Eina_List *plugins, Evas_Object *obj, int enabled EINA_UNUSED) { Evas *evas; Evas_Coord w; @@ -261,13 +261,13 @@ _plugin_move(Plugin_Page *page, int dir) } static void -_plugin_move_up_cb(void *data, void *data2 __UNUSED__) +_plugin_move_up_cb(void *data, void *data2 EINA_UNUSED) { _plugin_move(data, -1); } static void -_plugin_move_down_cb(void *data, void *data2 __UNUSED__) +_plugin_move_down_cb(void *data, void *data2 EINA_UNUSED) { _plugin_move(data, 1); } @@ -341,7 +341,7 @@ _list_select_cb(void *data, Evas_Object *obj) } static void -_plugin_config_cb(void *data, void *data2 __UNUSED__) +_plugin_config_cb(void *data, void *data2 EINA_UNUSED) { Plugin_Page *page = data; Evry_Plugin *p = page->cur->plugin; @@ -353,7 +353,7 @@ _plugin_config_cb(void *data, void *data2 __UNUSED__) } static Evas_Object * -_create_plugin_page(E_Config_Dialog_Data *cfdata __UNUSED__, Evas *e, Plugin_Page *page) +_create_plugin_page(E_Config_Dialog_Data *cfdata EINA_UNUSED, Evas *e, Plugin_Page *page) { Evas_Object *o, *of, *ob; E_Radio_Group *rg; @@ -679,7 +679,7 @@ _cat_create_data(E_Config_Dialog *cfd) } static void -_cat_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_cat_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->page[0].configs) eina_list_free(cfdata->page[0].configs); @@ -724,7 +724,7 @@ _cat_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_cat_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *e, E_Config_Dialog_Data *cfdata) +_cat_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *e, E_Config_Dialog_Data *cfdata) { Evas_Object *ob, *otb; diff --git a/src/modules/everything/evry_gadget.c b/src/modules/everything/evry_gadget.c index 62bd56c36c..e6981b0b85 100644 --- a/src/modules/everything/evry_gadget.c +++ b/src/modules/everything/evry_gadget.c @@ -28,7 +28,7 @@ struct _Instance /* static void _button_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info); */ static void _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); -static Eina_Bool _cb_focus_out(void *data, int type __UNUSED__, void *event); +static Eina_Bool _cb_focus_out(void *data, int type EINA_UNUSED, void *event); static void _del_func(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); /* gadcon requirements */ @@ -147,7 +147,7 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { Instance *inst; Evas_Coord mw, mh; @@ -164,13 +164,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("Everything Starter"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas __UNUSED__) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas EINA_UNUSED) { Evas_Object *o; char buf[PATH_MAX]; @@ -200,7 +200,7 @@ _conf_item_get(const char *id) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { Gadget_Config *ci = NULL; @@ -222,7 +222,7 @@ _del_func(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e } static void -_cb_menu_configure(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_cb_menu_configure(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { _conf_dialog(data); } @@ -244,7 +244,7 @@ _hide_done(void *data, Evas_Object *obj EINA_UNUSED, const char *s EINA_UNUSED, } static void -_evry_hide_func(Evry_Window *win, int finished __UNUSED__) +_evry_hide_func(Evry_Window *win, int finished EINA_UNUSED) { Instance *inst = win->data; E_Client *ec; @@ -264,7 +264,7 @@ _evry_hide_func(Evry_Window *win, int finished __UNUSED__) } static Eina_Bool -_cb_focus_out(void *data, int type __UNUSED__, void *event) +_cb_focus_out(void *data, int type EINA_UNUSED, void *event) { E_Event_Client *ev; Instance *inst; @@ -426,7 +426,7 @@ _gadget_window_show(Instance *inst) } static void -_button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_button_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Instance *inst; Evas_Event_Mouse_Down *ev; @@ -512,7 +512,7 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_ } /* static void - * _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) + * _button_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) * { * Instance *inst; * Evas_Event_Mouse_Down *ev; @@ -605,7 +605,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static void -_cb_button_settings(void *data __UNUSED__, void *data2 __UNUSED__) +_cb_button_settings(void *data EINA_UNUSED, void *data2 EINA_UNUSED) { /* evry_collection_conf_dialog(NULL, "Start"); */ } @@ -649,7 +649,7 @@ _fill_list(Eina_List *plugins, Evas_Object *obj, E_Config_Dialog_Data *cfdata) #if 0 static void -_list_select_cb(void *data __UNUSED__, Evas_Object *obj) +_list_select_cb(void *data EINA_UNUSED, Evas_Object *obj) { int sel = e_widget_ilist_selected_get(obj); diff --git a/src/modules/everything/evry_history.c b/src/modules/everything/evry_history.c index 40d804d94c..a729f8bc48 100644 --- a/src/modules/everything/evry_history.c +++ b/src/modules/everything/evry_history.c @@ -67,7 +67,7 @@ evry_history_init(void) } static Eina_Bool -_hist_entry_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) +_hist_entry_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED) { History_Entry *he = data; History_Item *hi; @@ -91,7 +91,7 @@ _hist_entry_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__ } static Eina_Bool -_hist_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__) +_hist_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED) { History_Types *ht = data; @@ -107,7 +107,7 @@ _hist_free_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void } static Eina_Bool -_hist_entry_cleanup_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata) +_hist_entry_cleanup_cb(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata) { History_Entry *he = data; Cleanup_Data *d = fdata; @@ -149,7 +149,7 @@ _hist_entry_cleanup_cb(const Eina_Hash *hash __UNUSED__, const void *key, void * } static Eina_Bool -_hist_cleanup_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata) +_hist_cleanup_cb(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata) { History_Types *ht = data; Cleanup_Data *d = fdata; diff --git a/src/modules/everything/evry_plug_aggregator.c b/src/modules/everything/evry_plug_aggregator.c index 3102591f09..2a3c701d03 100644 --- a/src/modules/everything/evry_plug_aggregator.c +++ b/src/modules/everything/evry_plug_aggregator.c @@ -292,7 +292,7 @@ _finish(Evry_Plugin *plugin) } static Evry_Plugin * -_begin(Evry_Plugin *plugin, const Evry_Item *it __UNUSED__) +_begin(Evry_Plugin *plugin, const Evry_Item *it EINA_UNUSED) { Plugin *p; diff --git a/src/modules/everything/evry_plug_apps.c b/src/modules/everything/evry_plug_apps.c index 337b74d728..423a90df2a 100644 --- a/src/modules/everything/evry_plug_apps.c +++ b/src/modules/everything/evry_plug_apps.c @@ -199,7 +199,7 @@ _item_exe_add(Plugin *p, const char *exe, int match) } static Eina_Bool -_hist_exe_get_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata) +_hist_exe_get_cb(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata) { History_Entry *he = data; History_Item *hi; @@ -478,7 +478,7 @@ _desktop_list_get(void) } static Eina_Bool -_hist_items_get_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata) +_hist_items_get_cb(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata) { History_Entry *he = data; History_Item *hi; @@ -806,7 +806,7 @@ _fetch_mime(Evry_Plugin *plugin, const char *input) } static int -_complete(Evry_Plugin *plugin __UNUSED__, const Evry_Item *it, char **input) +_complete(Evry_Plugin *plugin EINA_UNUSED, const Evry_Item *it, char **input) { GET_APP(app, it); @@ -832,7 +832,7 @@ _complete(Evry_Plugin *plugin __UNUSED__, const Evry_Item *it, char **input) /***************************************************************************/ static int -_exec_app_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it __UNUSED__) +_exec_app_check_item(Evry_Action *act EINA_UNUSED, const Evry_Item *it EINA_UNUSED) { return 1; } @@ -873,7 +873,7 @@ _exec_term_action(Evry_Action *act) } static int -_exec_term_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it) +_exec_term_check_item(Evry_Action *act EINA_UNUSED, const Evry_Item *it) { GET_APP(app, it); @@ -905,7 +905,7 @@ _exec_sudo_action(Evry_Action *act) } static int -_edit_app_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it) +_edit_app_check_item(Evry_Action *act EINA_UNUSED, const Evry_Item *it) { GET_APP(app, it); @@ -939,7 +939,7 @@ _edit_app_action(Evry_Action *act) } static int -_new_app_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it) +_new_app_check_item(Evry_Action *act EINA_UNUSED, const Evry_Item *it) { GET_APP(app, it); @@ -1054,7 +1054,7 @@ _open_term_action(Evry_Action *act) } static int -_check_executable(Evry_Action *act __UNUSED__, const Evry_Item *it) +_check_executable(Evry_Action *act EINA_UNUSED, const Evry_Item *it) { GET_FILE(file, it); @@ -1073,7 +1073,7 @@ _run_executable(Evry_Action *act) /***************************************************************************/ static Eina_Bool -_desktop_cache_update(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_desktop_cache_update(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { Efreet_Desktop *d; @@ -1083,7 +1083,7 @@ _desktop_cache_update(void *data __UNUSED__, int type __UNUSED__, void *event __ return EINA_TRUE; } static void -_dir_watcher(void *data __UNUSED__, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path __UNUSED__) +_dir_watcher(void *data EINA_UNUSED, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path EINA_UNUSED) { //printf("exebuf path changed\n"); switch (event) @@ -1285,7 +1285,7 @@ static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dia static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static E_Config_Dialog * -_conf_dialog(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +_conf_dialog(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd = NULL; E_Config_Dialog_View *v = NULL; @@ -1308,7 +1308,7 @@ _conf_dialog(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata = NULL; @@ -1318,7 +1318,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { _conf->cfd = NULL; E_FREE(cfdata); @@ -1359,7 +1359,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { #define CP(_name) \ eina_stringshare_replace(&(_conf->_name), cfdata->_name) @@ -1493,7 +1493,7 @@ evry_plug_apps_save(void) /* taken from e_exebuf.c */ static Eina_Bool -_scan_idler(void *data __UNUSED__) +_scan_idler(void *data EINA_UNUSED) { char *dir; diff --git a/src/modules/everything/evry_plug_calc.c b/src/modules/everything/evry_plug_calc.c index 09e3341283..9fe3f501e8 100644 --- a/src/modules/everything/evry_plug_calc.c +++ b/src/modules/everything/evry_plug_calc.c @@ -27,7 +27,7 @@ static char _module_icon[] = "accessories-calculator"; static Evry_Item *cur_item = NULL; static Evry_Plugin * -_begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__) +_begin(Evry_Plugin *plugin, const Evry_Item *item EINA_UNUSED) { Plugin *p; @@ -104,7 +104,7 @@ _finish(Evry_Plugin *plugin) } static Eina_Bool -_cb_action_performed(__UNUSED__ void *data, __UNUSED__ int type, void *event) +_cb_action_performed(EINA_UNUSED void *data, EINA_UNUSED int type, void *event) { Eina_List *l; Evry_Item *it, *it2, *it_old; @@ -197,7 +197,7 @@ _fetch(Evry_Plugin *plugin, const char *input) } static Eina_Bool -_cb_data(void *data, int type __UNUSED__, void *event) +_cb_data(void *data, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Data *ev = event; Evry_Plugin *p = data; @@ -224,7 +224,7 @@ _cb_data(void *data, int type __UNUSED__, void *event) } static Eina_Bool -_cb_error(void *data, int type __UNUSED__, void *event) +_cb_error(void *data, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Data *ev = event; Evry_Plugin *p = data; @@ -240,7 +240,7 @@ _cb_error(void *data, int type __UNUSED__, void *event) } static Eina_Bool -_cb_del(void *data __UNUSED__, int type __UNUSED__, void *event) +_cb_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Del *e = event; @@ -294,7 +294,7 @@ _plugins_shutdown(void) /***************************************************************************/ Eina_Bool -evry_plug_calc_init(E_Module *m __UNUSED__) +evry_plug_calc_init(E_Module *m EINA_UNUSED) { EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown); diff --git a/src/modules/everything/evry_plug_clipboard.c b/src/modules/everything/evry_plug_clipboard.c index c4c83f7310..6859ffb0c7 100644 --- a/src/modules/everything/evry_plug_clipboard.c +++ b/src/modules/everything/evry_plug_clipboard.c @@ -17,7 +17,7 @@ _action(Evry_Action *action) } static int -_check_item(Evry_Action *action __UNUSED__, const Evry_Item *it) +_check_item(Evry_Action *action EINA_UNUSED, const Evry_Item *it) { return it && it->label && (strlen(it->label) > 0); } diff --git a/src/modules/everything/evry_plug_collection.c b/src/modules/everything/evry_plug_collection.c index fdc6db270b..1386d62ca0 100644 --- a/src/modules/everything/evry_plug_collection.c +++ b/src/modules/everything/evry_plug_collection.c @@ -66,7 +66,7 @@ _add_item(Plugin *p, Plugin_Config *pc) } static Evry_Plugin * -_begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__) +_begin(Evry_Plugin *plugin, const Evry_Item *item EINA_UNUSED) { Plugin_Config *pc; Eina_List *l; @@ -81,7 +81,7 @@ _begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__) } static Evry_Plugin * -_begin_all(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__) +_begin_all(Evry_Plugin *plugin, const Evry_Item *item EINA_UNUSED) { Plugin_Config *pc; Eina_List *l; diff --git a/src/modules/everything/evry_plug_files.c b/src/modules/everything/evry_plug_files.c index 18ffdbaf78..4fec177ded 100644 --- a/src/modules/everything/evry_plug_files.c +++ b/src/modules/everything/evry_plug_files.c @@ -262,7 +262,7 @@ _files_filter(Plugin *p) } static void -_scan_cancel_func(void *data, Ecore_Thread *thread __UNUSED__) +_scan_cancel_func(void *data, Ecore_Thread *thread EINA_UNUSED) { Data *d = data; Plugin *p = d->plugin; @@ -364,7 +364,7 @@ _file_add(Plugin *p, Evry_Item *item) } static void -_scan_end_func(void *data, Ecore_Thread *thread __UNUSED__) +_scan_end_func(void *data, Ecore_Thread *thread EINA_UNUSED) { Data *d = data; Plugin *p = d->plugin; @@ -435,7 +435,7 @@ _scan_end_func(void *data, Ecore_Thread *thread __UNUSED__) } static void -_dir_watcher(void *data, Ecore_File_Monitor *em __UNUSED__, Ecore_File_Event event, const char *path) +_dir_watcher(void *data, Ecore_File_Monitor *em EINA_UNUSED, Ecore_File_Event event, const char *path) { Plugin *p = data; Evry_Item_File *file; @@ -891,7 +891,7 @@ _recentf_end_func(void *data) #endif static Eina_Bool -_recentf_items_add_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata) +_recentf_items_add_cb(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata) { History_Entry *he = data; History_Item *hi = NULL, *hi2; @@ -1104,7 +1104,7 @@ _recentf_fetch(Evry_Plugin *plugin, const char *input) /* actions */ static int -_open_folder_check(Evry_Action *act __UNUSED__, const Evry_Item *it) +_open_folder_check(Evry_Action *act EINA_UNUSED, const Evry_Item *it) { return it->browseable && e_action_find("fileman"); } @@ -1427,7 +1427,7 @@ static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dia static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static E_Config_Dialog * -_conf_dialog(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +_conf_dialog(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd = NULL; E_Config_Dialog_View *v = NULL; @@ -1450,13 +1450,13 @@ _conf_dialog(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) } static void -_clear_cache_cb(void *data __UNUSED__, void *data2 __UNUSED__) +_clear_cache_cb(void *data EINA_UNUSED, void *data2 EINA_UNUSED) { clear_cache = EINA_TRUE; } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o = NULL, *of = NULL, *ow = NULL; @@ -1495,7 +1495,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata = NULL; @@ -1505,7 +1505,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { _conf->cfd = NULL; E_FREE(cfdata); @@ -1524,7 +1524,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { #define C(_name) _conf->_name = cfdata->_name; C(show_homedir); diff --git a/src/modules/everything/evry_plug_settings.c b/src/modules/everything/evry_plug_settings.c index 2b48977c0e..a071b3eb88 100644 --- a/src/modules/everything/evry_plug_settings.c +++ b/src/modules/everything/evry_plug_settings.c @@ -44,7 +44,7 @@ _finish(Evry_Plugin *plugin) } static Evas_Object * -_icon_get(Evry_Item *item, Evas *e __UNUSED__) +_icon_get(Evry_Item *item, Evas *e EINA_UNUSED) { Settings_Item *it = (Settings_Item *)item; @@ -89,7 +89,7 @@ _browse(Evry_Plugin *plugin, const Evry_Item *item) } static Evry_Plugin * -_begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__) +_begin(Evry_Plugin *plugin, const Evry_Item *item EINA_UNUSED) { Plugin *pl; @@ -150,7 +150,7 @@ _fetch(Evry_Plugin *plugin, const char *input) } static int -_action_check(Evry_Action *action __UNUSED__, const Evry_Item *item) +_action_check(Evry_Action *action EINA_UNUSED, const Evry_Item *item) { return !!(((Settings_Item *)item)->eci); } diff --git a/src/modules/everything/evry_plug_text.c b/src/modules/everything/evry_plug_text.c index 5d0f356d9a..b97422dae3 100644 --- a/src/modules/everything/evry_plug_text.c +++ b/src/modules/everything/evry_plug_text.c @@ -10,7 +10,7 @@ struct _Plugin static Evry_Plugin *p1, *p2; static Evry_Plugin * -_begin(Evry_Plugin *plugin, const Evry_Item *it __UNUSED__) +_begin(Evry_Plugin *plugin, const Evry_Item *it EINA_UNUSED) { Plugin *p; diff --git a/src/modules/everything/evry_plug_windows.c b/src/modules/everything/evry_plug_windows.c index 26e70a3cd3..1d5798a56e 100644 --- a/src/modules/everything/evry_plug_windows.c +++ b/src/modules/everything/evry_plug_windows.c @@ -75,7 +75,7 @@ _client_item_add(Plugin *p, E_Client *ec) } static Eina_Bool -_cb_border_remove(void *data, __UNUSED__ int type, void *event) +_cb_border_remove(void *data, EINA_UNUSED int type, void *event) { E_Event_Client *ev = event; Client_Item *bi; @@ -101,7 +101,7 @@ _cb_border_remove(void *data, __UNUSED__ int type, void *event) } static Eina_Bool -_cb_client_add(void *data, __UNUSED__ int type, void *event) +_cb_client_add(void *data, EINA_UNUSED int type, void *event) { E_Event_Client *ev = event; Plugin *p = data; @@ -120,7 +120,7 @@ _cb_client_add(void *data, __UNUSED__ int type, void *event) } static Evry_Plugin * -_begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__) +_begin(Evry_Plugin *plugin, const Evry_Item *item EINA_UNUSED) { Plugin *p; E_Client *ec; @@ -483,7 +483,7 @@ _plugins_shutdown(void) /***************************************************************************/ Eina_Bool -evry_plug_windows_init(E_Module *m __UNUSED__) +evry_plug_windows_init(E_Module *m EINA_UNUSED) { EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown); diff --git a/src/modules/everything/evry_util.c b/src/modules/everything/evry_util.c index a6a189193e..0552b3ae7a 100644 --- a/src/modules/everything/evry_util.c +++ b/src/modules/everything/evry_util.c @@ -893,7 +893,7 @@ evry_file_url_get(Evry_Item_File *file) } static void -_cb_free_item_changed(void *data __UNUSED__, void *event) +_cb_free_item_changed(void *data EINA_UNUSED, void *event) { Evry_Event_Item_Changed *ev = event; diff --git a/src/modules/everything/evry_view.c b/src/modules/everything/evry_view.c index 44edb103fe..dea0446c6e 100644 --- a/src/modules/everything/evry_view.c +++ b/src/modules/everything/evry_view.c @@ -82,7 +82,7 @@ static void _animator_del(Evas_Object *obj); static Eina_Bool _animator(void *data); static void -_cb_thumb_gen(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_thumb_gen(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Evas_Coord w, h; Item *it = data; @@ -105,7 +105,7 @@ _cb_thumb_gen(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED } static void -_cb_preload(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_preload(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Item *it = data; @@ -136,7 +136,7 @@ _check_item(const Evry_Item *it) } static void -_item_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_item_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev = event_info; Item *it = data; @@ -171,7 +171,7 @@ _item_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev } static void -_item_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_item_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Up *ev = event_info; Item *it = data; @@ -605,19 +605,19 @@ _e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h) } static void -_e_smart_show(Evas_Object *obj __UNUSED__){} +_e_smart_show(Evas_Object *obj EINA_UNUSED){} static void -_e_smart_hide(Evas_Object *obj __UNUSED__){} +_e_smart_hide(Evas_Object *obj EINA_UNUSED){} static void -_e_smart_color_set(Evas_Object *obj __UNUSED__, int r __UNUSED__, int g __UNUSED__, int b __UNUSED__, int a __UNUSED__){} +_e_smart_color_set(Evas_Object *obj EINA_UNUSED, int r EINA_UNUSED, int g EINA_UNUSED, int b EINA_UNUSED, int a EINA_UNUSED){} static void -_e_smart_clip_set(Evas_Object *obj __UNUSED__, Evas_Object *clip __UNUSED__){} +_e_smart_clip_set(Evas_Object *obj EINA_UNUSED, Evas_Object *clip EINA_UNUSED){} static void -_e_smart_clip_unset(Evas_Object *obj __UNUSED__){} +_e_smart_clip_unset(Evas_Object *obj EINA_UNUSED){} static Evas_Object * _pan_add(Evas *evas) @@ -1385,7 +1385,7 @@ end: } static Eina_Bool -_cb_item_changed(void *data, int type __UNUSED__, void *event) +_cb_item_changed(void *data, int type EINA_UNUSED, void *event) { Evry_Event_Item_Changed *ev = event; View *v = data; @@ -1429,7 +1429,7 @@ _cb_item_changed(void *data, int type __UNUSED__, void *event) } static Eina_Bool -_cb_action_performed(void *data, int type __UNUSED__, void *event) +_cb_action_performed(void *data, int type EINA_UNUSED, void *event) { Evry_Event_Action_Performed *ev = event; View *v = data; @@ -1457,7 +1457,7 @@ _cb_action_performed(void *data, int type __UNUSED__, void *event) } static void -_view_cb_mouse_wheel(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) +_view_cb_mouse_wheel(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info) { Evas_Event_Mouse_Wheel *ev = event_info; Smart_Data *sd = evas_object_smart_data_get(obj); @@ -1473,7 +1473,7 @@ _view_cb_mouse_wheel(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj // FIXME: 'drag into' make mouse input hang after some trials #if 0 static void -_view_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_view_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev = event_info; Smart_Data *sd = evas_object_smart_data_get(data); @@ -1485,7 +1485,7 @@ _view_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, } static void -_view_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_view_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { /* Evas_Event_Mouse_Up *ev = event_info; */ Smart_Data *sd = evas_object_smart_data_get(data); @@ -1500,7 +1500,7 @@ _view_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v #define SLIDE_RESISTANCE 80 static void -_view_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_view_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev = event_info; Smart_Data *sd = evas_object_smart_data_get(data); @@ -1583,7 +1583,7 @@ end: #endif static void -_cb_list_hide(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_list_hide(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { View *v = data; @@ -1591,7 +1591,7 @@ _cb_list_hide(void *data, Evas_Object *obj __UNUSED__, const char *emission __UN } static void -_cb_list_show(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_list_show(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { View *v = data; diff --git a/src/modules/everything/evry_view_help.c b/src/modules/everything/evry_view_help.c index eb9891582d..daecd3627e 100644 --- a/src/modules/everything/evry_view_help.c +++ b/src/modules/everything/evry_view_help.c @@ -13,7 +13,7 @@ _view_clear(Evry_View *v) } static int -_view_update(Evry_View *v __UNUSED__) +_view_update(Evry_View *v EINA_UNUSED) { return 1; } @@ -58,7 +58,7 @@ _cb_key_down(Evry_View *v, const Ecore_Event_Key *ev) } static Evry_View * -_view_create(Evry_View *v, const Evry_State *s __UNUSED__, Evas_Object *swallow) +_view_create(Evry_View *v, const Evry_State *s EINA_UNUSED, Evas_Object *swallow) { Evas_Object *o; int mw, mh; diff --git a/src/modules/everything/evry_view_tabs.c b/src/modules/everything/evry_view_tabs.c index f149e40f67..8da9ebaa84 100644 --- a/src/modules/everything/evry_view_tabs.c +++ b/src/modules/everything/evry_view_tabs.c @@ -28,13 +28,13 @@ _timer_cb(void *data) } static void -_tab_cb_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_tab_cb_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { /* Evas_Event_Mouse_Down *ev = event_info; */ } static void -_tab_cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_tab_cb_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Up *ev = event_info; Tab *tab = data; @@ -55,7 +55,7 @@ _tab_cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev } static void -_tabs_cb_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_tabs_cb_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Wheel *ev = event_info; Tab_View *v = data; diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index 7498fc4f3b..b9ccdc8e44 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -100,11 +100,11 @@ typedef enum } E_Fwin_Exec_Type; /* local subsystem prototypes */ -static int _e_fwin_cb_dir_handler_test(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *path); -static void _e_fwin_cb_dir_handler(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *path); +static int _e_fwin_cb_dir_handler_test(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *path); +static void _e_fwin_cb_dir_handler(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *path); static void _e_fwin_page_favorites_add(E_Fwin_Page *page); -static void _e_fwin_icon_mouse_out(void *data, Evas_Object *obj __UNUSED__, void *event_info); -static void _e_fwin_icon_mouse_in(void *data, Evas_Object *obj __UNUSED__, void *event_info); +static void _e_fwin_icon_mouse_out(void *data, Evas_Object *obj EINA_UNUSED, void *event_info); +static void _e_fwin_icon_mouse_in(void *data, Evas_Object *obj EINA_UNUSED, void *event_info); static E_Fwin *_e_fwin_open(E_Fwin_Page *page, E_Fm2_Icon_Info *ici, Eina_Bool force, int *need_dia); static E_Fwin *_e_fwin_new(const char *dev, const char *path); static void _e_fwin_free(E_Fwin *fwin); @@ -325,7 +325,7 @@ _e_fwin_spring_cb(E_Fwin *fwin) /* called on the drop source */ static void -_e_fwin_dnd_end_cb(E_Fwin *fwin, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_fwin_dnd_end_cb(E_Fwin *fwin, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { if (fwin->spring_timer) ecore_timer_del(fwin->spring_timer); fwin->spring_timer = NULL; @@ -356,7 +356,7 @@ _e_fwin_dnd_end_cb(E_Fwin *fwin, Evas_Object *obj __UNUSED__, void *event_info _ } static void -_e_fwin_dnd_change_cb(E_Fwin *fwin, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_fwin_dnd_change_cb(E_Fwin *fwin, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { drag_fwin = fwin; if (fwin->spring_timer) @@ -366,7 +366,7 @@ _e_fwin_dnd_change_cb(E_Fwin *fwin, Evas_Object *obj __UNUSED__, void *event_inf } static void -_e_fwin_dnd_enter_cb(E_Fwin *fwin, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_fwin_dnd_enter_cb(E_Fwin *fwin, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { if (drag_fwin == fwin) return; if (fwin->spring_timer) ecore_timer_del(fwin->spring_timer); @@ -385,7 +385,7 @@ _e_fwin_dnd_close_cb(E_Fwin *fwin) } static void -_e_fwin_dnd_leave_cb(E_Fwin *fwin, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_fwin_dnd_leave_cb(E_Fwin *fwin, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { if (fwin->spring_timer) ecore_timer_del(fwin->spring_timer); fwin->spring_timer = NULL; @@ -398,7 +398,7 @@ _e_fwin_dnd_leave_cb(E_Fwin *fwin, Evas_Object *obj __UNUSED__, void *event_info } static void -_e_fwin_dnd_begin_cb(E_Fwin *fwin __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_fwin_dnd_begin_cb(E_Fwin *fwin EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { drag_fwin = NULL; } @@ -640,7 +640,7 @@ e_fwin_zone_find(E_Zone *zone) /* local subsystem functions */ static void -_e_fwin_bg_mouse_down(E_Fwin *fwin, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_e_fwin_bg_mouse_down(E_Fwin *fwin, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { int x, y, w, h, zx, zy, zw, zh, cx, cy, cw, ch; E_Client *ec; @@ -923,7 +923,7 @@ _e_fwin_icon_popup_del(E_Fwin *fwin) } static void -_e_fwin_icon_mouse_out(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_e_fwin_icon_mouse_out(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Fwin *fwin = data; @@ -932,7 +932,7 @@ _e_fwin_icon_mouse_out(void *data, Evas_Object *obj __UNUSED__, void *event_info } static void -_e_fwin_icon_mouse_in(void *data, Evas_Object *obj __UNUSED__, void *event_info) +_e_fwin_icon_mouse_in(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) { E_Fwin *fwin = data; E_Fm2_Icon_Info *ici = event_info; @@ -1673,8 +1673,8 @@ _e_fwin_cb_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, static void _e_fwin_deleted(void *data, - Evas_Object *obj __UNUSED__, - void *event_info __UNUSED__) + Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { E_Fwin_Page *page; @@ -1685,7 +1685,7 @@ _e_fwin_deleted(void *data, static void _e_fwin_changed(void *data, Evas_Object *obj, - void *event_info __UNUSED__) + void *event_info EINA_UNUSED) { E_Fwin *fwin; E_Fwin_Page *page; @@ -1830,8 +1830,8 @@ _e_fwin_changed(void *data, static void _e_fwin_favorite_selected(void *data, - Evas_Object *obj __UNUSED__, - void *event_info __UNUSED__) + Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { E_Fwin_Page *page; Eina_List *selected; @@ -1847,8 +1847,8 @@ _e_fwin_favorite_selected(void *data, static void _e_fwin_selected(void *data, - Evas_Object *obj __UNUSED__, - void *event_info __UNUSED__) + Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { E_Fwin_Page *page; Eina_List *selected; @@ -1863,7 +1863,7 @@ _e_fwin_selected(void *data, static void _e_fwin_selection_change(void *data, Evas_Object *obj, - void *event_info __UNUSED__) + void *event_info EINA_UNUSED) { Eina_List *l; E_Fwin_Page *page; @@ -1879,7 +1879,7 @@ _e_fwin_selection_change(void *data, static void _e_fwin_cb_all_change(void *data, - Evas_Object *obj __UNUSED__) + Evas_Object *obj EINA_UNUSED) { E_Fwin_Apps_Dialog *fad; Efreet_Desktop *desktop = NULL; @@ -1896,8 +1896,8 @@ _e_fwin_cb_all_change(void *data, static void _e_fwin_cb_key_down(void *data, - Evas *e __UNUSED__, - Evas_Object *obj __UNUSED__, + Evas *e EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Key_Down *ev; @@ -1933,9 +1933,9 @@ _e_fwin_cb_key_down(void *data, static void _e_fwin_cb_page_obj_del(void *data, - Evas *evas __UNUSED__, - Evas_Object *obj __UNUSED__, - void *event_info __UNUSED__) + Evas *evas EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { E_Fwin_Page *page; @@ -1956,9 +1956,9 @@ _e_fwin_cb_page_obj_del(void *data, /* fwin zone callbacks */ static void _e_fwin_zone_cb_mouse_down(void *data, - Evas *evas __UNUSED__, - Evas_Object *obj __UNUSED__, - void *event_info __UNUSED__) + Evas *evas EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { E_Fwin *fwin; @@ -1969,7 +1969,7 @@ _e_fwin_zone_cb_mouse_down(void *data, } static Eina_Bool -_e_fwin_zone_move_resize(void *data, int type __UNUSED__, void *event) +_e_fwin_zone_move_resize(void *data, int type EINA_UNUSED, void *event) { E_Event_Zone_Move_Resize *ev = event; E_Fwin *fwin = data; @@ -2005,7 +2005,7 @@ _e_fwin_zone_del(void *data, } static int -_e_fwin_cb_dir_handler_test(void *data __UNUSED__, Evas_Object *obj, const char *path) +_e_fwin_cb_dir_handler_test(void *data EINA_UNUSED, Evas_Object *obj, const char *path) { if (ecore_file_is_dir(path)) return 1; if (e_fm2_real_path_get(obj)) @@ -2017,7 +2017,7 @@ _e_fwin_cb_dir_handler_test(void *data __UNUSED__, Evas_Object *obj, const char } static void -_e_fwin_cb_dir_handler(void *data __UNUSED__, Evas_Object *obj, const char *path) +_e_fwin_cb_dir_handler(void *data EINA_UNUSED, Evas_Object *obj, const char *path) { char buf[PATH_MAX]; Eina_Stringshare *rp; @@ -2036,15 +2036,15 @@ _e_fwin_cb_dir_handler(void *data __UNUSED__, Evas_Object *obj, const char *path static void _e_fwin_parent(void *data, - E_Menu *m __UNUSED__, - E_Menu_Item *mi __UNUSED__) + E_Menu *m EINA_UNUSED, + E_Menu_Item *mi EINA_UNUSED) { e_fm2_parent_go(data); } static void _e_fwin_cb_menu_open_fast(void *data, - E_Menu *m __UNUSED__, + E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Fwin_Page *page; @@ -2100,7 +2100,7 @@ _e_fwin_cb_menu_extend_open_with(void *data, } static void -_e_fwin_path(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fwin_path(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { const char *path; E_Fwin_Page *page; @@ -2118,7 +2118,7 @@ _e_fwin_path(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) } static void -_e_fwin_clone(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_fwin_clone(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Fwin *fwin = data; E_Action *act_fm; @@ -2214,8 +2214,8 @@ _e_fwin_cb_menu_extend_start(void *data, static void _e_fwin_cb_menu_open(void *data, - E_Menu *m __UNUSED__, - E_Menu_Item *mi __UNUSED__) + E_Menu *m EINA_UNUSED, + E_Menu_Item *mi EINA_UNUSED) { E_Fwin_Page *page; Eina_List *selected; @@ -2229,8 +2229,8 @@ _e_fwin_cb_menu_open(void *data, static void _e_fwin_cb_menu_open_with(void *data, - E_Menu *m __UNUSED__, - E_Menu_Item *mi __UNUSED__) + E_Menu *m EINA_UNUSED, + E_Menu_Item *mi EINA_UNUSED) { E_Fwin_Page *page; Eina_List *selected = NULL; @@ -2729,8 +2729,8 @@ _e_fwin_file_open_dialog_preview_set(void *data1, void *data2) static void _e_fwin_file_open_dialog_cb_key_down(void *data, - Evas *e __UNUSED__, - Evas_Object *o __UNUSED__, + Evas *e EINA_UNUSED, + Evas_Object *o EINA_UNUSED, void *event_info) { Evas_Event_Key_Down *ev = event_info; @@ -2771,7 +2771,7 @@ _e_fwin_dlg_cb_desk_list_sort(const void *data1, static void _e_fwin_cb_exec_cmd_changed(void *data, - void *data2 __UNUSED__) + void *data2 EINA_UNUSED) { E_Fwin_Apps_Dialog *fad = NULL; Efreet_Desktop *desktop = NULL; @@ -2793,7 +2793,7 @@ _e_fwin_cb_exec_cmd_changed(void *data, static void _e_fwin_cb_open(void *data, - E_Dialog *dia __UNUSED__) + E_Dialog *dia EINA_UNUSED) { E_Fwin_Apps_Dialog *fad; Efreet_Desktop *desktop = NULL; @@ -2830,7 +2830,7 @@ _e_fwin_cb_open(void *data, static void _e_fwin_cb_close(void *data, - E_Dialog *dia __UNUSED__) + E_Dialog *dia EINA_UNUSED) { E_Fwin_Apps_Dialog *fad; @@ -3093,7 +3093,7 @@ _e_fwin_op_registry_listener_cb(void *data, } static void -_e_fwin_op_registry_free_check(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_e_fwin_op_registry_free_check(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { Ecore_Timer *t; @@ -3121,7 +3121,7 @@ _e_fwin_op_registry_free_data(void *data) static Eina_Bool _e_fwin_op_registry_entry_add_cb(void *data, - __UNUSED__ int type, + EINA_UNUSED int type, void *event) { E_Fm2_Op_Registry_Entry *ere = (E_Fm2_Op_Registry_Entry *)event; @@ -3166,9 +3166,9 @@ _e_fwin_op_registry_entry_iter(E_Fwin_Page *page) static void _e_fwin_op_registry_abort_cb(void *data, - Evas_Object *obj __UNUSED__, - const char *emission __UNUSED__, - const char *source __UNUSED__) + Evas_Object *obj EINA_UNUSED, + const char *emission EINA_UNUSED, + const char *source EINA_UNUSED) { int id; diff --git a/src/modules/fileman/e_fwin_nav.c b/src/modules/fileman/e_fwin_nav.c index c1c59deceb..0c93c6bf3d 100644 --- a/src/modules/fileman/e_fwin_nav.c +++ b/src/modules/fileman/e_fwin_nav.c @@ -52,7 +52,7 @@ static void _cb_favorites_click(void *data, Evas_Object *obj, const static void _cb_changed(void *data, Evas_Object *obj, void *event_info); static void _cb_dir_changed(void *data, Evas_Object *obj, void *event_info); static void _cb_button_click(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _cb_scroll_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); +static void _cb_scroll_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); static void _box_button_append(Instance *inst, const char *label, Edje_Signal_Cb func); static void _box_button_free(Nav_Item *ni); static void _cb_fm_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); @@ -119,7 +119,7 @@ _event_deleted(Nav_Item *ni, int type, void *e) } static void -_cb_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Instance *inst; int w, h; @@ -141,7 +141,7 @@ _cb_initial_dir(void *data) } static void -_box_button_cb_dnd_enter(void *data __UNUSED__, const char *type, void *event) +_box_button_cb_dnd_enter(void *data EINA_UNUSED, const char *type, void *event) { E_Event_Dnd_Enter *ev = event; @@ -150,7 +150,7 @@ _box_button_cb_dnd_enter(void *data __UNUSED__, const char *type, void *event) } static void -_box_button_cb_dnd_leave(void *data, const char *type __UNUSED__, void *event __UNUSED__) +_box_button_cb_dnd_leave(void *data, const char *type EINA_UNUSED, void *event EINA_UNUSED) { Instance *inst = data; @@ -241,7 +241,7 @@ out: } static Eina_Bool -_box_button_cb_dnd_drop(void *data, const char *type __UNUSED__) +_box_button_cb_dnd_drop(void *data, const char *type EINA_UNUSED) { Instance *inst = data; Nav_Item *ni; @@ -266,7 +266,7 @@ _box_button_cb_dnd_drop(void *data, const char *type __UNUSED__) } static void -_gc_moveresize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_gc_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Instance *inst = data; int x, y, w, h; @@ -439,7 +439,7 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc __UNUSED__, E_Gadcon_Orient orient) +_gc_orient(E_Gadcon_Client *gcc EINA_UNUSED, E_Gadcon_Orient orient) { /* Instance *inst; */ @@ -463,19 +463,19 @@ _gc_orient(E_Gadcon_Client *gcc __UNUSED__, E_Gadcon_Orient orient) } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("EFM Navigation"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { return e_util_icon_theme_icon_add("system-file-manager", 48, evas); } static const char * -_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { static char buf[4096]; @@ -486,7 +486,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) /* local functions */ static void -_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) +_cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info) { Instance *inst; Evas_Event_Key_Down *ev; @@ -510,7 +510,7 @@ _cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) } static void -_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Instance *inst; Evas_Event_Mouse_Down *ev; @@ -533,7 +533,7 @@ _cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void } static void -_cb_back_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_back_click(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Instance *inst; @@ -547,7 +547,7 @@ _cb_back_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __U } static void -_cb_forward_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_forward_click(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Instance *inst; @@ -561,7 +561,7 @@ _cb_forward_click(void *data, Evas_Object *obj __UNUSED__, const char *emission } static void -_cb_refresh_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_refresh_click(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Instance *inst = data; @@ -571,7 +571,7 @@ _cb_refresh_click(void *data, Evas_Object *obj __UNUSED__, const char *emission } static void -_cb_up_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_up_click(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Instance *inst; char *p, *t; @@ -596,7 +596,7 @@ _cb_up_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNU } static void -_cb_favorites_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_favorites_click(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Instance *inst; @@ -618,7 +618,7 @@ _cb_fm_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, } static void -_cb_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info) +_cb_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) { Instance *inst; @@ -627,7 +627,7 @@ _cb_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info) } static void -_cb_button_click(void *data, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_button_click(void *data, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Instance *inst = data; Nav_Item *ni; @@ -643,7 +643,7 @@ _cb_button_click(void *data, Evas_Object *obj, const char *emission __UNUSED__, } static void -_cb_scroll_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_scroll_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Instance *inst = data; Evas_Coord mw = 0, mh = 0; @@ -709,7 +709,7 @@ _box_button_append(Instance *inst, const char *label, Edje_Signal_Cb func) } static void -_cb_dir_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_dir_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Instance *inst; const char *real_path; diff --git a/src/modules/fileman/e_int_config_mime.c b/src/modules/fileman/e_int_config_mime.c index 59c6de3102..0fb268b78e 100644 --- a/src/modules/fileman/e_int_config_mime.c +++ b/src/modules/fileman/e_int_config_mime.c @@ -45,7 +45,7 @@ static void _cb_config(void *data, void *data2); Eina_List *types = NULL; E_Config_Dialog * -e_int_config_mime(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_mime(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -117,7 +117,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Config_Type *t; Config_Mime *m; @@ -528,7 +528,7 @@ _find_glob(Config_Mime *mime, char *globing) } static void -_cb_config(void *data, void *data2 __UNUSED__) +_cb_config(void *data, void *data2 EINA_UNUSED) { Eina_List *l; E_Config_Dialog_Data *cfdata; diff --git a/src/modules/fileman/e_int_config_mime_edit.c b/src/modules/fileman/e_int_config_mime_edit.c index a4989d12f2..d409a34cb6 100644 --- a/src/modules/fileman/e_int_config_mime_edit.c +++ b/src/modules/fileman/e_int_config_mime_edit.c @@ -78,7 +78,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_fill_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_fill_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Config_Mime_Icon *mi; @@ -110,7 +110,7 @@ _fill_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->gui.fsel) e_object_del(E_OBJECT(cfdata->gui.fsel)); @@ -185,7 +185,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) } static int -_basic_check(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Config_Mime_Icon *mi; @@ -203,7 +203,7 @@ _basic_check(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *l; E_Config_Mime_Icon *mi; @@ -368,7 +368,7 @@ _get_icon(void *data) } static void -_cb_type(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_type(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -387,7 +387,7 @@ _cb_type(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) } static void -_cb_fsel_sel(void *data, Evas_Object *obj __UNUSED__) +_cb_fsel_sel(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; diff --git a/src/modules/fileman/e_mod_config.c b/src/modules/fileman/e_mod_config.c index 7f31843de2..80a8e4670f 100644 --- a/src/modules/fileman/e_mod_config.c +++ b/src/modules/fileman/e_mod_config.c @@ -107,7 +107,7 @@ static Evas_Object *_basic_create(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); E_Config_Dialog * -e_int_config_fileman(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_fileman(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -182,7 +182,7 @@ _free_data(E_Config_Dialog *cfd, } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { fileman_config->view.mode = cfdata->view.mode; @@ -230,7 +230,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { return @@ -267,7 +267,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, } static void -_dir_sort_first_changed(void *data, Evas_Object *obj __UNUSED__) +_dir_sort_first_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; @@ -276,7 +276,7 @@ _dir_sort_first_changed(void *data, Evas_Object *obj __UNUSED__) } static void -_dir_sort_last_changed(void *data, Evas_Object *obj __UNUSED__) +_dir_sort_last_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; @@ -285,7 +285,7 @@ _dir_sort_last_changed(void *data, Evas_Object *obj __UNUSED__) } static void -_tooltip_changed(void *data, Evas_Object *obj __UNUSED__) +_tooltip_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; @@ -297,7 +297,7 @@ _tooltip_changed(void *data, Evas_Object *obj __UNUSED__) } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { diff --git a/src/modules/fileman/e_mod_dbus.c b/src/modules/fileman/e_mod_dbus.c index e2e70208e4..93a8a7d174 100644 --- a/src/modules/fileman/e_mod_dbus.c +++ b/src/modules/fileman/e_mod_dbus.c @@ -57,7 +57,7 @@ _e_fileman_dbus_daemon_free(E_Fileman_DBus_Daemon *d) } static Eldbus_Message * -_e_fileman_dbus_daemon_open_directory_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_fileman_dbus_daemon_open_directory_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { const char *directory = NULL, *p; @@ -151,7 +151,7 @@ _mime_shell_script_check(const char *mime) } static Eldbus_Message* -_e_fileman_dbus_daemon_open_file_cb(const Eldbus_Service_Interface *iface __UNUSED__, +_e_fileman_dbus_daemon_open_file_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { Eina_List *handlers; diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c index 4c0b821c64..683d087022 100644 --- a/src/modules/fileman/e_mod_main.c +++ b/src/modules/fileman/e_mod_main.c @@ -83,7 +83,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { const Eina_List *l; E_Zone *zone; @@ -143,7 +143,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.fileman", conf_edd, fileman_config); return 1; @@ -185,7 +185,7 @@ _e_mod_action_fileman_cb(E_Object *obj EINA_UNUSED, } void -_e_mod_menu_add(void *data __UNUSED__, E_Menu *m) +_e_mod_menu_add(void *data EINA_UNUSED, E_Menu *m) { e_mod_menu_add(m, NULL); } @@ -317,7 +317,7 @@ _e_mod_fileman_config_free(void) } static Eina_Bool -_e_mod_zone_add(__UNUSED__ void *data, +_e_mod_zone_add(EINA_UNUSED void *data, int type, void *event) { diff --git a/src/modules/fileman/e_mod_main.h b/src/modules/fileman/e_mod_main.h index 648c5a03da..937f48a684 100644 --- a/src/modules/fileman/e_mod_main.h +++ b/src/modules/fileman/e_mod_main.h @@ -110,9 +110,9 @@ Fileman_Path *e_mod_fileman_path_find(E_Zone *zone); E_Menu *e_mod_menu_add(E_Menu *m, const char *path); -E_Config_Dialog *e_int_config_fileman(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_fileman(Evas_Object *parent, const char *params EINA_UNUSED); E_Config_Dialog *e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2); -E_Config_Dialog *e_int_config_mime(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_mime(Evas_Object *parent, const char *params EINA_UNUSED); void e_int_config_mime_edit_done(void *data); void e_fileman_dbus_init(void); diff --git a/src/modules/fileman/e_mod_menu.c b/src/modules/fileman/e_mod_menu.c index 5accb0c13f..1e6274ab9a 100644 --- a/src/modules/fileman/e_mod_menu.c +++ b/src/modules/fileman/e_mod_menu.c @@ -1,7 +1,7 @@ #include "e_mod_main.h" #include "e_fm_device.h" -static void _e_mod_menu_populate(void *d, E_Menu *m __UNUSED__, E_Menu_Item *mi); +static void _e_mod_menu_populate(void *d, E_Menu *m EINA_UNUSED, E_Menu_Item *mi); static E_Menu * _e_mod_menu_top_get(E_Menu *m) @@ -18,7 +18,7 @@ _e_mod_menu_top_get(E_Menu *m) static void _e_mod_menu_gtk_cb(void *data, E_Menu *m, - E_Menu_Item *mi __UNUSED__) + E_Menu_Item *mi EINA_UNUSED) { Evas_Object *fm; @@ -49,7 +49,7 @@ _e_mod_menu_virtual_cb(void *data, static void _e_mod_menu_volume_cb(void *data, E_Menu *m, - E_Menu_Item *mi __UNUSED__) + E_Menu_Item *mi EINA_UNUSED) { E_Volume *vol = data; Evas_Object *fm; @@ -104,7 +104,7 @@ _e_mod_menu_cleanup_cb(void *obj) } static Eina_Bool -_e_mod_menu_populate_filter(void *data __UNUSED__, Eio_File *handler __UNUSED__, const Eina_File_Direct_Info *info) +_e_mod_menu_populate_filter(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, const Eina_File_Direct_Info *info) { struct stat st; /* don't show .dotfiles */ @@ -116,7 +116,7 @@ _e_mod_menu_populate_filter(void *data __UNUSED__, Eio_File *handler __UNUSED__, } static void -_e_mod_menu_populate_item(void *data, Eio_File *handler __UNUSED__, const Eina_File_Direct_Info *info) +_e_mod_menu_populate_item(void *data, Eio_File *handler EINA_UNUSED, const Eina_File_Direct_Info *info) { E_Menu *m = data; E_Menu_Item *mi; @@ -215,7 +215,7 @@ _e_mod_menu_populate_item(void *data, Eio_File *handler __UNUSED__, const Eina_F } static void -_e_mod_menu_populate_err(void *data, Eio_File *handler __UNUSED__, int error __UNUSED__) +_e_mod_menu_populate_err(void *data, Eio_File *handler EINA_UNUSED, int error EINA_UNUSED) { if (!e_object_unref(data)) return; e_menu_thaw(data); @@ -228,7 +228,7 @@ _e_mod_menu_populate_sort(E_Menu_Item *a, E_Menu_Item *b) } static void -_e_mod_menu_populate_done(void *data, Eio_File *handler __UNUSED__) +_e_mod_menu_populate_done(void *data, Eio_File *handler EINA_UNUSED) { E_Menu *m = data; if (!e_object_unref(data)) return; @@ -253,7 +253,7 @@ _e_mod_menu_populate_done(void *data, Eio_File *handler __UNUSED__) } static void -_e_mod_menu_populate(void *d, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_mod_menu_populate(void *d, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Menu *subm; const char *dev, *path, *rp; diff --git a/src/modules/fileman_opinfo/e_mod_main.c b/src/modules/fileman_opinfo/e_mod_main.c index fbebb2203e..ff073ca6af 100644 --- a/src/modules/fileman_opinfo/e_mod_main.c +++ b/src/modules/fileman_opinfo/e_mod_main.c @@ -238,7 +238,7 @@ _opinfo_op_registry_free_data_delayed(void *data) } static void -_opinfo_op_registry_abort_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_opinfo_op_registry_abort_cb(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { int id; @@ -249,7 +249,7 @@ _opinfo_op_registry_abort_cb(void *data, Evas_Object *obj __UNUSED__, const char } static void -_opinfo_op_registry_window_jump_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_opinfo_op_registry_window_jump_cb(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { int id = (long)data; E_Fm2_Op_Registry_Entry *ere; @@ -274,7 +274,7 @@ _opinfo_op_registry_window_jump_cb(void *data, Evas_Object *obj __UNUSED__, cons } static Eina_Bool -_opinfo_op_registry_entry_add_cb(void *data, __UNUSED__ int type, void *event) +_opinfo_op_registry_entry_add_cb(void *data, EINA_UNUSED int type, void *event) { E_Fm2_Op_Registry_Entry *ere = event; Instance *inst = data; @@ -303,7 +303,7 @@ _opinfo_op_registry_entry_add_cb(void *data, __UNUSED__ int type, void *event) } static Eina_Bool -_opinfo_op_registry_entry_del_cb(void *data, __UNUSED__ int type, __UNUSED__ void *event) +_opinfo_op_registry_entry_del_cb(void *data, EINA_UNUSED int type, EINA_UNUSED void *event) { Instance *inst = data; @@ -419,7 +419,7 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { Instance *inst = gcc->data; Evas_Coord mw = 200, mh = 100; @@ -430,13 +430,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("EFM Operation Info"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o; char buf[PATH_MAX]; @@ -450,7 +450,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _gadcon_class.name; } @@ -472,7 +472,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { opinfo_module = NULL; e_gadcon_provider_unregister(&_gadcon_class); @@ -480,7 +480,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/gadman/e_mod_config.c b/src/modules/gadman/e_mod_config.c index 16c3c7ddbd..7a9afbc821 100644 --- a/src/modules/gadman/e_mod_config.c +++ b/src/modules/gadman/e_mod_config.c @@ -36,7 +36,7 @@ static void _cb_fm_sel_change(void *data, Evas_Object *obj, void *event_ static void _cb_button_up(void *data1, void *data2); static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *sel; @@ -57,7 +57,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } E_Config_Dialog * -_config_gadman_module(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +_config_gadman_module(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -112,7 +112,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Man->config_dialog = NULL; E_FREE(cfdata->color); @@ -139,7 +139,7 @@ _cb_config_del(void *data) } static void -_cb_config(void *data, void *data2 __UNUSED__) +_cb_config(void *data, void *data2 EINA_UNUSED) { int x; E_Config_Dialog_Data *cfdata = data; @@ -306,7 +306,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *sel; const char *p = NULL; @@ -353,7 +353,7 @@ _avail_list_cb_change(void *data) //Advanced Callbacks static void -_cb_color_changed(void *data, Evas_Object *o __UNUSED__) +_cb_color_changed(void *data, Evas_Object *o EINA_UNUSED) { E_Config_Dialog_Data *cfdata; cfdata = data; @@ -362,7 +362,7 @@ _cb_color_changed(void *data, Evas_Object *o __UNUSED__) } static void -_cb_fm_radio_change(void *data, Evas_Object *obj __UNUSED__) +_cb_fm_radio_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; char path[PATH_MAX]; @@ -377,7 +377,7 @@ _cb_fm_radio_change(void *data, Evas_Object *obj __UNUSED__) } static void -_cb_fm_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_fm_change(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; const char *p; @@ -410,7 +410,7 @@ _cb_fm_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED } static void -_cb_fm_sel_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_cb_fm_sel_change(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -419,7 +419,7 @@ _cb_fm_sel_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN } static void -_cb_button_up(void *data1, void *data2 __UNUSED__) +_cb_button_up(void *data1, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c index c070b263e9..60ca6ac9ca 100644 --- a/src/modules/gadman/e_mod_gadman.c +++ b/src/modules/gadman/e_mod_gadman.c @@ -5,7 +5,7 @@ static void _attach_menu(void *data, E_Gadcon_Client *gcc, E_Menu *m static void _save_widget_position(E_Gadcon_Client *gcc); static void _apply_widget_position(E_Gadcon_Client *gcc); static E_Gadcon_Client *_gadman_gadget_add(const E_Gadcon_Client_Class *cc, Gadman_Layer_Type layer, E_Config_Gadcon_Client *src_cf); -static Eina_Bool _gadman_module_init_end_cb(void *d __UNUSED__, int type __UNUSED__, void *event __UNUSED__); +static Eina_Bool _gadman_module_init_end_cb(void *d EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED); static Evas_Object *_create_mover(E_Gadcon *gc); static Evas_Object *_get_mover(E_Gadcon_Client *gcc); static E_Gadcon *_gadman_gadcon_new(const char *name, Gadman_Layer_Type layer, E_Zone *zone, E_Gadcon_Location *loc); @@ -18,8 +18,8 @@ static void on_move(void *data, Evas_Object *o, const char *em, cons static void on_frame_click(void *data, Evas *e, Evas_Object *obj, void *event_info); static void on_bg_click(void *data, Evas_Object *o, const char *em, const char *src); -static void on_hide_stop(void *data __UNUSED__, Evas_Object *o __UNUSED__, - const char *em __UNUSED__, const char *src __UNUSED__); +static void on_hide_stop(void *data EINA_UNUSED, Evas_Object *o EINA_UNUSED, + const char *em EINA_UNUSED, const char *src EINA_UNUSED); static void on_menu_style_plain(void *data, E_Menu *m, E_Menu_Item *mi); static void on_menu_style_inset(void *data, E_Menu *m, E_Menu_Item *mi); @@ -30,13 +30,13 @@ static void on_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi); static void on_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi); static void on_menu_add(void *data, E_Menu *m, E_Menu_Item *mi); -static Eina_Bool _gadman_module_cb(void *d __UNUSED__, int type __UNUSED__, E_Event_Module_Update *ev); -static int _e_gadman_client_add(void *data __UNUSED__, E_Gadcon_Client *, const E_Gadcon_Client_Class *cc); -static void _e_gadman_client_remove(void *data __UNUSED__, E_Gadcon_Client *gcc); +static Eina_Bool _gadman_module_cb(void *d EINA_UNUSED, int type EINA_UNUSED, E_Event_Module_Update *ev); +static int _e_gadman_client_add(void *data EINA_UNUSED, E_Gadcon_Client *, const E_Gadcon_Client_Class *cc); +static void _e_gadman_client_remove(void *data EINA_UNUSED, E_Gadcon_Client *gcc); static void _e_gadman_handlers_add(void); static void _e_gadman_handler_del(void); -static Eina_Bool _e_gadman_cb_zone_change(void *data __UNUSED__, int type __UNUSED__, void *event); +static Eina_Bool _e_gadman_cb_zone_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); static E_Gadcon_Client *gadman_gadget_place(E_Gadcon_Client *gcc, const E_Gadcon_Client_Class *cc, E_Config_Gadcon_Client *cf, Gadman_Layer_Type layer, E_Zone *zone); static E_Gadcon *gadman_gadcon_get(const E_Zone *zone, Gadman_Layer_Type layer); @@ -212,7 +212,7 @@ gadman_gadcon_place_job(E_Gadcon_Client *gcc) } static void -_gadman_gadget_free(void *data __UNUSED__, void *obj) +_gadman_gadget_free(void *data EINA_UNUSED, void *obj) { E_Gadcon_Client *gcc = obj; Eina_List *l; @@ -400,7 +400,7 @@ _gadman_gadget_add(const E_Gadcon_Client_Class *cc, Gadman_Layer_Type layer, E_C } static void -gadman_edit(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +gadman_edit(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { _apply_widget_position(data); } @@ -460,7 +460,7 @@ gadman_gadget_edit_start(E_Gadcon_Client *gcc) } void -gadman_gadget_edit_end(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +gadman_gadget_edit_end(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { unsigned int layer; E_Gadcon_Client *drag_gcc = NULL; @@ -1041,7 +1041,7 @@ _apply_widget_position(E_Gadcon_Client *gcc) } static void -_attach_menu(void *data __UNUSED__, E_Gadcon_Client *gcc, E_Menu *menu) +_attach_menu(void *data EINA_UNUSED, E_Gadcon_Client *gcc, E_Menu *menu) { E_Menu *mn; E_Menu_Item *mi; @@ -1144,7 +1144,7 @@ _attach_menu(void *data __UNUSED__, E_Gadcon_Client *gcc, E_Menu *menu) } static void -on_menu_style_plain(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +on_menu_style_plain(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Gadcon_Client *gcc = data; @@ -1157,7 +1157,7 @@ on_menu_style_plain(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__ } static void -on_menu_style_inset(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +on_menu_style_inset(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Gadcon_Client *gcc = data; @@ -1201,31 +1201,31 @@ _menu_style_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) } static void -on_menu_style_float(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +on_menu_style_float(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { _menu_style_orient(data, E_GADCON_ORIENT_FLOAT); } static void -on_menu_style_horiz(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +on_menu_style_horiz(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { _menu_style_orient(data, E_GADCON_ORIENT_HORIZ); } static void -on_menu_style_vert(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +on_menu_style_vert(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { _menu_style_orient(data, E_GADCON_ORIENT_VERT); } static void -on_menu_edit(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +on_menu_edit(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { gadman_gadget_edit_start(data); } static void -on_menu_add(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +on_menu_add(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { if (Man->visible) gadman_gadgets_hide(); @@ -1233,7 +1233,7 @@ on_menu_add(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUS } static void -on_menu_delete(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +on_menu_delete(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Gadcon_Client *gcc = data; e_gadcon_client_config_del(gcc->gadcon->cf, gcc->cf); @@ -1242,7 +1242,7 @@ on_menu_delete(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) } static void -on_frame_click(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +on_frame_click(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; E_Gadcon_Client *gcc; @@ -1270,7 +1270,7 @@ on_frame_click(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void } static void -on_top(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const char *src __UNUSED__) +on_top(void *data, Evas_Object *o EINA_UNUSED, const char *em EINA_UNUSED, const char *src EINA_UNUSED) { static int ox, oy, ow, oh; //Object coord int mx, my; //Mouse coord @@ -1336,7 +1336,7 @@ on_top(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const c } static void -on_right(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const char *src __UNUSED__) +on_right(void *data, Evas_Object *o EINA_UNUSED, const char *em EINA_UNUSED, const char *src EINA_UNUSED) { Evas_Object *mover; static int ox, oy, ow, oh; //Object coord @@ -1390,7 +1390,7 @@ on_right(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const } static void -on_down(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const char *src __UNUSED__) +on_down(void *data, Evas_Object *o EINA_UNUSED, const char *em EINA_UNUSED, const char *src EINA_UNUSED) { Evas_Object *mover; static int ox, oy, ow, oh; //Object coord @@ -1442,7 +1442,7 @@ on_down(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const } static void -on_left(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const char *src __UNUSED__) +on_left(void *data, Evas_Object *o EINA_UNUSED, const char *em EINA_UNUSED, const char *src EINA_UNUSED) { Evas_Object *mover; static int ox, oy, ow, oh; //Object coord @@ -1505,7 +1505,7 @@ on_left(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const } static void -on_move(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const char *src __UNUSED__) +on_move(void *data, Evas_Object *o EINA_UNUSED, const char *em EINA_UNUSED, const char *src EINA_UNUSED) { Evas_Object *mover; static int ox, oy; //Starting object position @@ -1555,13 +1555,13 @@ on_move(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const } static void -on_bg_click(void *data __UNUSED__, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const char *src __UNUSED__) +on_bg_click(void *data EINA_UNUSED, Evas_Object *o EINA_UNUSED, const char *em EINA_UNUSED, const char *src EINA_UNUSED) { gadman_gadgets_hide(); } static void -on_hide_stop(void *data __UNUSED__, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const char *src __UNUSED__) +on_hide_stop(void *data EINA_UNUSED, Evas_Object *o EINA_UNUSED, const char *em EINA_UNUSED, const char *src EINA_UNUSED) { evas_object_hide(Man->overlay); } @@ -1573,7 +1573,7 @@ _e_gadman_client_add(void *data, E_Gadcon_Client *gcc, const E_Gadcon_Client_Cla } static void -_e_gadman_client_remove(void *data __UNUSED__, E_Gadcon_Client *gcc) +_e_gadman_client_remove(void *data EINA_UNUSED, E_Gadcon_Client *gcc) { if (gcc->cf) gcc->gadcon->cf->clients = eina_list_remove(gcc->gadcon->cf->clients, gcc->cf); @@ -1597,7 +1597,7 @@ _e_gadman_handler_del(void) } static Eina_Bool -_gadman_module_init_end_cb(void *d __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_gadman_module_init_end_cb(void *d EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { gadman_locked = EINA_FALSE; gadman_reset(NULL); @@ -1605,7 +1605,7 @@ _gadman_module_init_end_cb(void *d __UNUSED__, int type __UNUSED__, void *event } static Eina_Bool -_gadman_module_cb(void *d __UNUSED__, int type __UNUSED__, E_Event_Module_Update *ev) +_gadman_module_cb(void *d EINA_UNUSED, int type EINA_UNUSED, E_Event_Module_Update *ev) { if (!ev->enabled) { @@ -1626,7 +1626,7 @@ _gadman_module_cb(void *d __UNUSED__, int type __UNUSED__, E_Event_Module_Update } static Eina_Bool -_e_gadman_cb_zone_change(void *data __UNUSED__, int type, void *event) +_e_gadman_cb_zone_change(void *data EINA_UNUSED, int type, void *event) { E_Gadcon *gc; Eina_List *l, *ll; diff --git a/src/modules/gadman/e_mod_gadman.h b/src/modules/gadman/e_mod_gadman.h index ae7aa2d00a..1bac33a747 100644 --- a/src/modules/gadman/e_mod_gadman.h +++ b/src/modules/gadman/e_mod_gadman.h @@ -85,7 +85,7 @@ void gadman_gadgets_toggle(void); void gadman_update_bg(void); Eina_Bool gadman_gadget_add_handler(void *d, int type, E_Event_Gadcon_Client_Add *ev); -E_Config_Dialog *_config_gadman_module(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *_config_gadman_module(Evas_Object *parent, const char *params EINA_UNUSED); /** * @addtogroup Optional_Gadgets diff --git a/src/modules/gadman/e_mod_main.c b/src/modules/gadman/e_mod_main.c index 0a5f9ff13b..49cf55dd2d 100644 --- a/src/modules/gadman/e_mod_main.c +++ b/src/modules/gadman/e_mod_main.c @@ -4,7 +4,7 @@ static void _gadman_maug_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _gadman_maug_add(void *data, E_Menu *m); static void _gadman_action_cb(E_Object *obj, const char *params); -static void _gadman_desktop_menu(void *d __UNUSED__, E_Menu *m, void *icon); +static void _gadman_desktop_menu(void *d EINA_UNUSED, E_Menu *m, void *icon); /* public module routines. all modules must have these */ EAPI E_Module_Api e_modapi = @@ -90,7 +90,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { if (Man->maug) e_int_menus_menu_augmentation_del("config/1", Man->maug); @@ -125,7 +125,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.gadman", Man->conf_edd, Man->conf); return 1; @@ -151,7 +151,7 @@ _cb_config_del(void *data) } static void -_gadman_desktop_menu_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) +_gadman_desktop_menu_cb(void *data EINA_UNUSED, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) { Eina_List *l; E_Gadcon *gc; @@ -171,7 +171,7 @@ _gadman_desktop_menu_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUS } static void -_gadman_desktop_menu(void *d __UNUSED__, E_Menu *m, void *icon) +_gadman_desktop_menu(void *d EINA_UNUSED, E_Menu *m, void *icon) { E_Menu_Item *mi; @@ -189,7 +189,7 @@ _gadman_desktop_menu(void *d __UNUSED__, E_Menu *m, void *icon) } static void -_gadman_maug_cb(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +_gadman_maug_cb(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_configure_registry_call("extensions/gadman", NULL, NULL); } @@ -206,13 +206,13 @@ _gadman_maug_add(void *data, E_Menu *m) } static void -_gadman_action_cb(E_Object *obj __UNUSED__, const char *params __UNUSED__) +_gadman_action_cb(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED) { gadman_gadgets_toggle(); } Eina_Bool -gadman_gadget_add_handler(void *d __UNUSED__, int type __UNUSED__, E_Event_Gadcon_Client_Add *ev) +gadman_gadget_add_handler(void *d EINA_UNUSED, int type EINA_UNUSED, E_Event_Gadcon_Client_Add *ev) { Eina_List *l; if (!Man->waiting) return ECORE_CALLBACK_RENEW; diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c index 437dc6b939..5bc7e0c38f 100644 --- a/src/modules/ibar/e_mod_config.c +++ b/src/modules/ibar/e_mod_config.c @@ -87,7 +87,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (cfdata->dir) eina_stringshare_del(cfdata->dir); if (cfdata->dialog_delete) e_object_del(E_OBJECT(cfdata->dialog_delete)); @@ -96,7 +96,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ol, *ob, *ot; E_Radio_Group *rg; @@ -181,7 +181,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static void -_cb_add(void *data, void *data2 __UNUSED__) +_cb_add(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -192,7 +192,7 @@ _cb_add(void *data, void *data2 __UNUSED__) } static void -_cb_del(void *data, void *data2 __UNUSED__) +_cb_del(void *data, void *data2 EINA_UNUSED) { char buf[4096]; E_Config_Dialog_Data *cfdata; @@ -213,7 +213,7 @@ _cb_del(void *data, void *data2 __UNUSED__) } static void -_cb_config(void *data, void *data2 __UNUSED__) +_cb_config(void *data, void *data2 EINA_UNUSED) { char path[PATH_MAX]; E_Config_Dialog_Data *cfdata; @@ -321,7 +321,7 @@ _load_tlist(E_Config_Dialog_Data *cfdata) } static void -_show_label_cb_change(void *data, Evas_Object *obj __UNUSED__) +_show_label_cb_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index a74d98a485..5346cb8ce6 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -356,13 +356,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("IBar"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o; char buf[PATH_MAX]; @@ -375,7 +375,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { Config_Item *ci; @@ -384,7 +384,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) } static void -_gc_id_del(const E_Gadcon_Client_Class *client_class __UNUSED__, const char *id __UNUSED__) +_gc_id_del(const E_Gadcon_Client_Class *client_class EINA_UNUSED, const char *id EINA_UNUSED) { /* yes - don't do this. on shutdown gadgets are deleted and this means config * for them is deleted - that means empty config is saved. keep them around @@ -451,7 +451,7 @@ _ibar_free(IBar *b) } static void -_ibar_cb_empty_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_ibar_cb_empty_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; IBar *b; @@ -968,7 +968,7 @@ _ibar_icon_signal_emit(IBar_Icon *ic, const char *sig, const char *src) } static void -_ibar_cb_app_change(void *data, E_Order *eo __UNUSED__) +_ibar_cb_app_change(void *data, E_Order *eo EINA_UNUSED) { IBar *b; IBar_Order *io = data; @@ -994,7 +994,7 @@ _ibar_cb_resize_job(void *data) } static void -_ibar_cb_obj_moveresize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_ibar_cb_obj_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Instance *inst = data; @@ -1003,21 +1003,21 @@ _ibar_cb_obj_moveresize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE } static void -_ibar_cb_menu_icon_action_exec(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_ibar_cb_menu_icon_action_exec(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { Efreet_Desktop_Action *action = (Efreet_Desktop_Action*)data; e_exec(NULL, NULL, action->exec, NULL, "ibar"); } static void -_ibar_cb_menu_icon_new(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_ibar_cb_menu_icon_new(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { if (!e_configure_registry_exists("applications/new_application")) return; e_configure_registry_call("applications/new_application", NULL, NULL); } static void -_ibar_cb_menu_icon_add(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_ibar_cb_menu_icon_add(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { char path[PATH_MAX]; IBar *b; @@ -1029,7 +1029,7 @@ _ibar_cb_menu_icon_add(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSE } static void -_ibar_cb_menu_icon_properties(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_ibar_cb_menu_icon_properties(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { IBar_Icon *ic; @@ -1038,7 +1038,7 @@ _ibar_cb_menu_icon_properties(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi } static void -_ibar_cb_menu_icon_stick(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_ibar_cb_menu_icon_stick(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { IBar_Icon *ic = data; @@ -1047,7 +1047,7 @@ _ibar_cb_menu_icon_stick(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNU } static void -_ibar_cb_menu_icon_remove(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_ibar_cb_menu_icon_remove(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { IBar_Icon *ic = data; IBar *i; @@ -1059,7 +1059,7 @@ _ibar_cb_menu_icon_remove(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UN } static void -_ibar_cb_menu_configuration(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_ibar_cb_menu_configuration(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { IBar *b; @@ -1437,7 +1437,7 @@ _ibar_icon_mouse_in_timer(void *data) } static void -_ibar_cb_icon_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_ibar_cb_icon_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { IBar_Icon *ic; @@ -1468,7 +1468,7 @@ _ibar_cb_out_hide_delay(void *data) } static void -_ibar_cb_icon_mouse_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_ibar_cb_icon_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { IBar_Icon *ic; @@ -1499,7 +1499,7 @@ _ibar_cb_icon_menu_cb(void *data) } static void -_ibar_cb_icon_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_ibar_cb_icon_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; IBar_Icon *ic; @@ -1637,7 +1637,7 @@ _ibar_cb_icon_reset(void *data) } static void -_ibar_cb_icon_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_ibar_cb_icon_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Wheel *ev = event_info; E_Exec_Instance *exe; @@ -1783,7 +1783,7 @@ _ibar_icon_go(IBar_Icon *ic, Eina_Bool keep_going) } static void -_ibar_cb_icon_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_ibar_cb_icon_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Up *ev; IBar_Icon *ic; @@ -1802,7 +1802,7 @@ _ibar_cb_icon_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED } static void -_ibar_cb_icon_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_ibar_cb_icon_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev = event_info; IBar_Icon *ic = data; @@ -1849,7 +1849,7 @@ _ibar_cb_icon_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS } static void -_ibar_cb_icon_move(void *data, Evas *e, Evas_Object *obj, void *event_info __UNUSED__) +_ibar_cb_icon_move(void *data, Evas *e, Evas_Object *obj, void *event_info EINA_UNUSED) { IBar_Icon *ic; int x, y, w, h, cw, chx, len = 0; @@ -1881,7 +1881,7 @@ _ibar_cb_icon_move(void *data, Evas *e, Evas_Object *obj, void *event_info __UNU } static void -_ibar_cb_icon_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_ibar_cb_icon_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { IBar_Icon *ic; Evas_Coord w, h; @@ -1892,7 +1892,7 @@ _ibar_cb_icon_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__ } static void -_ibar_cb_drop_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_ibar_cb_drop_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { IBar *b; Evas_Coord x, y; @@ -1903,7 +1903,7 @@ _ibar_cb_drop_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, } static void -_ibar_cb_drop_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_ibar_cb_drop_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { IBar *b; Evas_Coord w, h; @@ -1988,7 +1988,7 @@ _ibar_drop_position_update(Instance *inst, Evas_Coord x, Evas_Coord y) } static void -_ibar_inst_cb_enter(void *data, const char *type __UNUSED__, void *event_info) +_ibar_inst_cb_enter(void *data, const char *type EINA_UNUSED, void *event_info) { E_Event_Dnd_Enter *ev; Instance *inst; @@ -2020,7 +2020,7 @@ _ibar_inst_cb_enter(void *data, const char *type __UNUSED__, void *event_info) } static void -_ibar_inst_cb_move(void *data, const char *type __UNUSED__, void *event_info) +_ibar_inst_cb_move(void *data, const char *type EINA_UNUSED, void *event_info) { E_Event_Dnd_Move *ev; Instance *inst; @@ -2034,7 +2034,7 @@ _ibar_inst_cb_move(void *data, const char *type __UNUSED__, void *event_info) } static void -_ibar_inst_cb_leave(void *data, const char *type __UNUSED__, void *event_info __UNUSED__) +_ibar_inst_cb_leave(void *data, const char *type EINA_UNUSED, void *event_info EINA_UNUSED) { Instance *inst; @@ -2378,7 +2378,7 @@ _ibar_focus_launch(IBar *b) } static Eina_Bool -_ibar_focus_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event) +_ibar_focus_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Key *ev; IBar *b, *b2; @@ -2563,7 +2563,7 @@ _ibar_go_unfocus(void) } static void -_ibar_cb_action_focus(E_Object *obj __UNUSED__, const char *params __UNUSED__, Ecore_Event_Key *ev __UNUSED__) +_ibar_cb_action_focus(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED, Ecore_Event_Key *ev EINA_UNUSED) { _ibar_go_focus(); } @@ -2835,7 +2835,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { Ecore_Event_Handler *eh; Config_Item *ci; @@ -2870,14 +2870,14 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.ibar", conf_edd, ibar_config); return 1; } static Eina_Bool -_ibar_cb_config_icons(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *ev) +_ibar_cb_config_icons(EINA_UNUSED void *data, EINA_UNUSED int ev_type, EINA_UNUSED void *ev) { const Eina_List *l; Instance *inst; diff --git a/src/modules/ibox/e_mod_config.c b/src/modules/ibox/e_mod_config.c index bea58b68fd..97609ee26b 100644 --- a/src/modules/ibox/e_mod_config.c +++ b/src/modules/ibox/e_mod_config.c @@ -83,7 +83,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { E_Radio_Group *rg; Evas_Object *o, *of, *ob; @@ -187,7 +187,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) /****** callbacks **********/ static void -_cb_zone_policy_change(void *data, Evas_Object *obj __UNUSED__) +_cb_zone_policy_change(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c index 56e356d936..603bd2f191 100644 --- a/src/modules/ibox/e_mod_main.c +++ b/src/modules/ibox/e_mod_main.c @@ -268,13 +268,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("IBox"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o; char buf[PATH_MAX]; @@ -297,7 +297,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class) } static void -_gc_id_del(const E_Gadcon_Client_Class *client_class __UNUSED__, const char *id __UNUSED__) +_gc_id_del(const E_Gadcon_Client_Class *client_class EINA_UNUSED, const char *id EINA_UNUSED) { /* yes - don't do this. on shutdown gadgets are deleted and this means config * for them is deleted - that means empty config is saved. keep them around @@ -339,7 +339,7 @@ _ibox_free(IBox *b) } static void -_ibox_cb_empty_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_ibox_cb_empty_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; IBox *b; @@ -666,7 +666,7 @@ _ibox_zone_find(E_Zone *zone) } static void -_ibox_cb_obj_moveresize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_ibox_cb_obj_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Instance *inst; @@ -676,7 +676,7 @@ _ibox_cb_obj_moveresize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE } static void -_ibox_cb_icon_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_ibox_cb_icon_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { IBox_Icon *ic; @@ -690,7 +690,7 @@ _ibox_cb_icon_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED } static void -_ibox_cb_icon_mouse_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_ibox_cb_icon_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { IBox_Icon *ic; @@ -701,7 +701,7 @@ _ibox_cb_icon_mouse_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE } static void -_ibox_cb_icon_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_ibox_cb_icon_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; IBox_Icon *ic; @@ -741,7 +741,7 @@ _ibox_cb_icon_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS } static void -_ibox_cb_icon_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_ibox_cb_icon_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Up *ev; IBox_Icon *ic; @@ -756,7 +756,7 @@ _ibox_cb_icon_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED } static void -_ibox_cb_icon_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_ibox_cb_icon_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev; IBox_Icon *ic; @@ -799,7 +799,7 @@ _ibox_cb_icon_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS } static void -_ibox_cb_icon_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_ibox_cb_icon_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { IBox_Icon *ic; Evas_Coord x, y; @@ -811,7 +811,7 @@ _ibox_cb_icon_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, } static void -_ibox_cb_icon_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_ibox_cb_icon_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { IBox_Icon *ic; Evas_Coord w, h; @@ -833,7 +833,7 @@ _ibox_cb_drag_finished(E_Drag *drag, int dropped) } static void -_ibox_cb_drop_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_ibox_cb_drop_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { IBox *b; Evas_Coord x, y; @@ -844,7 +844,7 @@ _ibox_cb_drop_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, } static void -_ibox_cb_drop_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_ibox_cb_drop_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { IBox *b; Evas_Coord w, h; @@ -904,7 +904,7 @@ _ibox_drop_position_update(Instance *inst, Evas_Coord x, Evas_Coord y) } static void -_ibox_inst_cb_enter(void *data, const char *type __UNUSED__, void *event_info) +_ibox_inst_cb_enter(void *data, const char *type EINA_UNUSED, void *event_info) { E_Event_Dnd_Enter *ev; Instance *inst; @@ -933,7 +933,7 @@ _ibox_inst_cb_enter(void *data, const char *type __UNUSED__, void *event_info) } static void -_ibox_inst_cb_move(void *data, const char *type __UNUSED__, void *event_info) +_ibox_inst_cb_move(void *data, const char *type EINA_UNUSED, void *event_info) { E_Event_Dnd_Move *ev; Instance *inst; @@ -945,7 +945,7 @@ _ibox_inst_cb_move(void *data, const char *type __UNUSED__, void *event_info) } static void -_ibox_inst_cb_leave(void *data, const char *type __UNUSED__, void *event_info __UNUSED__) +_ibox_inst_cb_leave(void *data, const char *type EINA_UNUSED, void *event_info EINA_UNUSED) { Instance *inst; @@ -1026,7 +1026,7 @@ atend: } static Eina_Bool -_ibox_cb_event_client_add(void *data __UNUSED__, int type __UNUSED__, void *event) +_ibox_cb_event_client_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; IBox *b; @@ -1056,7 +1056,7 @@ _ibox_cb_event_client_add(void *data __UNUSED__, int type __UNUSED__, void *even } static Eina_Bool -_ibox_cb_event_client_remove(void *data __UNUSED__, int type __UNUSED__, void *event) +_ibox_cb_event_client_remove(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; IBox *b; @@ -1081,7 +1081,7 @@ _ibox_cb_event_client_remove(void *data __UNUSED__, int type __UNUSED__, void *e } static Eina_Bool -_ibox_cb_event_client_iconify(void *data __UNUSED__, int type __UNUSED__, void *event) +_ibox_cb_event_client_iconify(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; IBox *b; @@ -1117,7 +1117,7 @@ _ibox_cb_event_client_iconify(void *data __UNUSED__, int type __UNUSED__, void * } static Eina_Bool -_ibox_cb_event_client_uniconify(void *data __UNUSED__, int type __UNUSED__, void *event) +_ibox_cb_event_client_uniconify(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; IBox *b; @@ -1150,7 +1150,7 @@ _ibox_cb_event_client_uniconify(void *data __UNUSED__, int type __UNUSED__, void } static Eina_Bool -_ibox_cb_event_client_property(void *data __UNUSED__, int type __UNUSED__, E_Event_Client_Property *ev) +_ibox_cb_event_client_property(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Client_Property *ev) { IBox *b; IBox_Icon *ic; @@ -1185,7 +1185,7 @@ _ibox_cb_event_client_property(void *data __UNUSED__, int type __UNUSED__, E_Eve } static Eina_Bool -_ibox_cb_event_client_zone_set(void *data __UNUSED__, int type __UNUSED__, void *event) +_ibox_cb_event_client_zone_set(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client_Zone_Set *ev; @@ -1198,7 +1198,7 @@ _ibox_cb_event_client_zone_set(void *data __UNUSED__, int type __UNUSED__, void } static Eina_Bool -_ibox_cb_event_desk_show(void *data __UNUSED__, int type __UNUSED__, void *event) +_ibox_cb_event_desk_show(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Desk_Show *ev; IBox *b; @@ -1256,7 +1256,7 @@ _ibox_config_update(Config_Item *ci) } static void -_ibox_cb_menu_configuration(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_ibox_cb_menu_configuration(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { IBox *b; int ok = 1; @@ -1354,7 +1354,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { Config_Item *ci; e_gadcon_provider_unregister(&_gadcon_class); @@ -1380,7 +1380,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.ibox", conf_edd, ibox_config); return 1; diff --git a/src/modules/illume-bluetooth/e_mod_main.c b/src/modules/illume-bluetooth/e_mod_main.c index ad4b80f5e8..f493afe3de 100644 --- a/src/modules/illume-bluetooth/e_mod_main.c +++ b/src/modules/illume-bluetooth/e_mod_main.c @@ -71,7 +71,7 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { Instance *inst; int mw, mh, xw, xh; @@ -89,13 +89,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) } static const char * -_gc_label(const E_Gadcon_Client_Class *cc __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *cc EINA_UNUSED) { return _("Illume Bluetooth"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *cc EINA_UNUSED, Evas *evas) { Evas_Object *o; char buff[PATH_MAX]; @@ -108,7 +108,7 @@ _gc_icon(const E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *cc __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *cc EINA_UNUSED) { static char buff[32]; @@ -184,7 +184,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_gadcon_provider_unregister(&_gc_class); if (_bt_mod_dir) eina_stringshare_del(_bt_mod_dir); @@ -193,7 +193,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/illume-home-toggle/e_mod_main.c b/src/modules/illume-home-toggle/e_mod_main.c index 602d3ffaab..89e9c496ae 100644 --- a/src/modules/illume-home-toggle/e_mod_main.c +++ b/src/modules/illume-home-toggle/e_mod_main.c @@ -40,7 +40,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_gadcon_provider_unregister(&_gc_class); if (mod_dir) eina_stringshare_del(mod_dir); @@ -49,7 +49,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } @@ -88,20 +88,20 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { e_gadcon_client_aspect_set(gcc, 16, 16); e_gadcon_client_min_size_set(gcc, 16, 16); } static const char * -_gc_label(const E_Gadcon_Client_Class *cc __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *cc EINA_UNUSED) { return _("Illume-Home-Toggle"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *cc EINA_UNUSED, Evas *evas) { Evas_Object *o; char buff[PATH_MAX]; @@ -113,7 +113,7 @@ _gc_icon(const E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *cc __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *cc EINA_UNUSED) { static char buff[32]; @@ -123,7 +123,7 @@ _gc_id_new(const E_Gadcon_Client_Class *cc __UNUSED__) } static void -_cb_action_home(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_action_home(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Instance *inst; E_Zone *zone; diff --git a/src/modules/illume-home/e_mod_config.c b/src/modules/illume-home/e_mod_config.c index 73d3fdcb30..2d5ad4796f 100644 --- a/src/modules/illume-home/e_mod_config.c +++ b/src/modules/illume-home/e_mod_config.c @@ -92,7 +92,7 @@ il_home_config_save(void) } void -il_home_config_show(E_Comp *comp, const char *params __UNUSED__) +il_home_config_show(E_Comp *comp, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v = NULL; @@ -115,20 +115,20 @@ il_home_config_show(E_Comp *comp, const char *params __UNUSED__) /* local functions */ static void * -_il_home_config_create(E_Config_Dialog *cfd __UNUSED__) +_il_home_config_create(E_Config_Dialog *cfd EINA_UNUSED) { return NULL; } static void -_il_home_config_free(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__) +_il_home_config_free(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata EINA_UNUSED) { il_home_cfg->cfd = NULL; il_home_win_cfg_update(); } static Evas_Object * -_il_home_config_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata __UNUSED__) +_il_home_config_ui(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata EINA_UNUSED) { Evas_Object *list, *of, *o; E_Radio_Group *rg; @@ -176,7 +176,7 @@ _il_home_config_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_ } static void -_il_home_config_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_il_home_config_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { if (_il_home_config_change_timer) ecore_timer_del(_il_home_config_change_timer); @@ -185,7 +185,7 @@ _il_home_config_changed(void *data, Evas_Object *obj __UNUSED__, void *event __U } static void -_il_home_config_slider_changed(void *data, Evas_Object *obj __UNUSED__) +_il_home_config_slider_changed(void *data, Evas_Object *obj EINA_UNUSED) { if (_il_home_config_change_timer) ecore_timer_del(_il_home_config_change_timer); @@ -202,7 +202,7 @@ _il_home_config_click_changed(void *data, Evas_Object *obj, void *event) } static Eina_Bool -_il_home_config_change_timeout(void *data __UNUSED__) +_il_home_config_change_timeout(void *data EINA_UNUSED) { il_home_win_cfg_update(); e_config_save_queue(); diff --git a/src/modules/illume-home/e_mod_main.c b/src/modules/illume-home/e_mod_main.c index ef9b46a8cd..c04af8d947 100644 --- a/src/modules/illume-home/e_mod_main.c +++ b/src/modules/illume-home/e_mod_main.c @@ -42,20 +42,20 @@ static void _il_home_win_new(E_Zone *zone); static void _il_home_win_cb_free(Il_Home_Win *hwin); static void _il_home_win_cb_resize(E_Win *win); static void _il_home_fmc_set(Evas_Object *obj); -static Eina_Bool _il_home_update_deferred(void *data __UNUSED__); +static Eina_Bool _il_home_update_deferred(void *data EINA_UNUSED); static void _il_home_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y); static void _il_home_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); static void _il_home_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); static void _il_home_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); -static void _il_home_cb_selected(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__); -static Eina_Bool _il_home_desktop_cache_update(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__); -static Eina_Bool _il_home_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _il_home_cb_border_del(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _il_home_cb_exe_del(void *data __UNUSED__, int type __UNUSED__, void *event); +static void _il_home_cb_selected(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED); +static Eina_Bool _il_home_desktop_cache_update(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED); +static Eina_Bool _il_home_cb_border_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _il_home_cb_border_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _il_home_cb_exe_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); static Eina_Bool _il_home_cb_exe_timeout(void *data); -static Eina_Bool _il_home_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _il_home_cb_prop_change(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _il_home_cb_bg_change(void *data __UNUSED__, int type __UNUSED__, void *event); +static Eina_Bool _il_home_cb_client_message(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _il_home_cb_prop_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _il_home_cb_bg_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); /* local variables */ static Eina_List *hwins = NULL; @@ -131,7 +131,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { Ecore_Event_Handler *hdl; Il_Home_Win *hwin; @@ -163,7 +163,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return il_home_config_save(); } @@ -505,7 +505,7 @@ _il_home_fmc_set(Evas_Object *obj) } static Eina_Bool -_il_home_update_deferred(void *data __UNUSED__) +_il_home_update_deferred(void *data EINA_UNUSED) { _il_home_apps_unpopulate(); _il_home_apps_populate(); @@ -538,7 +538,7 @@ _il_home_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) } static void -_il_home_cb_selected(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_il_home_cb_selected(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Il_Home_Win *hwin; Eina_List *selected; @@ -557,7 +557,7 @@ _il_home_cb_selected(void *data, Evas_Object *obj __UNUSED__, void *event __UNUS } static Eina_Bool -_il_home_desktop_cache_update(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_il_home_desktop_cache_update(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { if (defer) ecore_timer_del(defer); defer = ecore_timer_add(0.5, _il_home_update_deferred, NULL); @@ -565,7 +565,7 @@ _il_home_desktop_cache_update(void *data __UNUSED__, int type __UNUSED__, void * } static Eina_Bool -_il_home_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event) +_il_home_cb_border_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; Il_Home_Exec *exe; @@ -603,7 +603,7 @@ _il_home_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_il_home_cb_border_del(void *data __UNUSED__, int type __UNUSED__, void *event) +_il_home_cb_border_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; Il_Home_Exec *exe; @@ -627,7 +627,7 @@ _il_home_cb_border_del(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_il_home_cb_exe_del(void *data __UNUSED__, int type __UNUSED__, void *event) +_il_home_cb_exe_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Il_Home_Exec *exe; Ecore_Exe_Event_Del *ev; @@ -673,7 +673,7 @@ _il_home_cb_exe_timeout(void *data) } static Eina_Bool -_il_home_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event) +_il_home_cb_client_message(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_X_Event_Client_Message *ev; @@ -707,7 +707,7 @@ _il_home_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *eve } static Eina_Bool -_il_home_cb_prop_change(void *data __UNUSED__, int type __UNUSED__, void *event) +_il_home_cb_prop_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_X_Event_Window_Property *ev; Il_Home_Win *hwin; @@ -726,7 +726,7 @@ _il_home_cb_prop_change(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_il_home_cb_bg_change(void *data __UNUSED__, int type, void *event __UNUSED__) +_il_home_cb_bg_change(void *data EINA_UNUSED, int type, void *event EINA_UNUSED) { Il_Home_Win *hwin; Eina_List *l; diff --git a/src/modules/illume-indicator/e_mod_ind_win.c b/src/modules/illume-indicator/e_mod_ind_win.c index 4fda308b45..b74daff1cf 100644 --- a/src/modules/illume-indicator/e_mod_ind_win.c +++ b/src/modules/illume-indicator/e_mod_ind_win.c @@ -5,21 +5,21 @@ /* local function prototypes */ static void _e_mod_ind_win_cb_free(Ind_Win *iwin); -static Eina_Bool _e_mod_ind_win_cb_win_prop(void *data, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_ind_win_cb_zone_resize(void *data, int type __UNUSED__, void *event); +static Eina_Bool _e_mod_ind_win_cb_win_prop(void *data, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_ind_win_cb_zone_resize(void *data, int type EINA_UNUSED, void *event); static void _e_mod_ind_win_cb_resize(E_Win *win); -static void _e_mod_ind_win_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event); -static void _e_mod_ind_win_cb_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event); -static void _e_mod_ind_win_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event); -static void _e_mod_ind_win_cb_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w __UNUSED__, Evas_Coord h); -/* static void _e_mod_ind_win_cb_size_request(void *data __UNUSED__, E_Gadcon *gc __UNUSED__, Evas_Coord w __UNUSED__, Evas_Coord h __UNUSED__); */ -static Evas_Object *_e_mod_ind_win_cb_frame_request(void *data __UNUSED__, E_Gadcon_Client *gcc __UNUSED__, const char *style __UNUSED__); -static void _e_mod_ind_win_cb_menu_items_append(void *data, E_Gadcon_Client *gcc __UNUSED__, E_Menu *mn); +static void _e_mod_ind_win_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event); +static void _e_mod_ind_win_cb_mouse_up(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event); +static void _e_mod_ind_win_cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event); +static void _e_mod_ind_win_cb_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w EINA_UNUSED, Evas_Coord h); +/* static void _e_mod_ind_win_cb_size_request(void *data EINA_UNUSED, E_Gadcon *gc EINA_UNUSED, Evas_Coord w EINA_UNUSED, Evas_Coord h EINA_UNUSED); */ +static Evas_Object *_e_mod_ind_win_cb_frame_request(void *data EINA_UNUSED, E_Gadcon_Client *gcc EINA_UNUSED, const char *style EINA_UNUSED); +static void _e_mod_ind_win_cb_menu_items_append(void *data, E_Gadcon_Client *gcc EINA_UNUSED, E_Menu *mn); static void _e_mod_ind_win_cb_menu_append(Ind_Win *iwin, E_Menu *mn); static void _e_mod_ind_win_cb_menu_pre(void *data, E_Menu *mn); -static void _e_mod_ind_win_cb_menu_post(void *data, E_Menu *mn __UNUSED__); -static void _e_mod_ind_win_cb_menu_contents(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__); -static void _e_mod_ind_win_cb_menu_edit(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__); +static void _e_mod_ind_win_cb_menu_post(void *data, E_Menu *mn EINA_UNUSED); +static void _e_mod_ind_win_cb_menu_contents(void *data, E_Menu *mn EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED); +static void _e_mod_ind_win_cb_menu_edit(void *data, E_Menu *mn EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED); Ind_Win * e_mod_ind_win_new(E_Zone *zone) @@ -186,7 +186,7 @@ _e_mod_ind_win_cb_free(Ind_Win *iwin) } static Eina_Bool -_e_mod_ind_win_cb_win_prop(void *data, int type __UNUSED__, void *event) +_e_mod_ind_win_cb_win_prop(void *data, int type EINA_UNUSED, void *event) { Ind_Win *iwin; Ecore_X_Event_Window_Property *ev; @@ -222,7 +222,7 @@ _e_mod_ind_win_cb_win_prop(void *data, int type __UNUSED__, void *event) } static Eina_Bool -_e_mod_ind_win_cb_zone_resize(void *data, int type __UNUSED__, void *event) +_e_mod_ind_win_cb_zone_resize(void *data, int type EINA_UNUSED, void *event) { Ind_Win *iwin; E_Event_Zone_Move_Resize *ev; @@ -257,7 +257,7 @@ _e_mod_ind_win_cb_resize(E_Win *win) } static void -_e_mod_ind_win_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_e_mod_ind_win_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Ind_Win *iwin; Evas_Event_Mouse_Down *ev; @@ -297,7 +297,7 @@ _e_mod_ind_win_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj } static void -_e_mod_ind_win_cb_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_e_mod_ind_win_cb_mouse_up(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Ind_Win *iwin; Evas_Event_Mouse_Up *ev; @@ -347,7 +347,7 @@ _e_mod_ind_win_cb_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj _ } static void -_e_mod_ind_win_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_e_mod_ind_win_cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Ind_Win *iwin; Evas_Event_Mouse_Move *ev; @@ -424,7 +424,7 @@ _e_mod_ind_win_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj } static void -_e_mod_ind_win_cb_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w __UNUSED__, Evas_Coord h) +_e_mod_ind_win_cb_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w EINA_UNUSED, Evas_Coord h) { Ind_Win *iwin; @@ -435,19 +435,19 @@ _e_mod_ind_win_cb_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w __UNUS } /* static void */ -/* _e_mod_ind_win_cb_size_request(void *data __UNUSED__, E_Gadcon *gc __UNUSED__, Evas_Coord w __UNUSED__, Evas_Coord h __UNUSED__) */ +/* _e_mod_ind_win_cb_size_request(void *data EINA_UNUSED, E_Gadcon *gc EINA_UNUSED, Evas_Coord w EINA_UNUSED, Evas_Coord h EINA_UNUSED) */ /* { */ /* return; */ /* } */ static Evas_Object * -_e_mod_ind_win_cb_frame_request(void *data __UNUSED__, E_Gadcon_Client *gcc __UNUSED__, const char *style __UNUSED__) +_e_mod_ind_win_cb_frame_request(void *data EINA_UNUSED, E_Gadcon_Client *gcc EINA_UNUSED, const char *style EINA_UNUSED) { return NULL; } static void -_e_mod_ind_win_cb_menu_items_append(void *data, E_Gadcon_Client *gcc __UNUSED__, E_Menu *mn) +_e_mod_ind_win_cb_menu_items_append(void *data, E_Gadcon_Client *gcc EINA_UNUSED, E_Menu *mn) { Ind_Win *iwin; @@ -499,7 +499,7 @@ _e_mod_ind_win_cb_menu_pre(void *data, E_Menu *mn) } static void -_e_mod_ind_win_cb_menu_post(void *data, E_Menu *mn __UNUSED__) +_e_mod_ind_win_cb_menu_post(void *data, E_Menu *mn EINA_UNUSED) { Ind_Win *iwin; @@ -510,7 +510,7 @@ _e_mod_ind_win_cb_menu_post(void *data, E_Menu *mn __UNUSED__) } static void -_e_mod_ind_win_cb_menu_contents(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_mod_ind_win_cb_menu_contents(void *data, E_Menu *mn EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { Ind_Win *iwin; @@ -525,7 +525,7 @@ _e_mod_ind_win_cb_menu_contents(void *data, E_Menu *mn __UNUSED__, E_Menu_Item * } static void -_e_mod_ind_win_cb_menu_edit(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_mod_ind_win_cb_menu_edit(void *data, E_Menu *mn EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { Ind_Win *iwin; diff --git a/src/modules/illume-indicator/e_mod_main.c b/src/modules/illume-indicator/e_mod_main.c index 15ee34aeb1..1de11eb948 100644 --- a/src/modules/illume-indicator/e_mod_main.c +++ b/src/modules/illume-indicator/e_mod_main.c @@ -72,7 +72,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { Ind_Win *iwin; @@ -99,7 +99,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return il_ind_config_save(); } diff --git a/src/modules/illume-kbd-toggle/e_mod_main.c b/src/modules/illume-kbd-toggle/e_mod_main.c index eafb8f43f6..d8cb43885e 100644 --- a/src/modules/illume-kbd-toggle/e_mod_main.c +++ b/src/modules/illume-kbd-toggle/e_mod_main.c @@ -18,9 +18,9 @@ static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *cc, Evas *evas); static const char *_gc_id_new(const E_Gadcon_Client_Class *cc); static void _cb_action_vkbd_enable(void *data, Evas_Object *obj, const char *emission, const char *source); static void _cb_action_vkbd_disable(void *data, Evas_Object *obj, const char *emission, const char *source); -static Eina_Bool _cb_border_focus_in(void *data, int type __UNUSED__, void *event); -static Eina_Bool _cb_border_remove(void *data, int type __UNUSED__, void *event); -static Eina_Bool _cb_border_property(void *data, int type __UNUSED__, void *event); +static Eina_Bool _cb_border_focus_in(void *data, int type EINA_UNUSED, void *event); +static Eina_Bool _cb_border_remove(void *data, int type EINA_UNUSED, void *event); +static Eina_Bool _cb_border_property(void *data, int type EINA_UNUSED, void *event); static void _set_btn_icon(Evas_Object *obj, Ecore_X_Virtual_Keyboard_State state); /* local variables */ @@ -47,7 +47,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_gadcon_provider_unregister(&_gc_class); if (mod_dir) eina_stringshare_del(mod_dir); @@ -56,7 +56,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } @@ -113,20 +113,20 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { e_gadcon_client_aspect_set(gcc, 16, 16); e_gadcon_client_min_size_set(gcc, 16, 16); } static const char * -_gc_label(const E_Gadcon_Client_Class *cc __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *cc EINA_UNUSED) { return _("Illume-Keyboard-Toggle"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *cc EINA_UNUSED, Evas *evas) { Evas_Object *o; char buff[PATH_MAX]; @@ -138,7 +138,7 @@ _gc_icon(const E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *cc __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *cc EINA_UNUSED) { static char buff[32]; @@ -148,7 +148,7 @@ _gc_id_new(const E_Gadcon_Client_Class *cc __UNUSED__) } static void -_cb_action_vkbd_enable(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_action_vkbd_enable(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Instance *inst; E_Client *ec; @@ -163,7 +163,7 @@ _cb_action_vkbd_enable(void *data, Evas_Object *obj __UNUSED__, const char *emis } static void -_cb_action_vkbd_disable(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_action_vkbd_disable(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Instance *inst; E_Client *ec; @@ -178,7 +178,7 @@ _cb_action_vkbd_disable(void *data, Evas_Object *obj __UNUSED__, const char *emi } static Eina_Bool -_cb_border_focus_in(void *data, int type __UNUSED__, void *event) +_cb_border_focus_in(void *data, int type EINA_UNUSED, void *event) { Instance *inst; E_Event_Client *ev; @@ -194,7 +194,7 @@ _cb_border_focus_in(void *data, int type __UNUSED__, void *event) } static Eina_Bool -_cb_border_remove(void *data, int type __UNUSED__, void *event __UNUSED__) +_cb_border_remove(void *data, int type EINA_UNUSED, void *event EINA_UNUSED) { Instance *inst; @@ -204,7 +204,7 @@ _cb_border_remove(void *data, int type __UNUSED__, void *event __UNUSED__) } static Eina_Bool -_cb_border_property(void *data, int type __UNUSED__, void *event) +_cb_border_property(void *data, int type EINA_UNUSED, void *event) { Instance *inst; Ecore_X_Event_Window_Property *ev; diff --git a/src/modules/illume-keyboard/e_kbd_buf.c b/src/modules/illume-keyboard/e_kbd_buf.c index 55cd1e661b..e94f1e4f2d 100644 --- a/src/modules/illume-keyboard/e_kbd_buf.c +++ b/src/modules/illume-keyboard/e_kbd_buf.c @@ -57,7 +57,7 @@ _e_kbd_buf_actual_string_clear(E_Kbd_Buf *kb) } static E_Kbd_Buf_Key * -_e_kbd_buf_at_coord_get(E_Kbd_Buf *kb __UNUSED__, E_Kbd_Buf_Layout *kbl, int x, int y) +_e_kbd_buf_at_coord_get(E_Kbd_Buf *kb EINA_UNUSED, E_Kbd_Buf_Layout *kbl, int x, int y) { Eina_List *l; @@ -77,7 +77,7 @@ _e_kbd_buf_at_coord_get(E_Kbd_Buf *kb __UNUSED__, E_Kbd_Buf_Layout *kbl, int x, } static E_Kbd_Buf_Key * -_e_kbd_buf_closest_get(E_Kbd_Buf *kb __UNUSED__, E_Kbd_Buf_Layout *kbl, int x, int y) +_e_kbd_buf_closest_get(E_Kbd_Buf *kb EINA_UNUSED, E_Kbd_Buf_Layout *kbl, int x, int y) { Eina_List *l; E_Kbd_Buf_Key *ky_closest = NULL; @@ -105,7 +105,7 @@ _e_kbd_buf_closest_get(E_Kbd_Buf *kb __UNUSED__, E_Kbd_Buf_Layout *kbl, int x, i } static const char * -_e_kbd_buf_keystroke_key_string_get(E_Kbd_Buf *kb __UNUSED__, E_Kbd_Buf_Keystroke *ks, E_Kbd_Buf_Key *ky) +_e_kbd_buf_keystroke_key_string_get(E_Kbd_Buf *kb EINA_UNUSED, E_Kbd_Buf_Keystroke *ks, E_Kbd_Buf_Key *ky) { const char *str = NULL; @@ -228,7 +228,7 @@ _e_kbd_buf_cb_data_dict_reload(void *data) } static void -_e_kbd_buf_cb_data_dict_change(void *data, Ecore_File_Monitor *em __UNUSED__, Ecore_File_Event event __UNUSED__, const char *path __UNUSED__) +_e_kbd_buf_cb_data_dict_change(void *data, Ecore_File_Monitor *em EINA_UNUSED, Ecore_File_Event event EINA_UNUSED, const char *path EINA_UNUSED) { E_Kbd_Buf *kb; diff --git a/src/modules/illume-keyboard/e_kbd_dict.c b/src/modules/illume-keyboard/e_kbd_dict.c index 645fba37da..c56c2a135a 100644 --- a/src/modules/illume-keyboard/e_kbd_dict.c +++ b/src/modules/illume-keyboard/e_kbd_dict.c @@ -167,7 +167,7 @@ _e_kbd_dict_line_next(E_Kbd_Dict *kd, const char *p) } static char * -_e_kbd_dict_line_parse(E_Kbd_Dict *kd __UNUSED__, const char *p, int *usage) +_e_kbd_dict_line_parse(E_Kbd_Dict *kd EINA_UNUSED, const char *p, int *usage) { const char *ps; char *wd = NULL; @@ -187,7 +187,7 @@ _e_kbd_dict_line_parse(E_Kbd_Dict *kd __UNUSED__, const char *p, int *usage) } static void -_e_kbd_dict_lookup_build_line(E_Kbd_Dict *kd __UNUSED__, const char *p, const char *eol, int *glyphs) +_e_kbd_dict_lookup_build_line(E_Kbd_Dict *kd EINA_UNUSED, const char *p, const char *eol, int *glyphs) { char *s; int p2; diff --git a/src/modules/illume-keyboard/e_kbd_int.c b/src/modules/illume-keyboard/e_kbd_int.c index 91466c6db8..54ef3f6e7f 100644 --- a/src/modules/illume-keyboard/e_kbd_int.c +++ b/src/modules/illume-keyboard/e_kbd_int.c @@ -225,7 +225,7 @@ _e_kbd_int_buf_send(E_Kbd_Int *ki) } static void -_e_kbd_int_cb_match_select(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_kbd_int_cb_match_select(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Kbd_Int_Match *km; @@ -687,7 +687,7 @@ _e_kbd_int_cb_hold_timeout(void *data) } static void -_e_kbd_int_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_kbd_int_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; E_Kbd_Int *ki; @@ -731,7 +731,7 @@ _e_kbd_int_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __U } static void -_e_kbd_int_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_kbd_int_cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev; E_Kbd_Int *ki; @@ -777,7 +777,7 @@ _e_kbd_int_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __U } static void -_e_kbd_int_cb_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_e_kbd_int_cb_mouse_up(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Up *ev; E_Kbd_Int *ki; @@ -1345,7 +1345,7 @@ _e_kbd_int_layout_next(E_Kbd_Int *ki) } static Eina_Bool -_e_kbd_int_cb_client_message(void *data, __UNUSED__ int type, void *event) +_e_kbd_int_cb_client_message(void *data, EINA_UNUSED int type, void *event) { Ecore_X_Event_Client_Message *ev; E_Kbd_Int *ki; @@ -1653,7 +1653,7 @@ _e_kbd_int_matchlist_up(E_Kbd_Int *ki) } static void -_e_kbd_int_cb_matches(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_kbd_int_cb_matches(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Kbd_Int *ki; @@ -1670,7 +1670,7 @@ _e_kbd_int_cb_matches(void *data, Evas_Object *obj __UNUSED__, const char *emiss } static void -_e_kbd_int_cb_dicts(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_kbd_int_cb_dicts(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Kbd_Int *ki; @@ -1680,7 +1680,7 @@ _e_kbd_int_cb_dicts(void *data, Evas_Object *obj __UNUSED__, const char *emissio } static void -_e_kbd_int_cb_layouts(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_kbd_int_cb_layouts(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Kbd_Int *ki; @@ -1853,7 +1853,7 @@ _theme_obj_new(Evas *e, const char *custom_dir, const char *group) } static Eina_Bool -_e_kbd_int_cb_border_move(void *data, int type __UNUSED__, void *event) +_e_kbd_int_cb_border_move(void *data, int type EINA_UNUSED, void *event) { E_Event_Client *ev; E_Kbd_Int *ki; diff --git a/src/modules/illume-keyboard/e_mod_config.c b/src/modules/illume-keyboard/e_mod_config.c index 0eb987258c..34d5305871 100644 --- a/src/modules/illume-keyboard/e_mod_config.c +++ b/src/modules/illume-keyboard/e_mod_config.c @@ -110,7 +110,7 @@ il_kbd_config_save(void) } EAPI void -il_kbd_config_show(E_Comp *comp, const char *params __UNUSED__) +il_kbd_config_show(E_Comp *comp, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -133,19 +133,19 @@ il_kbd_config_show(E_Comp *comp, const char *params __UNUSED__) /* local function prototypes */ static void * -_il_kbd_config_create(E_Config_Dialog *cfd __UNUSED__) +_il_kbd_config_create(E_Config_Dialog *cfd EINA_UNUSED) { return NULL; } static void -_il_kbd_config_free(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__) +_il_kbd_config_free(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata EINA_UNUSED) { il_kbd_cfg->cfd = NULL; } static Evas_Object * -_il_kbd_config_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata __UNUSED__) +_il_kbd_config_ui(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata EINA_UNUSED) { Evas_Object *list, *of, *ow, *sl, *ol; E_Radio_Group *rg; @@ -256,7 +256,7 @@ _il_kbd_config_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_D } static void -_il_kbd_config_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_il_kbd_config_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { if (_il_kbd_config_change_timer) ecore_timer_del(_il_kbd_config_change_timer); @@ -265,7 +265,7 @@ _il_kbd_config_changed(void *data, Evas_Object *obj __UNUSED__, void *event __UN } static Eina_Bool -_il_kbd_config_change_timeout(void *data __UNUSED__) +_il_kbd_config_change_timeout(void *data EINA_UNUSED) { Eina_List *l; diff --git a/src/modules/illume-keyboard/e_mod_main.c b/src/modules/illume-keyboard/e_mod_main.c index 221b223014..727b5bc2e3 100644 --- a/src/modules/illume-keyboard/e_mod_main.c +++ b/src/modules/illume-keyboard/e_mod_main.c @@ -25,7 +25,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { _il_kbd_stop(); il_kbd_config_shutdown(); @@ -33,7 +33,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return il_kbd_config_save(); } @@ -116,7 +116,7 @@ _il_kbd_start(void) } static Eina_Bool -_il_kbd_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event) +_il_kbd_cb_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Exe_Event_Del *ev; diff --git a/src/modules/illume-mode-toggle/e_mod_main.c b/src/modules/illume-mode-toggle/e_mod_main.c index 575a435491..42d7c17146 100644 --- a/src/modules/illume-mode-toggle/e_mod_main.c +++ b/src/modules/illume-mode-toggle/e_mod_main.c @@ -16,10 +16,10 @@ static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); static const char *_gc_label(const E_Gadcon_Client_Class *cc); static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *cc, Evas *evas); static const char *_gc_id_new(const E_Gadcon_Client_Class *cc); -static void _cb_action_mode_single(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__); -static void _cb_action_mode_dual_top(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__); -static void _cb_action_mode_dual_left(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__); -static Eina_Bool _cb_event_client_message(void *data, int type __UNUSED__, void *event); +static void _cb_action_mode_single(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); +static void _cb_action_mode_dual_top(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); +static void _cb_action_mode_dual_left(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); +static Eina_Bool _cb_event_client_message(void *data, int type EINA_UNUSED, void *event); static void _set_icon(Instance *inst); static void _mode_set(Instance *inst, Ecore_X_Illume_Mode mode); @@ -47,7 +47,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_gadcon_provider_unregister(&_gc_class); if (mod_dir) eina_stringshare_del(mod_dir); @@ -56,7 +56,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } @@ -106,20 +106,20 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { e_gadcon_client_aspect_set(gcc, 16, 16); e_gadcon_client_min_size_set(gcc, 16, 16); } static const char * -_gc_label(const E_Gadcon_Client_Class *cc __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *cc EINA_UNUSED) { return _("Illume-Mode-Toggle"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *cc EINA_UNUSED, Evas *evas) { Evas_Object *o; char buff[PATH_MAX]; @@ -131,7 +131,7 @@ _gc_icon(const E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *cc __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *cc EINA_UNUSED) { static char buff[32]; @@ -141,25 +141,25 @@ _gc_id_new(const E_Gadcon_Client_Class *cc __UNUSED__) } static void -_cb_action_mode_single(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_action_mode_single(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { _mode_set(data, ECORE_X_ILLUME_MODE_SINGLE); } static void -_cb_action_mode_dual_top(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_action_mode_dual_top(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { _mode_set(data, ECORE_X_ILLUME_MODE_DUAL_TOP); } static void -_cb_action_mode_dual_left(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_action_mode_dual_left(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { _mode_set(data, ECORE_X_ILLUME_MODE_DUAL_LEFT); } static Eina_Bool -_cb_event_client_message(void *data, int type __UNUSED__, void *event) +_cb_event_client_message(void *data, int type EINA_UNUSED, void *event) { Ecore_X_Event_Client_Message *ev; Instance *inst; diff --git a/src/modules/illume-softkey/e_mod_main.c b/src/modules/illume-softkey/e_mod_main.c index 801343a383..fd31097dc3 100644 --- a/src/modules/illume-softkey/e_mod_main.c +++ b/src/modules/illume-softkey/e_mod_main.c @@ -52,7 +52,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { Sft_Win *swin; @@ -75,7 +75,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return il_sft_config_save(); } diff --git a/src/modules/illume-softkey/e_mod_sft_win.c b/src/modules/illume-softkey/e_mod_sft_win.c index e85a6ace31..f86f9246e7 100644 --- a/src/modules/illume-softkey/e_mod_sft_win.c +++ b/src/modules/illume-softkey/e_mod_sft_win.c @@ -5,15 +5,15 @@ /* local function prototypes */ static void _e_mod_sft_win_cb_free(Sft_Win *swin); -static Eina_Bool _e_mod_sft_win_cb_win_prop(void *data, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_sft_win_cb_zone_resize(void *data, int type __UNUSED__, void *event); +static Eina_Bool _e_mod_sft_win_cb_win_prop(void *data, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_sft_win_cb_zone_resize(void *data, int type EINA_UNUSED, void *event); static void _e_mod_sft_win_cb_resize(E_Win *win); static void _e_mod_sft_win_create_default_buttons(Sft_Win *swin); static void _e_mod_sft_win_create_extra_buttons(Sft_Win *swin); -static void _e_mod_sft_win_cb_close(void *data, void *data2 __UNUSED__); -static void _e_mod_sft_win_cb_back(void *data, void *data2 __UNUSED__); -static void _e_mod_sft_win_cb_forward(void *data, void *data2 __UNUSED__); -static void _e_mod_sft_win_cb_win_pos(void *data, void *data2 __UNUSED__); +static void _e_mod_sft_win_cb_close(void *data, void *data2 EINA_UNUSED); +static void _e_mod_sft_win_cb_back(void *data, void *data2 EINA_UNUSED); +static void _e_mod_sft_win_cb_forward(void *data, void *data2 EINA_UNUSED); +static void _e_mod_sft_win_cb_win_pos(void *data, void *data2 EINA_UNUSED); static void _e_mod_sft_win_pos_toggle_top(Sft_Win *swin); static void _e_mod_sft_win_pos_toggle_left(Sft_Win *swin); static E_Client *_e_mod_sft_win_border_get(E_Zone *zone, int x, int y); @@ -171,7 +171,7 @@ _e_mod_sft_win_cb_free(Sft_Win *swin) } static Eina_Bool -_e_mod_sft_win_cb_win_prop(void *data, int type __UNUSED__, void *event) +_e_mod_sft_win_cb_win_prop(void *data, int type EINA_UNUSED, void *event) { Sft_Win *swin; Ecore_X_Event_Window_Property *ev; @@ -203,7 +203,7 @@ _e_mod_sft_win_cb_win_prop(void *data, int type __UNUSED__, void *event) } static Eina_Bool -_e_mod_sft_win_cb_zone_resize(void *data, int type __UNUSED__, void *event) +_e_mod_sft_win_cb_zone_resize(void *data, int type EINA_UNUSED, void *event) { Sft_Win *swin; E_Event_Zone_Move_Resize *ev; @@ -342,7 +342,7 @@ _e_mod_sft_win_create_extra_buttons(Sft_Win *swin) } static void -_e_mod_sft_win_cb_close(void *data, void *data2 __UNUSED__) +_e_mod_sft_win_cb_close(void *data, void *data2 EINA_UNUSED) { Sft_Win *swin; @@ -351,7 +351,7 @@ _e_mod_sft_win_cb_close(void *data, void *data2 __UNUSED__) } static void -_e_mod_sft_win_cb_back(void *data, void *data2 __UNUSED__) +_e_mod_sft_win_cb_back(void *data, void *data2 EINA_UNUSED) { Sft_Win *swin; @@ -360,7 +360,7 @@ _e_mod_sft_win_cb_back(void *data, void *data2 __UNUSED__) } static void -_e_mod_sft_win_cb_forward(void *data, void *data2 __UNUSED__) +_e_mod_sft_win_cb_forward(void *data, void *data2 EINA_UNUSED) { Sft_Win *swin; @@ -369,7 +369,7 @@ _e_mod_sft_win_cb_forward(void *data, void *data2 __UNUSED__) } static void -_e_mod_sft_win_cb_win_pos(void *data, void *data2 __UNUSED__) +_e_mod_sft_win_cb_win_pos(void *data, void *data2 EINA_UNUSED) { Sft_Win *swin; Ecore_X_Illume_Mode mode; diff --git a/src/modules/illume2/e_mod_config_animation.c b/src/modules/illume2/e_mod_config_animation.c index 1432d9007f..5bd13bb055 100644 --- a/src/modules/illume2/e_mod_config_animation.c +++ b/src/modules/illume2/e_mod_config_animation.c @@ -11,7 +11,7 @@ static Eina_Bool _e_mod_illume_config_animation_timeout(void *data); Ecore_Timer *_anim_change_timer = NULL; void -e_mod_illume_config_animation_show(E_Comp *comp, const char *params __UNUSED__) +e_mod_illume_config_animation_show(E_Comp *comp, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -37,20 +37,20 @@ e_mod_illume_config_animation_show(E_Comp *comp, const char *params __UNUSED__) /* local function prototypes */ static void * -_e_mod_illume_config_animation_create(E_Config_Dialog *cfd __UNUSED__) +_e_mod_illume_config_animation_create(E_Config_Dialog *cfd EINA_UNUSED) { return NULL; } static void -_e_mod_illume_config_animation_free(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__) +_e_mod_illume_config_animation_free(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata EINA_UNUSED) { if (_anim_change_timer) ecore_timer_del(_anim_change_timer); _anim_change_timer = NULL; } static Evas_Object * -_e_mod_illume_config_animation_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata __UNUSED__) +_e_mod_illume_config_animation_ui(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata EINA_UNUSED) { Evas_Object *list, *of, *ow; E_Radio_Group *rg; @@ -120,7 +120,7 @@ _e_mod_illume_config_animation_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E } static void -_e_mod_illume_config_animation_change(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_e_mod_illume_config_animation_change(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { if (_anim_change_timer) ecore_timer_del(_anim_change_timer); _anim_change_timer = @@ -128,7 +128,7 @@ _e_mod_illume_config_animation_change(void *data, Evas_Object *obj __UNUSED__, v } static Eina_Bool -_e_mod_illume_config_animation_timeout(void *data __UNUSED__) +_e_mod_illume_config_animation_timeout(void *data EINA_UNUSED) { e_config_save_queue(); _anim_change_timer = NULL; diff --git a/src/modules/illume2/e_mod_config_policy.c b/src/modules/illume2/e_mod_config_policy.c index 8d27de5a26..4bbdfbb438 100644 --- a/src/modules/illume2/e_mod_config_policy.c +++ b/src/modules/illume2/e_mod_config_policy.c @@ -14,7 +14,7 @@ Ecore_Timer *_policy_change_timer = NULL; const char *_policy_name = NULL; void -e_mod_illume_config_policy_show(E_Comp *comp, const char *params __UNUSED__) +e_mod_illume_config_policy_show(E_Comp *comp, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -37,20 +37,20 @@ e_mod_illume_config_policy_show(E_Comp *comp, const char *params __UNUSED__) /* local functions */ static void * -_e_mod_illume_config_policy_create(E_Config_Dialog *cfd __UNUSED__) +_e_mod_illume_config_policy_create(E_Config_Dialog *cfd EINA_UNUSED) { return NULL; } static void -_e_mod_illume_config_policy_free(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__) +_e_mod_illume_config_policy_free(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata EINA_UNUSED) { if (_policy_change_timer) ecore_timer_del(_policy_change_timer); _policy_change_timer = NULL; } static Evas_Object * -_e_mod_illume_config_policy_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata __UNUSED__) +_e_mod_illume_config_policy_ui(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata EINA_UNUSED) { Evas_Object *list, *ow; Eina_List *policies; @@ -107,7 +107,7 @@ _e_mod_illume_config_policy_list_changed(void *data) } static Eina_Bool -_e_mod_illume_config_policy_change_timeout(void *data __UNUSED__) +_e_mod_illume_config_policy_change_timeout(void *data EINA_UNUSED) { e_config_save_queue(); _policy_change_timer = NULL; diff --git a/src/modules/illume2/e_mod_config_windows.c b/src/modules/illume2/e_mod_config_windows.c index 7644d06392..6f3bfc915c 100644 --- a/src/modules/illume2/e_mod_config_windows.c +++ b/src/modules/illume2/e_mod_config_windows.c @@ -6,19 +6,19 @@ static void *_e_mod_illume_config_windows_create(E_Config_Dialog *cfd); static void _e_mod_illume_config_windows_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static Evas_Object *_e_mod_illume_config_windows_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static void _e_mod_illume_config_windows_check_changed(void *data, Evas_Object *obj, void *event); -static void _e_mod_illume_config_windows_change(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__); -static Eina_Bool _e_mod_illume_config_windows_change_timeout(void *data __UNUSED__); -static void _e_mod_illume_config_windows_select_home(void *data __UNUSED__, void *data2 __UNUSED__); -static void _e_mod_illume_config_windows_select_vkbd(void *data __UNUSED__, void *data2 __UNUSED__); -static void _e_mod_illume_config_windows_select_softkey(void *data __UNUSED__, void *data2 __UNUSED__); -static void _e_mod_illume_config_windows_select_indicator(void *data __UNUSED__, void *data2 __UNUSED__); +static void _e_mod_illume_config_windows_change(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED); +static Eina_Bool _e_mod_illume_config_windows_change_timeout(void *data EINA_UNUSED); +static void _e_mod_illume_config_windows_select_home(void *data EINA_UNUSED, void *data2 EINA_UNUSED); +static void _e_mod_illume_config_windows_select_vkbd(void *data EINA_UNUSED, void *data2 EINA_UNUSED); +static void _e_mod_illume_config_windows_select_softkey(void *data EINA_UNUSED, void *data2 EINA_UNUSED); +static void _e_mod_illume_config_windows_select_indicator(void *data EINA_UNUSED, void *data2 EINA_UNUSED); /* local variables */ Ecore_Timer *_windows_change_timer = NULL; /* public functions */ void -e_mod_illume_config_windows_show(E_Comp *comp, const char *params __UNUSED__) +e_mod_illume_config_windows_show(E_Comp *comp, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -42,20 +42,20 @@ e_mod_illume_config_windows_show(E_Comp *comp, const char *params __UNUSED__) /* local function prototypes */ static void * -_e_mod_illume_config_windows_create(E_Config_Dialog *cfd __UNUSED__) +_e_mod_illume_config_windows_create(E_Config_Dialog *cfd EINA_UNUSED) { return NULL; } static void -_e_mod_illume_config_windows_free(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__) +_e_mod_illume_config_windows_free(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata EINA_UNUSED) { if (_windows_change_timer) ecore_timer_del(_windows_change_timer); _windows_change_timer = NULL; } static Evas_Object * -_e_mod_illume_config_windows_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata __UNUSED__) +_e_mod_illume_config_windows_ui(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata EINA_UNUSED) { Evas_Object *list, *of, *ow; @@ -175,7 +175,7 @@ _e_mod_illume_config_windows_check_changed(void *data, Evas_Object *obj, void *e } static void -_e_mod_illume_config_windows_change(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_e_mod_illume_config_windows_change(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { if (_windows_change_timer) ecore_timer_del(_windows_change_timer); _windows_change_timer = @@ -183,7 +183,7 @@ _e_mod_illume_config_windows_change(void *data, Evas_Object *obj __UNUSED__, voi } static Eina_Bool -_e_mod_illume_config_windows_change_timeout(void *data __UNUSED__) +_e_mod_illume_config_windows_change_timeout(void *data EINA_UNUSED) { e_config_save_queue(); _windows_change_timer = NULL; @@ -191,28 +191,28 @@ _e_mod_illume_config_windows_change_timeout(void *data __UNUSED__) } static void -_e_mod_illume_config_windows_select_home(void *data __UNUSED__, void *data2 __UNUSED__) +_e_mod_illume_config_windows_select_home(void *data EINA_UNUSED, void *data2 EINA_UNUSED) { if (e_config_dialog_find("E", "_config_illume_select_window")) return; e_mod_illume_config_select_window(E_ILLUME_SELECT_WINDOW_TYPE_HOME); } static void -_e_mod_illume_config_windows_select_vkbd(void *data __UNUSED__, void *data2 __UNUSED__) +_e_mod_illume_config_windows_select_vkbd(void *data EINA_UNUSED, void *data2 EINA_UNUSED) { if (e_config_dialog_find("E", "_config_illume_select_window")) return; e_mod_illume_config_select_window(E_ILLUME_SELECT_WINDOW_TYPE_VKBD); } static void -_e_mod_illume_config_windows_select_softkey(void *data __UNUSED__, void *data2 __UNUSED__) +_e_mod_illume_config_windows_select_softkey(void *data EINA_UNUSED, void *data2 EINA_UNUSED) { if (e_config_dialog_find("E", "_config_illume_select_window")) return; e_mod_illume_config_select_window(E_ILLUME_SELECT_WINDOW_TYPE_SOFTKEY); } static void -_e_mod_illume_config_windows_select_indicator(void *data __UNUSED__, void *data2 __UNUSED__) +_e_mod_illume_config_windows_select_indicator(void *data EINA_UNUSED, void *data2 EINA_UNUSED) { if (e_config_dialog_find("E", "_config_illume_select_window")) return; e_mod_illume_config_select_window(E_ILLUME_SELECT_WINDOW_TYPE_INDICATOR); diff --git a/src/modules/illume2/e_mod_kbd.c b/src/modules/illume2/e_mod_kbd.c index 98aa1af3a6..638108caf4 100644 --- a/src/modules/illume2/e_mod_kbd.c +++ b/src/modules/illume2/e_mod_kbd.c @@ -2,17 +2,17 @@ #include "e_mod_main.h" /* local function prototypes */ -static Eina_Bool _e_mod_kbd_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_kbd_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_kbd_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_kbd_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_kbd_cb_border_property(void *data __UNUSED__, int type __UNUSED__, void *event); -static void _e_mod_kbd_cb_border_pre_post_fetch(void *data __UNUSED__, E_Client *ec); +static Eina_Bool _e_mod_kbd_cb_client_message(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_kbd_cb_border_remove(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_kbd_cb_border_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_kbd_cb_border_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_kbd_cb_border_property(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static void _e_mod_kbd_cb_border_pre_post_fetch(void *data EINA_UNUSED, E_Client *ec); static void _e_mod_kbd_cb_free(E_Illume_Keyboard *kbd); -static Eina_Bool _e_mod_kbd_cb_delay_hide(void *data __UNUSED__); +static Eina_Bool _e_mod_kbd_cb_delay_hide(void *data EINA_UNUSED); static void _e_mod_kbd_hide(void); static void _e_mod_kbd_slide(int visible, double len); -static Eina_Bool _e_mod_kbd_cb_animate(void *data __UNUSED__); +static Eina_Bool _e_mod_kbd_cb_animate(void *data EINA_UNUSED); static E_Illume_Keyboard *_e_mod_kbd_by_border_get(E_Client *ec); static void _e_mod_kbd_border_adopt(E_Client *ec); static void _e_mod_kbd_layout_send(void); @@ -223,7 +223,7 @@ e_mod_kbd_layout_set(E_Illume_Keyboard_Layout layout) /* local functions */ static Eina_Bool -_e_mod_kbd_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_kbd_cb_client_message(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_X_Event_Client_Message *ev; @@ -243,7 +243,7 @@ _e_mod_kbd_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *e } static Eina_Bool -_e_mod_kbd_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_kbd_cb_border_remove(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; E_Illume_Keyboard *kbd; @@ -291,7 +291,7 @@ _e_mod_kbd_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, void *ev } static Eina_Bool -_e_mod_kbd_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_kbd_cb_border_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; @@ -311,7 +311,7 @@ _e_mod_kbd_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void * } static Eina_Bool -_e_mod_kbd_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_kbd_cb_border_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; @@ -341,7 +341,7 @@ _e_mod_kbd_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void } static Eina_Bool -_e_mod_kbd_cb_border_property(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_kbd_cb_border_property(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_X_Event_Window_Property *ev; E_Client *ec; @@ -394,7 +394,7 @@ _e_mod_kbd_cb_border_property(void *data __UNUSED__, int type __UNUSED__, void * } static void -_e_mod_kbd_cb_border_pre_post_fetch(void *data __UNUSED__, E_Client *ec) +_e_mod_kbd_cb_border_pre_post_fetch(void *data EINA_UNUSED, E_Client *ec) { if (!ec->new_client) return; if (_e_mod_kbd_by_border_get(ec)) return; @@ -433,7 +433,7 @@ _e_mod_kbd_cb_free(E_Illume_Keyboard *kbd) } static Eina_Bool -_e_mod_kbd_cb_delay_hide(void *data __UNUSED__) +_e_mod_kbd_cb_delay_hide(void *data EINA_UNUSED) { _e_mod_kbd_hide(); return ECORE_CALLBACK_CANCEL; @@ -492,7 +492,7 @@ _e_mod_kbd_slide(int visible, double len) } static Eina_Bool -_e_mod_kbd_cb_animate(void *data __UNUSED__) +_e_mod_kbd_cb_animate(void *data EINA_UNUSED) { double t, v; diff --git a/src/modules/illume2/e_mod_kbd_device.c b/src/modules/illume2/e_mod_kbd_device.c index ebe30e493f..a4492a33b2 100644 --- a/src/modules/illume2/e_mod_kbd_device.c +++ b/src/modules/illume2/e_mod_kbd_device.c @@ -8,7 +8,7 @@ static void _e_mod_kbd_device_kbd_add(const char *udi); static void _e_mod_kbd_device_kbd_del(const char *udi); static void _e_mod_kbd_device_kbd_eval(void); # include <Eeze.h> -static void _e_mod_kbd_device_udev_event(const char *device, Eeze_Udev_Event event, void *data __UNUSED__, Eeze_Udev_Watch *watch __UNUSED__); +static void _e_mod_kbd_device_udev_event(const char *device, Eeze_Udev_Event event, void *data EINA_UNUSED, Eeze_Udev_Watch *watch EINA_UNUSED); /* local variables */ static int have_real_kbd = 0; @@ -92,7 +92,7 @@ _e_mod_kbd_device_ignore_load_file(const char *file) } static void -_e_mod_kbd_device_udev_event(const char *device, Eeze_Udev_Event event, void *data __UNUSED__, Eeze_Udev_Watch *w __UNUSED__) +_e_mod_kbd_device_udev_event(const char *device, Eeze_Udev_Event event, void *data EINA_UNUSED, Eeze_Udev_Watch *w EINA_UNUSED) { if ((!device) || (!event)) return; diff --git a/src/modules/illume2/e_mod_main.c b/src/modules/illume2/e_mod_main.c index 3ca19904c4..80edc5b064 100644 --- a/src/modules/illume2/e_mod_main.c +++ b/src/modules/illume2/e_mod_main.c @@ -117,7 +117,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Illume_Quickpanel *qp; @@ -149,7 +149,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return e_mod_illume_config_save(); } diff --git a/src/modules/illume2/e_mod_main.h b/src/modules/illume2/e_mod_main.h index 1d01dfe1f5..43227461e2 100644 --- a/src/modules/illume2/e_mod_main.h +++ b/src/modules/illume2/e_mod_main.h @@ -40,9 +40,9 @@ int e_mod_illume_config_init(void); int e_mod_illume_config_shutdown(void); int e_mod_illume_config_save(void); -void e_mod_illume_config_animation_show(E_Comp *comp, const char *params __UNUSED__); -void e_mod_illume_config_policy_show(E_Comp *comp, const char *params __UNUSED__); -void e_mod_illume_config_windows_show(E_Comp *comp, const char *params __UNUSED__); +void e_mod_illume_config_animation_show(E_Comp *comp, const char *params EINA_UNUSED); +void e_mod_illume_config_policy_show(E_Comp *comp, const char *params EINA_UNUSED); +void e_mod_illume_config_windows_show(E_Comp *comp, const char *params EINA_UNUSED); void e_mod_kbd_device_init(void); void e_mod_kbd_device_shutdown(void); int e_mod_policy_init(void); diff --git a/src/modules/illume2/e_mod_policy.c b/src/modules/illume2/e_mod_policy.c index 540522647e..e17723063e 100644 --- a/src/modules/illume2/e_mod_policy.c +++ b/src/modules/illume2/e_mod_policy.c @@ -7,17 +7,17 @@ static int _e_mod_policy_load(char *file); static void _e_mod_policy_handlers_add(void); static void _e_mod_policy_hooks_add(void); static void _e_mod_policy_cb_free(E_Illume_Policy *p); -static Eina_Bool _e_mod_policy_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_policy_cb_border_del(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_policy_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_policy_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_policy_cb_border_show(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_policy_cb_zone_move_resize(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_policy_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_policy_cb_window_property(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_policy_cb_policy_change(void *data __UNUSED__, int type, void *event __UNUSED__); -static void _e_mod_policy_cb_hook_post_fetch(void *data __UNUSED__, E_Client *ec); -static void _e_mod_policy_cb_hook_post_assign(void *data __UNUSED__, E_Client *ec); +static Eina_Bool _e_mod_policy_cb_border_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_policy_cb_border_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_policy_cb_border_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_policy_cb_border_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_policy_cb_border_show(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_policy_cb_zone_move_resize(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_policy_cb_client_message(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_policy_cb_window_property(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_policy_cb_policy_change(void *data EINA_UNUSED, int type, void *event EINA_UNUSED); +static void _e_mod_policy_cb_hook_post_fetch(void *data EINA_UNUSED, E_Client *ec); +static void _e_mod_policy_cb_hook_post_assign(void *data EINA_UNUSED, E_Client *ec); static void _e_mod_policy_cb_hook_layout(E_Comp *comp); /* local variables */ @@ -300,7 +300,7 @@ _e_mod_policy_cb_free(E_Illume_Policy *p) } static Eina_Bool -_e_mod_policy_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_policy_cb_border_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; @@ -312,7 +312,7 @@ _e_mod_policy_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *ev } static Eina_Bool -_e_mod_policy_cb_border_del(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_policy_cb_border_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; @@ -324,7 +324,7 @@ _e_mod_policy_cb_border_del(void *data __UNUSED__, int type __UNUSED__, void *ev } static Eina_Bool -_e_mod_policy_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_policy_cb_border_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; @@ -336,7 +336,7 @@ _e_mod_policy_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, voi } static Eina_Bool -_e_mod_policy_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_policy_cb_border_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; @@ -348,7 +348,7 @@ _e_mod_policy_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, vo } static Eina_Bool -_e_mod_policy_cb_border_show(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_policy_cb_border_show(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; @@ -360,7 +360,7 @@ _e_mod_policy_cb_border_show(void *data __UNUSED__, int type __UNUSED__, void *e } static Eina_Bool -_e_mod_policy_cb_zone_move_resize(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_policy_cb_zone_move_resize(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Zone_Move_Resize *ev; @@ -386,7 +386,7 @@ _e_mod_zone_win_get(Ecore_X_Window win) } static Eina_Bool -_e_mod_policy_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_policy_cb_client_message(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_X_Event_Client_Message *ev; @@ -460,7 +460,7 @@ _e_mod_policy_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void } static Eina_Bool -_e_mod_policy_cb_window_property(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_policy_cb_window_property(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_X_Event_Window_Property *ev; @@ -472,7 +472,7 @@ _e_mod_policy_cb_window_property(void *data __UNUSED__, int type __UNUSED__, voi } static Eina_Bool -_e_mod_policy_cb_policy_change(void *data __UNUSED__, int type, void *event __UNUSED__) +_e_mod_policy_cb_policy_change(void *data EINA_UNUSED, int type, void *event EINA_UNUSED) { char *file; @@ -490,14 +490,14 @@ _e_mod_policy_cb_policy_change(void *data __UNUSED__, int type, void *event __UN } static void -_e_mod_policy_cb_hook_post_fetch(void *data __UNUSED__, E_Client *ec) +_e_mod_policy_cb_hook_post_fetch(void *data EINA_UNUSED, E_Client *ec) { if ((_policy) && (_policy->funcs.border_post_fetch)) _policy->funcs.border_post_fetch(ec); } static void -_e_mod_policy_cb_hook_post_assign(void *data __UNUSED__, E_Client *ec) +_e_mod_policy_cb_hook_post_assign(void *data EINA_UNUSED, E_Client *ec) { if ((_policy) && (_policy->funcs.border_post_assign)) _policy->funcs.border_post_assign(ec); diff --git a/src/modules/illume2/e_mod_quickpanel.c b/src/modules/illume2/e_mod_quickpanel.c index 1cc13014ce..37c41549f7 100644 --- a/src/modules/illume2/e_mod_quickpanel.c +++ b/src/modules/illume2/e_mod_quickpanel.c @@ -2,13 +2,13 @@ #include "e_mod_main.h" /* local function prototypes */ -static Eina_Bool _e_mod_quickpanel_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_quickpanel_cb_mouse_up(void *data, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_quickpanel_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_quickpanel_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_quickpanel_cb_border_resize(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_mod_quickpanel_cb_border_uniconify(void *data __UNUSED__, int type __UNUSED__, void *event); -static void _e_mod_quickpanel_cb_post_fetch(void *data __UNUSED__, E_Client *ec); +static Eina_Bool _e_mod_quickpanel_cb_client_message(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_quickpanel_cb_mouse_up(void *data, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_quickpanel_cb_border_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_quickpanel_cb_border_remove(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_quickpanel_cb_border_resize(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_mod_quickpanel_cb_border_uniconify(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static void _e_mod_quickpanel_cb_post_fetch(void *data EINA_UNUSED, E_Client *ec); static void _e_mod_quickpanel_cb_free(E_Illume_Quickpanel *qp); static Eina_Bool _e_mod_quickpanel_cb_delay_hide(void *data); static void _e_mod_quickpanel_slide(E_Illume_Quickpanel *qp, int visible, double len); @@ -161,7 +161,7 @@ e_mod_quickpanel_hide(E_Illume_Quickpanel *qp) /* local functions */ static Eina_Bool -_e_mod_quickpanel_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_quickpanel_cb_client_message(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_X_Event_Client_Message *ev; @@ -216,7 +216,7 @@ _e_mod_quickpanel_cb_client_message(void *data __UNUSED__, int type __UNUSED__, } static Eina_Bool -_e_mod_quickpanel_cb_mouse_up(void *data, int type __UNUSED__, void *event) +_e_mod_quickpanel_cb_mouse_up(void *data, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Button *ev; E_Illume_Quickpanel *qp; @@ -229,7 +229,7 @@ _e_mod_quickpanel_cb_mouse_up(void *data, int type __UNUSED__, void *event) } static Eina_Bool -_e_mod_quickpanel_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_quickpanel_cb_border_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; E_Illume_Quickpanel *qp; @@ -279,7 +279,7 @@ _e_mod_quickpanel_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void } static Eina_Bool -_e_mod_quickpanel_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_quickpanel_cb_border_remove(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; E_Illume_Quickpanel *qp; @@ -323,7 +323,7 @@ _e_mod_quickpanel_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, v } static Eina_Bool -_e_mod_quickpanel_cb_border_resize(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_quickpanel_cb_border_resize(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; E_Illume_Quickpanel *qp; @@ -344,7 +344,7 @@ _e_mod_quickpanel_cb_border_resize(void *data __UNUSED__, int type __UNUSED__, v } static Eina_Bool -_e_mod_quickpanel_cb_border_uniconify(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_mod_quickpanel_cb_border_uniconify(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev; E_Illume_Quickpanel *qp; @@ -359,7 +359,7 @@ _e_mod_quickpanel_cb_border_uniconify(void *data __UNUSED__, int type __UNUSED__ } static void -_e_mod_quickpanel_cb_post_fetch(void *data __UNUSED__, E_Client *ec) +_e_mod_quickpanel_cb_post_fetch(void *data EINA_UNUSED, E_Client *ec) { if (!ec->illume.quickpanel.quickpanel) return; ec->stolen = 1; diff --git a/src/modules/illume2/e_mod_select_window.c b/src/modules/illume2/e_mod_select_window.c index fb8398fe3b..44d0f78cc5 100644 --- a/src/modules/illume2/e_mod_select_window.c +++ b/src/modules/illume2/e_mod_select_window.c @@ -40,20 +40,20 @@ e_mod_illume_config_select_window(E_Illume_Select_Window_Type type) } static void * -_e_mod_illume_config_select_window_create_data(E_Config_Dialog *cfd __UNUSED__) +_e_mod_illume_config_select_window_create_data(E_Config_Dialog *cfd EINA_UNUSED) { return NULL; } static void -_e_mod_illume_config_select_window_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__) +_e_mod_illume_config_select_window_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata EINA_UNUSED) { if (_sw_change_timer) ecore_timer_del(_sw_change_timer); _sw_change_timer = NULL; } static Evas_Object * -_e_mod_illume_config_select_window_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata __UNUSED__) +_e_mod_illume_config_select_window_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata EINA_UNUSED) { Evas_Object *list, *ow; Eina_List *ecs, *l; @@ -145,7 +145,7 @@ _e_mod_illume_config_select_window_list_changed(void *data) } static Eina_Bool -_e_mod_illume_config_select_window_change_timeout(__UNUSED__ void *data) +_e_mod_illume_config_select_window_change_timeout(EINA_UNUSED void *data) { e_config_save_queue(); _sw_change_timer = NULL; diff --git a/src/modules/illume2/policies/tablet/policy.c b/src/modules/illume2/policies/tablet/policy.c index 1fccc13bb8..0c4ed65b16 100644 --- a/src/modules/illume2/policies/tablet/policy.c +++ b/src/modules/illume2/policies/tablet/policy.c @@ -645,7 +645,7 @@ _policy_zone_layout_splash(E_Client *ec, E_Illume_Config_Zone *cz) } static void -_policy_zone_layout_conformant_single(E_Client *ec, E_Illume_Config_Zone *cz __UNUSED__) +_policy_zone_layout_conformant_single(E_Client *ec, E_Illume_Config_Zone *cz EINA_UNUSED) { if (!_policy_layout_app_check(ec)) return; @@ -825,7 +825,7 @@ _policy_border_del(E_Client *ec) } void -_policy_border_focus_in(E_Client *ec __UNUSED__) +_policy_border_focus_in(E_Client *ec EINA_UNUSED) { E_Client *ind; diff --git a/src/modules/mixer/app_mixer.c b/src/modules/mixer/app_mixer.c index 6793597183..3800ee92ec 100644 --- a/src/modules/mixer/app_mixer.c +++ b/src/modules/mixer/app_mixer.c @@ -52,7 +52,7 @@ typedef struct E_Mixer_App_Dialog_Data } E_Mixer_App_Dialog_Data; static void -_cb_changed_left(void *data, Evas_Object *obj __UNUSED__) +_cb_changed_left(void *data, Evas_Object *obj EINA_UNUSED) { E_Mixer_App_Dialog_Data *app = data; E_Mixer_Channel_State *state; @@ -70,7 +70,7 @@ _cb_changed_left(void *data, Evas_Object *obj __UNUSED__) } static void -_cb_changed_right(void *data, Evas_Object *obj __UNUSED__) +_cb_changed_right(void *data, Evas_Object *obj EINA_UNUSED) { E_Mixer_App_Dialog_Data *app = data; E_Mixer_Channel_State *state; @@ -88,7 +88,7 @@ _cb_changed_right(void *data, Evas_Object *obj __UNUSED__) } static void -_cb_changed_mute(void *data, Evas_Object *obj __UNUSED__) +_cb_changed_mute(void *data, Evas_Object *obj EINA_UNUSED) { E_Mixer_App_Dialog_Data *app = data; @@ -96,7 +96,7 @@ _cb_changed_mute(void *data, Evas_Object *obj __UNUSED__) } static void -_cb_changed_lock_sliders(void *data, Evas_Object *obj __UNUSED__) +_cb_changed_lock_sliders(void *data, Evas_Object *obj EINA_UNUSED) { E_Mixer_App_Dialog_Data *app = data; E_Mixer_Channel_State *state; @@ -232,7 +232,7 @@ _cb_channel_selected(void *data) } static int -_cb_system_update(void *data, E_Mixer_System *sys __UNUSED__) +_cb_system_update(void *data, E_Mixer_System *sys EINA_UNUSED) { E_Mixer_App_Dialog_Data *app = data; E_Mixer_Channel_State state; @@ -319,7 +319,7 @@ _cb_card_selected(void *data) } static void -_create_cards(E_Dialog *dialog __UNUSED__, Evas *evas, E_Mixer_App_Dialog_Data *app) +_create_cards(E_Dialog *dialog EINA_UNUSED, Evas *evas, E_Mixer_App_Dialog_Data *app) { struct e_mixer_app_ui_cards *ui = &app->ui.cards; const char *card; @@ -353,7 +353,7 @@ _create_cards(E_Dialog *dialog __UNUSED__, Evas *evas, E_Mixer_App_Dialog_Data * } static void -_create_channels(E_Dialog *dialog __UNUSED__, Evas *evas, E_Mixer_App_Dialog_Data *app) +_create_channels(E_Dialog *dialog EINA_UNUSED, Evas *evas, E_Mixer_App_Dialog_Data *app) { struct e_mixer_app_ui_channels *ui = &app->ui.channels; ui->list = e_widget_ilist_add(evas, 24, 24, &app->channel_name); diff --git a/src/modules/mixer/conf_gadget.c b/src/modules/mixer/conf_gadget.c index b4151ebb89..7f57727644 100644 --- a/src/modules/mixer/conf_gadget.c +++ b/src/modules/mixer/conf_gadget.c @@ -186,7 +186,7 @@ _basic_apply(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata) } static void -_lock_change(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_lock_change(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; e_widget_disabled_set(cfdata->ui.general.show_locked, !cfdata->lock_sliders); @@ -293,7 +293,7 @@ _basic_create_channels(Evas *evas, E_Config_Dialog_Data *cfdata) } static void -_card_change(void *data, Evas_Object *obj, void *event __UNUSED__) +_card_change(void *data, Evas_Object *obj, void *event EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; Evas *evas; diff --git a/src/modules/mixer/conf_module.c b/src/modules/mixer/conf_module.c index 1385ae5bca..e838be4a1a 100644 --- a/src/modules/mixer/conf_module.c +++ b/src/modules/mixer/conf_module.c @@ -144,14 +144,14 @@ _basic_create_general(E_Config_Dialog *dialog, Evas *evas, E_Config_Dialog_Data } static void -cb_mixer_app_del(E_Dialog *dialog __UNUSED__, void *data) +cb_mixer_app_del(E_Dialog *dialog EINA_UNUSED, void *data) { E_Mixer_Module_Context *ctxt = data; ctxt->mixer_dialog = NULL; } static void -cb_mixer_call(void *data, void *data2 __UNUSED__) +cb_mixer_call(void *data, void *data2 EINA_UNUSED) { Eina_List *l; E_Mixer_Module_Context *ctxt = data; diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c index 26399453c2..5d28abfbbe 100644 --- a/src/modules/mixer/e_mod_main.c +++ b/src/modules/mixer/e_mod_main.c @@ -164,7 +164,7 @@ _mixer_gadget_configuration_free(E_Mixer_Module_Config *mod_conf, E_Mixer_Gadget } static Eina_Bool -_mixer_gadget_configuration_free_foreach(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *hdata, void *fdata __UNUSED__) +_mixer_gadget_configuration_free_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *hdata, void *fdata EINA_UNUSED) { _mixer_gadget_configuration_free_int(hdata); return 1; @@ -319,7 +319,7 @@ _mixer_toggle_mute(E_Mixer_Instance *inst, Eina_Bool non_ui) } static void -_mixer_popup_cb_volume_left_change(void *data, Evas_Object *obj, void *event __UNUSED__) +_mixer_popup_cb_volume_left_change(void *data, Evas_Object *obj, void *event EINA_UNUSED) { E_Mixer_Instance *inst = data; E_Mixer_Channel_State *state = &inst->mixer_state; @@ -341,7 +341,7 @@ _mixer_popup_cb_volume_left_change(void *data, Evas_Object *obj, void *event __U } static void -_mixer_popup_cb_volume_right_change(void *data, Evas_Object *obj, void *event __UNUSED__) +_mixer_popup_cb_volume_right_change(void *data, Evas_Object *obj, void *event EINA_UNUSED) { E_Mixer_Instance *inst = data; E_Mixer_Channel_State *state = &inst->mixer_state; @@ -363,7 +363,7 @@ _mixer_popup_cb_volume_right_change(void *data, Evas_Object *obj, void *event __ } static void -_mixer_popup_cb_mute_change(void *data, Evas_Object *obj, void *event __UNUSED__) +_mixer_popup_cb_mute_change(void *data, Evas_Object *obj, void *event EINA_UNUSED) { E_Mixer_Instance *inst = data; E_Mixer_Channel_State *state = &inst->mixer_state; @@ -390,7 +390,7 @@ _mixer_popup_add_slider(E_Mixer_Instance *inst, int value, void (*cb)(void *data } static void -_mixer_app_cb_del(E_Dialog *dialog __UNUSED__, void *data) +_mixer_app_cb_del(E_Dialog *dialog EINA_UNUSED, void *data) { E_Mixer_Module_Context *ctxt = data; ctxt->mixer_dialog = NULL; @@ -495,7 +495,7 @@ _mixer_app_select_current(E_Dialog *dialog, E_Mixer_Instance *inst) } static void -_mixer_popup_cb_mixer(void *data, void *data2 __UNUSED__) +_mixer_popup_cb_mixer(void *data, void *data2 EINA_UNUSED) { E_Mixer_Instance *inst = data; E_Mixer_Module_Context *ctxt; @@ -647,7 +647,7 @@ _mixer_popup_timer_cb(void *data) } static void -_mixer_menu_cb_cfg(void *data, E_Menu *menu __UNUSED__, E_Menu_Item *mi __UNUSED__) +_mixer_menu_cb_cfg(void *data, E_Menu *menu EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Mixer_Instance *inst = data; @@ -682,7 +682,7 @@ _mixer_menu_new(E_Mixer_Instance *inst, Evas_Event_Mouse_Down *ev) } static void -_mixer_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_mixer_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { E_Mixer_Instance *inst = data; Evas_Event_Mouse_Down *ev = event; @@ -699,7 +699,7 @@ _mixer_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSE } static void -_mixer_cb_mouse_wheel(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_mixer_cb_mouse_wheel(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { E_Mixer_Instance *inst = data; Evas_Event_Mouse_Wheel *ev = event; @@ -749,7 +749,7 @@ _mixer_sys_setup(E_Mixer_Instance *inst) } static int -_mixer_system_cb_update(void *data, E_Mixer_System *sys __UNUSED__) +_mixer_system_cb_update(void *data, E_Mixer_System *sys EINA_UNUSED) { E_Mixer_Instance *inst = data; e_mod_mixer_state_get(inst->sys, inst->channel, &inst->mixer_state); @@ -1053,20 +1053,20 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { e_gadcon_client_aspect_set(gcc, 16, 16); e_gadcon_client_min_size_set(gcc, 16, 16); } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return (char *)_(_e_mixer_Name); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o = edje_object_add(evas); edje_object_file_set(o, e_mixer_theme_path(), "icon"); @@ -1074,7 +1074,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { E_Mixer_Module_Context *ctxt; Eina_List *instances; @@ -1129,19 +1129,19 @@ _mixer_cb_volume_modify(Eina_Bool up) } static void -_mixer_cb_volume_increase(E_Object *obj __UNUSED__, const char *params __UNUSED__) +_mixer_cb_volume_increase(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED) { _mixer_cb_volume_modify(EINA_TRUE); } static void -_mixer_cb_volume_decrease(E_Object *obj __UNUSED__, const char *params __UNUSED__) +_mixer_cb_volume_decrease(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED) { _mixer_cb_volume_modify(EINA_FALSE); } static void -_mixer_cb_volume_mute(E_Object *obj __UNUSED__, const char *params __UNUSED__) +_mixer_cb_volume_mute(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED) { E_Mixer_Module_Context *ctxt; @@ -1166,7 +1166,7 @@ _mixer_cb_volume_mute(E_Object *obj __UNUSED__, const char *params __UNUSED__) } static E_Config_Dialog * -_mixer_module_config(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +_mixer_module_config(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Mixer_Module_Context *ctxt; diff --git a/src/modules/mixer/pa.c b/src/modules/mixer/pa.c index bf3405937f..18006ce8b8 100644 --- a/src/modules/mixer/pa.c +++ b/src/modules/mixer/pa.c @@ -19,7 +19,7 @@ Eina_Hash *pulse_sinks = NULL; Eina_Hash *pulse_sources = NULL; void -pulse_fake_free(void *d __UNUSED__, void *d2 __UNUSED__) +pulse_fake_free(void *d EINA_UNUSED, void *d2 EINA_UNUSED) {} static void @@ -343,7 +343,7 @@ fdh_func(Pulse *conn, Ecore_Fd_Handler *fdh) } static Eina_Bool -con(Pulse *conn, int type __UNUSED__, Ecore_Con_Event_Server_Add *ev) +con(Pulse *conn, int type EINA_UNUSED, Ecore_Con_Event_Server_Add *ev) { int on = 1; int fd; diff --git a/src/modules/mixer/pa.h b/src/modules/mixer/pa.h index 1a07901523..552d1d301e 100644 --- a/src/modules/mixer/pa.h +++ b/src/modules/mixer/pa.h @@ -23,8 +23,8 @@ # define STATEDIR "/var" #endif -#ifndef __UNUSED__ -# define __UNUSED__ __attribute__((unused)) +#ifndef EINA_UNUSED +# define EINA_UNUSED __attribute__((unused)) #endif # ifdef EINTERN @@ -552,7 +552,7 @@ void tag_finish(Pulse_Tag *tag); Eina_Bool deserialize_tag(Pulse *conn, PA_Commands command, Pulse_Tag *tag); -void pulse_fake_free(void *d __UNUSED__, void *d2 __UNUSED__); +void pulse_fake_free(void *d EINA_UNUSED, void *d2 EINA_UNUSED); void pulse_tag_free(Pulse_Tag *tag); void msg_recv_creds(Pulse *conn, Pulse_Tag *tag); diff --git a/src/modules/mixer/serial.c b/src/modules/mixer/serial.c index 99678c0ad2..20c04548dc 100644 --- a/src/modules/mixer/serial.c +++ b/src/modules/mixer/serial.c @@ -53,7 +53,7 @@ deserialize_sinks_watcher(Pulse *conn, Pulse_Tag *tag) } static Pulse_Sink * -deserialize_sink(Pulse *conn __UNUSED__, Pulse_Tag *tag, Eina_Bool source) +deserialize_sink(Pulse *conn EINA_UNUSED, Pulse_Tag *tag, Eina_Bool source) { Pulse_Sink *sink = NULL; Eina_Bool mute, exist; diff --git a/src/modules/mixer/sys_alsa.c b/src/modules/mixer/sys_alsa.c index fdd1eaf4e8..7afc75f8fc 100644 --- a/src/modules/mixer/sys_alsa.c +++ b/src/modules/mixer/sys_alsa.c @@ -131,7 +131,7 @@ _mixer_callback_del(const E_Mixer_System *self, } static int -_mixer_callback_replace(const E_Mixer_System *self __UNUSED__, +_mixer_callback_replace(const E_Mixer_System *self EINA_UNUSED, struct e_mixer_callback_desc *desc, int (*func)(void *data, E_Mixer_System *self), void *data) diff --git a/src/modules/mixer/sys_dummy.c b/src/modules/mixer/sys_dummy.c index 79a26e051b..9d9f509148 100644 --- a/src/modules/mixer/sys_dummy.c +++ b/src/modules/mixer/sys_dummy.c @@ -22,12 +22,12 @@ e_mixer_system_new(const char *name) } void -e_mixer_system_del(E_Mixer_System *self __UNUSED__) +e_mixer_system_del(E_Mixer_System *self EINA_UNUSED) { } int -e_mixer_system_callback_set(const E_Mixer_System *self __UNUSED__, int (*func)(void *data, E_Mixer_System *self) __UNUSED__, void *data __UNUSED__) +e_mixer_system_callback_set(const E_Mixer_System *self EINA_UNUSED, int (*func)(void *data, E_Mixer_System *self) EINA_UNUSED, void *data EINA_UNUSED) { return 0; } @@ -60,7 +60,7 @@ e_mixer_system_get_card_name(const char *card) } Eina_List * -e_mixer_system_get_channels(const E_Mixer_System *self __UNUSED__) +e_mixer_system_get_channels(const E_Mixer_System *self EINA_UNUSED) { E_Mixer_Channel_Info *ch_info; @@ -75,7 +75,7 @@ e_mixer_system_get_channels(const E_Mixer_System *self __UNUSED__) } Eina_List * -e_mixer_system_get_channel_names(const E_Mixer_System *self __UNUSED__) +e_mixer_system_get_channel_names(const E_Mixer_System *self EINA_UNUSED) { _e_mixer_dummy_set(); @@ -83,7 +83,7 @@ e_mixer_system_get_channel_names(const E_Mixer_System *self __UNUSED__) } const char * -e_mixer_system_get_default_channel_name(const E_Mixer_System *self __UNUSED__) +e_mixer_system_get_default_channel_name(const E_Mixer_System *self EINA_UNUSED) { _e_mixer_dummy_set(); @@ -91,7 +91,7 @@ e_mixer_system_get_default_channel_name(const E_Mixer_System *self __UNUSED__) } E_Mixer_Channel_Info * -e_mixer_system_get_channel_by_name(const E_Mixer_System *self __UNUSED__, const char *name) +e_mixer_system_get_channel_by_name(const E_Mixer_System *self EINA_UNUSED, const char *name) { E_Mixer_Channel_Info *ch_info; @@ -111,8 +111,8 @@ e_mixer_system_get_channel_by_name(const E_Mixer_System *self __UNUSED__, const } int -e_mixer_system_get_volume(const E_Mixer_System *self __UNUSED__, - const E_Mixer_Channel_Info *channel __UNUSED__, +e_mixer_system_get_volume(const E_Mixer_System *self EINA_UNUSED, + const E_Mixer_Channel_Info *channel EINA_UNUSED, int *left, int *right) { if (left) @@ -124,16 +124,16 @@ e_mixer_system_get_volume(const E_Mixer_System *self __UNUSED__, } int -e_mixer_system_set_volume(const E_Mixer_System *self __UNUSED__, - const E_Mixer_Channel_Info *channel __UNUSED__, - int left __UNUSED__, int right __UNUSED__) +e_mixer_system_set_volume(const E_Mixer_System *self EINA_UNUSED, + const E_Mixer_Channel_Info *channel EINA_UNUSED, + int left EINA_UNUSED, int right EINA_UNUSED) { return 0; } int -e_mixer_system_get_mute(const E_Mixer_System *self __UNUSED__, - const E_Mixer_Channel_Info *channel __UNUSED__, +e_mixer_system_get_mute(const E_Mixer_System *self EINA_UNUSED, + const E_Mixer_Channel_Info *channel EINA_UNUSED, int *mute) { if (mute) @@ -143,16 +143,16 @@ e_mixer_system_get_mute(const E_Mixer_System *self __UNUSED__, } int -e_mixer_system_set_mute(const E_Mixer_System *self __UNUSED__, - const E_Mixer_Channel_Info *channel __UNUSED__, - int mute __UNUSED__) +e_mixer_system_set_mute(const E_Mixer_System *self EINA_UNUSED, + const E_Mixer_Channel_Info *channel EINA_UNUSED, + int mute EINA_UNUSED) { return 0; } int -e_mixer_system_get_state(const E_Mixer_System *self __UNUSED__, - const E_Mixer_Channel_Info *channel __UNUSED__, +e_mixer_system_get_state(const E_Mixer_System *self EINA_UNUSED, + const E_Mixer_Channel_Info *channel EINA_UNUSED, E_Mixer_Channel_State *state) { const E_Mixer_Channel_State def = {1, 0, 0}; diff --git a/src/modules/mixer/sys_pulse.c b/src/modules/mixer/sys_pulse.c index 74ab3e841c..61e1adee3a 100644 --- a/src/modules/mixer/sys_pulse.c +++ b/src/modules/mixer/sys_pulse.c @@ -53,7 +53,7 @@ _pulse_not_started(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Exe_Event } static void -_pulse_info_get(Pulse *d __UNUSED__, int type __UNUSED__, Pulse_Server_Info *ev) +_pulse_info_get(Pulse *d EINA_UNUSED, int type EINA_UNUSED, Pulse_Server_Info *ev) { Eina_List *l; Pulse_Sink *sink; @@ -80,7 +80,7 @@ _pulse_update_timer(void *d EINA_UNUSED) } static Eina_Bool -_pulse_update(Pulse *d __UNUSED__, int type __UNUSED__, Pulse_Sink *ev __UNUSED__) +_pulse_update(Pulse *d EINA_UNUSED, int type EINA_UNUSED, Pulse_Sink *ev EINA_UNUSED) { Pulse_Tag_Id id; @@ -93,7 +93,7 @@ _pulse_update(Pulse *d __UNUSED__, int type __UNUSED__, Pulse_Sink *ev __UNUSED_ } static void -_pulse_sinks_get(Pulse *p __UNUSED__, Pulse_Tag_Id id __UNUSED__, Eina_List *ev) +_pulse_sinks_get(Pulse *p EINA_UNUSED, Pulse_Tag_Id id EINA_UNUSED, Eina_List *ev) { Eina_List *l; Pulse_Sink *sink; @@ -128,7 +128,7 @@ _pulse_sinks_get(Pulse *p __UNUSED__, Pulse_Tag_Id id __UNUSED__, Eina_List *ev) } static void -_pulse_sources_get(Pulse *p __UNUSED__, Pulse_Tag_Id id __UNUSED__, Eina_List *ev) +_pulse_sources_get(Pulse *p EINA_UNUSED, Pulse_Tag_Id id EINA_UNUSED, Eina_List *ev) { eina_list_free(sources); sources = ev; @@ -152,7 +152,7 @@ _pulse_sources_get(Pulse *p __UNUSED__, Pulse_Tag_Id id __UNUSED__, Eina_List *e } static Eina_Bool -_pulse_connected(Pulse *d, int type __UNUSED__, Pulse *ev) +_pulse_connected(Pulse *d, int type EINA_UNUSED, Pulse *ev) { Pulse_Tag_Id id; if (d != ev) return ECORE_CALLBACK_PASS_ON; @@ -176,7 +176,7 @@ _pulse_connected(Pulse *d, int type __UNUSED__, Pulse *ev) } static Eina_Bool -_pulse_disc_timer(void *d __UNUSED__) +_pulse_disc_timer(void *d EINA_UNUSED) { disc_timer = NULL; if (disc_count < 5) @@ -191,7 +191,7 @@ _pulse_disc_timer(void *d __UNUSED__) } static Eina_Bool -_pulse_disconnected(Pulse *d, int type __UNUSED__, Pulse *ev) +_pulse_disconnected(Pulse *d, int type EINA_UNUSED, Pulse *ev) { Pulse_Sink *sink; @@ -290,7 +290,7 @@ _pulse_queue_process(const Eina_Hash *h EINA_UNUSED, const char *key, } static void -_pulse_result_cb(Pulse *p __UNUSED__, Pulse_Tag_Id id, void *ev) +_pulse_result_cb(Pulse *p EINA_UNUSED, Pulse_Tag_Id id, void *ev) { if (!ev) fprintf(stderr, "Command %u failed!\n", id); if (!update_count) return; @@ -369,7 +369,7 @@ e_mixer_pulse_new(const char *name) } void -e_mixer_pulse_del(E_Mixer_System *self __UNUSED__) +e_mixer_pulse_del(E_Mixer_System *self EINA_UNUSED) { } @@ -510,7 +510,7 @@ e_mixer_pulse_set_volume(const E_Mixer_System *self, int e_mixer_pulse_get_mute(const E_Mixer_System *self, - const E_Mixer_Channel_Info *channel __UNUSED__, int *mute) + const E_Mixer_Channel_Info *channel EINA_UNUSED, int *mute) { if (mute) *mute = pulse_sink_muted_get((void *)self); return 1; @@ -518,7 +518,7 @@ e_mixer_pulse_get_mute(const E_Mixer_System *self, int e_mixer_pulse_set_mute(const E_Mixer_System *self, - const E_Mixer_Channel_Info *channel __UNUSED__, int mute) + const E_Mixer_Channel_Info *channel EINA_UNUSED, int mute) { uint32_t id; Eina_Bool source = EINA_FALSE; diff --git a/src/modules/mixer/tag.c b/src/modules/mixer/tag.c index 56d7207717..5bd424025b 100644 --- a/src/modules/mixer/tag.c +++ b/src/modules/mixer/tag.c @@ -197,7 +197,7 @@ tag_simple_init(Pulse *conn, Pulse_Tag *tag, uint32_t val, PA_Tag type) } static Eina_Bool -tag_proplist_foreach(const Eina_Hash *h __UNUSED__, const char *key, const char *val, Pulse_Tag *tag) +tag_proplist_foreach(const Eina_Hash *h EINA_UNUSED, const char *key, const char *val, Pulse_Tag *tag) { size_t size; diff --git a/src/modules/msgbus/e_mod_main.c b/src/modules/msgbus/e_mod_main.c index dd38e726a8..ece22571a6 100644 --- a/src/modules/msgbus/e_mod_main.c +++ b/src/modules/msgbus/e_mod_main.c @@ -23,7 +23,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { Eldbus_Service_Interface* iface; Eina_Array_Iterator iter; @@ -36,7 +36,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/msgbus/msgbus_audit.c b/src/modules/msgbus/msgbus_audit.c index 095b907b34..dc61674362 100644 --- a/src/modules/msgbus/msgbus_audit.c +++ b/src/modules/msgbus/msgbus_audit.c @@ -11,7 +11,7 @@ static int _log_dom = -1; #define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__) static Eldbus_Message * -cb_audit_timer_dump(const Eldbus_Service_Interface *iface __UNUSED__, +cb_audit_timer_dump(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { Eldbus_Message *reply = eldbus_message_method_return_new(msg); diff --git a/src/modules/msgbus/msgbus_desktop.c b/src/modules/msgbus/msgbus_desktop.c index 0b35c76dde..1fce331239 100644 --- a/src/modules/msgbus/msgbus_desktop.c +++ b/src/modules/msgbus/msgbus_desktop.c @@ -11,7 +11,7 @@ static int _log_dom = -1; #define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__) static Eldbus_Message * -cb_virtual_desktops(const Eldbus_Service_Interface *iface __UNUSED__, +cb_virtual_desktops(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { Eldbus_Message *reply = eldbus_message_method_return_new(msg); @@ -24,7 +24,7 @@ cb_virtual_desktops(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -cb_desktop_show(const Eldbus_Service_Interface *iface __UNUSED__, +cb_desktop_show(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { int x, y; @@ -45,7 +45,7 @@ cb_desktop_show(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -cb_desktop_show_by_name(const Eldbus_Service_Interface *iface __UNUSED__, +cb_desktop_show_by_name(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { Eldbus_Message *reply = eldbus_message_method_return_new(msg); @@ -77,7 +77,7 @@ cb_desktop_show_by_name(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -cb_desktop_lock(const Eldbus_Service_Interface *iface __UNUSED__, +cb_desktop_lock(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { DBG("desklock requested"); @@ -87,7 +87,7 @@ cb_desktop_lock(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -cb_desktop_unlock(const Eldbus_Service_Interface *iface __UNUSED__, +cb_desktop_unlock(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { DBG("deskunlock requested"); @@ -97,7 +97,7 @@ cb_desktop_unlock(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -cb_desktop_bgadd(const Eldbus_Service_Interface *iface __UNUSED__, +cb_desktop_bgadd(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { int manager, zone, desk_x, desk_y; @@ -121,7 +121,7 @@ cb_desktop_bgadd(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -cb_desktop_bgdel(const Eldbus_Service_Interface *iface __UNUSED__, +cb_desktop_bgdel(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { int manager, zone, desk_x, desk_y; @@ -144,7 +144,7 @@ cb_desktop_bgdel(const Eldbus_Service_Interface *iface __UNUSED__, } static Eldbus_Message * -cb_desktop_bglist(const Eldbus_Service_Interface *iface __UNUSED__, +cb_desktop_bglist(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { Eina_List *list; diff --git a/src/modules/msgbus/msgbus_lang.c b/src/modules/msgbus/msgbus_lang.c index e603bcadbd..5489145b6a 100644 --- a/src/modules/msgbus/msgbus_lang.c +++ b/src/modules/msgbus/msgbus_lang.c @@ -11,7 +11,7 @@ static int _log_dom = -1; #define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__) static Eldbus_Message * -cb_langs(const Eldbus_Service_Interface *iface __UNUSED__, +cb_langs(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { Eldbus_Message *reply = eldbus_message_method_return_new(msg); diff --git a/src/modules/music-control/ui.c b/src/modules/music-control/ui.c index 3fe05c9bf8..c61b6c29ff 100644 --- a/src/modules/music-control/ui.c +++ b/src/modules/music-control/ui.c @@ -73,7 +73,7 @@ music_control_metadata_update_all(E_Music_Control_Module_Context *ctxt) } static void -_btn_clicked(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source) +_btn_clicked(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source) { E_Music_Control_Instance *inst = data; if (!strcmp(source, "play")) @@ -85,7 +85,7 @@ _btn_clicked(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNU } static void -_label_clicked(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_label_clicked(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Music_Control_Instance *inst = data; music_control_popup_del(inst); @@ -193,7 +193,7 @@ _cfg_data_create(E_Config_Dialog *cfd) } static void -_cfg_data_free(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_cfg_data_free(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { free(cfdata); } @@ -233,7 +233,7 @@ _cfg_data_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } static void -_cb_menu_cfg(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__) +_cb_menu_cfg(void *data, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) { E_Config_Dialog_View *v; @@ -250,7 +250,7 @@ _cb_menu_cfg(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__) } void -music_control_mouse_down_cb(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +music_control_mouse_down_cb(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { E_Music_Control_Instance *inst = data; Evas_Event_Mouse_Down *ev = event; diff --git a/src/modules/notification/e_mod_config.c b/src/modules/notification/e_mod_config.c index 20c3b3ecd2..2d5204ddc7 100644 --- a/src/modules/notification/e_mod_config.c +++ b/src/modules/notification/e_mod_config.c @@ -26,11 +26,11 @@ static int _basic_apply(E_Config_Dialog *cfd, static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static void _force_timeout_changed(void *data, - Evas_Object *obj __UNUSED__); + Evas_Object *obj EINA_UNUSED); E_Config_Dialog * e_int_config_notification_module(Evas_Object *parent EINA_UNUSED, - const char *params __UNUSED__) + const char *params EINA_UNUSED) { E_Config_Dialog *cfd = NULL; E_Config_Dialog_View *v = NULL; @@ -56,7 +56,7 @@ e_int_config_notification_module(Evas_Object *parent EINA_UNUSED, /* local functions */ static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata = NULL; @@ -66,7 +66,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { notification_cfg->cfd = NULL; @@ -87,7 +87,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { @@ -168,7 +168,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { notification_cfg->show_low = cfdata->show_low; @@ -185,7 +185,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { return @@ -201,7 +201,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, static void _force_timeout_changed(void *data, - Evas_Object *obj __UNUSED__) + Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; diff --git a/src/modules/notification/e_mod_main.c b/src/modules/notification/e_mod_main.c index f0b6543b6a..5d15a6ab5c 100644 --- a/src/modules/notification/e_mod_main.c +++ b/src/modules/notification/e_mod_main.c @@ -87,8 +87,8 @@ _notification_show_offline(Eina_Bool enabled) static Eina_Bool _notification_cb_config_mode_changed(Config *m_cfg, - int type __UNUSED__, - void *event __UNUSED__) + int type EINA_UNUSED, + void *event EINA_UNUSED) { if (m_cfg->last_config_mode.presentation != e_config->mode.presentation) { @@ -214,7 +214,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { if (notification_cfg->initial_mode_timer) ecore_timer_del(notification_cfg->initial_mode_timer); @@ -238,7 +238,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return e_config_domain_save("module.notification", conf_edd, notification_cfg); } diff --git a/src/modules/notification/e_mod_popup.c b/src/modules/notification/e_mod_popup.c index bfaca071b3..db4f899d15 100644 --- a/src/modules/notification/e_mod_popup.c +++ b/src/modules/notification/e_mod_popup.c @@ -202,9 +202,9 @@ notification_popup_close(unsigned int id) static void _notification_theme_cb_deleted(Popup_Data *popup, - Evas_Object *obj __UNUSED__, - const char *emission __UNUSED__, - const char *source __UNUSED__) + Evas_Object *obj EINA_UNUSED, + const char *emission EINA_UNUSED, + const char *source EINA_UNUSED) { _notification_popup_refresh(popup); edje_object_signal_emit(popup->theme, "notification,new", "notification"); @@ -212,18 +212,18 @@ _notification_theme_cb_deleted(Popup_Data *popup, static void _notification_theme_cb_close(Popup_Data *popup, - Evas_Object *obj __UNUSED__, - const char *emission __UNUSED__, - const char *source __UNUSED__) + Evas_Object *obj EINA_UNUSED, + const char *emission EINA_UNUSED, + const char *source EINA_UNUSED) { _notification_popup_del(popup->id, E_NOTIFICATION_NOTIFY_CLOSED_REASON_DISMISSED); } static void _notification_theme_cb_find(Popup_Data *popup, - Evas_Object *obj __UNUSED__, - const char *emission __UNUSED__, - const char *source __UNUSED__) + Evas_Object *obj EINA_UNUSED, + const char *emission EINA_UNUSED, + const char *source EINA_UNUSED) { const Eina_List *l; E_Client *ec; diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c index 75dd80c4a7..391c0ca4b6 100644 --- a/src/modules/pager/e_mod_config.c +++ b/src/modules/pager/e_mod_config.c @@ -36,13 +36,13 @@ struct _E_Config_Dialog_Data /* local function prototypes */ static void *_create_data(E_Config_Dialog *cfd); static void _fill_data(E_Config_Dialog_Data *cfdata); -static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static int _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static Evas_Object *_adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static int _adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); +static void _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static int _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static Evas_Object *_adv_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _adv_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static int _adv_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); static void _update_btns(E_Config_Dialog_Data *cfdata); static void _update_btn(E_Config_Dialog_Data *cfdata, Evas_Object *button, const int mouse_button); static void _grab_window_show(void *data1, void *data2); @@ -78,7 +78,7 @@ _config_pager_module(Config_Item *ci) /* local function prototypes */ static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -107,7 +107,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { cfdata->gui.popup_list = eina_list_free(cfdata->gui.popup_list); cfdata->gui.urgent_list = eina_list_free(cfdata->gui.urgent_list); @@ -146,7 +146,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { pager_config->popup = cfdata->popup.show; pager_config->flip_desk = cfdata->flip_desk; @@ -158,7 +158,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if ((int)pager_config->popup != cfdata->popup.show) return 1; if ((int)pager_config->flip_desk != cfdata->flip_desk) return 1; @@ -289,7 +289,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) } static int -_adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_adv_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { pager_config->popup = cfdata->popup.show; pager_config->popup_speed = cfdata->popup.speed; @@ -311,7 +311,7 @@ _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_adv_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if ((int)pager_config->popup != cfdata->popup.show) return 1; if (pager_config->popup_speed != cfdata->popup.speed) return 1; @@ -439,7 +439,7 @@ _grab_window_show(void *data1, void *data2) } static Eina_Bool -_grab_cb_mouse_down(void *data, __UNUSED__ int type, void *event) +_grab_cb_mouse_down(void *data, EINA_UNUSED int type, void *event) { E_Config_Dialog_Data *cfdata = NULL; Ecore_Event_Mouse_Button *ev; @@ -476,7 +476,7 @@ _grab_cb_mouse_down(void *data, __UNUSED__ int type, void *event) } static Eina_Bool -_grab_cb_key_down(void *data, __UNUSED__ int type, void *event) +_grab_cb_key_down(void *data, EINA_UNUSED int type, void *event) { E_Config_Dialog_Data *cfdata = NULL; Ecore_Event_Key *ev; diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c index 000ddb594a..530d5bb1fc 100644 --- a/src/modules/pager/e_mod_main.c +++ b/src/modules/pager/e_mod_main.c @@ -4,10 +4,10 @@ /* gadcon requirements */ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); -static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__); -static const char *_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__); -static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas); -static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__); +static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED); +static const char *_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED); +static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas); +static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED); /* and actually define the gadcon class that this module provides (just 1) */ static const E_Gadcon_Client_Class _gadcon_class = @@ -100,31 +100,31 @@ struct _Pager_Popup static void _pager_cb_mirror_add(Pager_Desk *pd, Evas_Object *obj, Evas_Object *mirror); -static void _pager_cb_obj_moveresize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__); -static void _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); -static void _pager_inst_cb_menu_configure(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__); -static void _pager_inst_cb_menu_virtual_desktops_dialog(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__); +static void _pager_cb_obj_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _button_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); +static void _pager_inst_cb_menu_configure(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED); +static void _pager_inst_cb_menu_virtual_desktops_dialog(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED); static void _pager_instance_drop_zone_recalc(Instance *inst); -static Eina_Bool _pager_cb_event_desk_show(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_desk_name_change(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_compositor_resize(void *data __UNUSED__, int type __UNUSED__, void *event); +static Eina_Bool _pager_cb_event_desk_show(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_desk_name_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_compositor_resize(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); static void _pager_window_cb_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); -static void _pager_window_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); -static void _pager_window_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); -static void _pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); +static void _pager_window_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); +static void _pager_window_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); +static void _pager_window_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); static void *_pager_window_cb_drag_convert(E_Drag *drag, const char *type); static void _pager_window_cb_drag_finished(E_Drag *drag, int dropped); -static void _pager_drop_cb_enter(void *data, const char *type __UNUSED__, void *event_info); -static void _pager_drop_cb_move(void *data, const char *type __UNUSED__, void *event_info); -static void _pager_drop_cb_leave(void *data, const char *type __UNUSED__, void *event_info __UNUSED__); +static void _pager_drop_cb_enter(void *data, const char *type EINA_UNUSED, void *event_info); +static void _pager_drop_cb_move(void *data, const char *type EINA_UNUSED, void *event_info); +static void _pager_drop_cb_leave(void *data, const char *type EINA_UNUSED, void *event_info EINA_UNUSED); static void _pager_drop_cb_drop(void *data, const char *type, void *event_info); static void _pager_inst_cb_scroll(void *data); static void _pager_update_drop_position(Pager *p, Evas_Coord x, Evas_Coord y); -static void _pager_desk_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); -static void _pager_desk_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); -static void _pager_desk_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); +static void _pager_desk_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); +static void _pager_desk_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); +static void _pager_desk_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); static void _pager_desk_cb_drag_finished(E_Drag *drag, int dropped); -static void _pager_desk_cb_mouse_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); +static void _pager_desk_cb_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); static Eina_Bool _pager_popup_cb_timeout(void *data); static Pager *_pager_new(Evas *evas, E_Zone *zone, E_Gadcon *gc); static void _pager_free(Pager *p); @@ -145,13 +145,13 @@ static Pager_Popup *_pager_popup_find(E_Zone *zone); /* functions for pager popup on key actions */ static int _pager_popup_show(void); static void _pager_popup_hide(int switch_desk); -static Eina_Bool _pager_popup_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event); +static Eina_Bool _pager_popup_cb_mouse_wheel(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); static void _pager_popup_desk_switch(int x, int y); static void _pager_popup_modifiers_set(int mod); -static Eina_Bool _pager_popup_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_popup_cb_key_up(void *data __UNUSED__, int type __UNUSED__, void *event); -static void _pager_popup_cb_action_show(E_Object *obj __UNUSED__, const char *params __UNUSED__, Ecore_Event_Key *ev __UNUSED__); -static void _pager_popup_cb_action_switch(E_Object *obj __UNUSED__, const char *params, Ecore_Event_Key *ev); +static Eina_Bool _pager_popup_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_popup_cb_key_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static void _pager_popup_cb_action_show(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED, Ecore_Event_Key *ev EINA_UNUSED); +static void _pager_popup_cb_action_switch(E_Object *obj EINA_UNUSED, const char *params, Ecore_Event_Key *ev); /* variables for pager popup on key actions */ static E_Action *act_popup_show = NULL; @@ -252,7 +252,7 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { Instance *inst; int aspect_w, aspect_h; @@ -280,13 +280,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("Pager"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o; char buf[PATH_MAX]; @@ -827,7 +827,7 @@ _pager_popup_find(E_Zone *zone) } static void -_pager_cb_obj_moveresize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_pager_cb_obj_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Instance *inst; @@ -836,7 +836,7 @@ _pager_cb_obj_moveresize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS } static void -_button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_button_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Instance *inst; Evas_Event_Mouse_Down *ev; @@ -874,7 +874,7 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_ } static void -_pager_inst_cb_menu_configure(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_pager_inst_cb_menu_configure(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { if (!pager_config) return; if (pager_config->config_dialog) return; @@ -883,7 +883,7 @@ _pager_inst_cb_menu_configure(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Men } static E_Config_Dialog * -_pager_config_dialog(Evas_Object *parent __UNUSED__, const char *params __UNUSED__) +_pager_config_dialog(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { if (!pager_config) return NULL; if (pager_config->config_dialog) return NULL; @@ -893,7 +893,7 @@ _pager_config_dialog(Evas_Object *parent __UNUSED__, const char *params __UNUSED } static void -_pager_inst_cb_menu_virtual_desktops_dialog(void *data EINA_UNUSED, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_pager_inst_cb_menu_virtual_desktops_dialog(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_configure_registry_call("screen/virtual_desktops", NULL, NULL); } @@ -938,7 +938,7 @@ _pager_cb_mirror_add(Pager_Desk *pd, Evas_Object *obj EINA_UNUSED, Evas_Object * } static Eina_Bool -_pager_cb_event_zone_desk_count_set(void *data __UNUSED__, int type __UNUSED__, E_Event_Zone_Desk_Count_Set *ev) +_pager_cb_event_zone_desk_count_set(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Zone_Desk_Count_Set *ev) { Eina_List *l; Pager *p; @@ -956,7 +956,7 @@ _pager_cb_event_zone_desk_count_set(void *data __UNUSED__, int type __UNUSED__, } static Eina_Bool -_pager_cb_event_desk_show(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_desk_show(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Desk_Show *ev = event; Eina_List *l; @@ -991,7 +991,7 @@ _pager_cb_event_desk_show(void *data __UNUSED__, int type __UNUSED__, void *even } static Eina_Bool -_pager_cb_event_desk_name_change(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_desk_name_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Desk_Name_Change *ev = event; Eina_List *l; @@ -1046,7 +1046,7 @@ _pager_cb_event_client_urgent_change(void *data EINA_UNUSED, int type EINA_UNUSE } static Eina_Bool -_pager_cb_event_compositor_resize(void *data __UNUSED__, int type __UNUSED__, void *event EINA_UNUSED) +_pager_cb_event_compositor_resize(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { Eina_List *l; Pager *p; @@ -1077,7 +1077,7 @@ _pager_window_cb_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUS } static void -_pager_window_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info EINA_UNUSED) +_pager_window_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Pager_Win *pw = data; @@ -1085,7 +1085,7 @@ _pager_window_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU } static void -_pager_window_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_pager_window_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; Pager_Win *pw; @@ -1116,7 +1116,7 @@ _pager_window_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __U } static void -_pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_pager_window_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev; Pager_Win *pw; @@ -1322,7 +1322,7 @@ _pager_update_drop_position(Pager *p, Evas_Coord x, Evas_Coord y) } static void -_pager_drop_cb_enter(void *data, const char *type __UNUSED__, void *event_info EINA_UNUSED) +_pager_drop_cb_enter(void *data, const char *type EINA_UNUSED, void *event_info EINA_UNUSED) { Pager *p = data; @@ -1338,7 +1338,7 @@ _pager_drop_cb_enter(void *data, const char *type __UNUSED__, void *event_info E } static void -_pager_drop_cb_move(void *data, const char *type __UNUSED__, void *event_info) +_pager_drop_cb_move(void *data, const char *type EINA_UNUSED, void *event_info) { E_Event_Dnd_Move *ev; Pager *p; @@ -1355,7 +1355,7 @@ _pager_drop_cb_move(void *data, const char *type __UNUSED__, void *event_info) } static void -_pager_drop_cb_leave(void *data, const char *type __UNUSED__, void *event_info __UNUSED__) +_pager_drop_cb_leave(void *data, const char *type EINA_UNUSED, void *event_info EINA_UNUSED) { Pager *p = data; @@ -1467,7 +1467,7 @@ _pager_drop_cb_drop(void *data, const char *type, void *event_info) } static void -_pager_desk_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_pager_desk_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; Pager_Desk *pd; @@ -1496,7 +1496,7 @@ _pager_desk_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU } static void -_pager_desk_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_pager_desk_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Up *ev; Pager_Desk *pd; @@ -1523,7 +1523,7 @@ _pager_desk_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE } static void -_pager_desk_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_pager_desk_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev; Pager_Desk *pd; @@ -1617,7 +1617,7 @@ _pager_desk_cb_drag_finished(E_Drag *drag, int dropped) } static void -_pager_desk_cb_mouse_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_pager_desk_cb_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Wheel *ev; Pager_Desk *pd; @@ -1764,14 +1764,14 @@ _pager_popup_desk_switch(int x, int y) } static void -_pager_popup_cb_action_show(E_Object *obj __UNUSED__, const char *params __UNUSED__, Ecore_Event_Key *ev __UNUSED__) +_pager_popup_cb_action_show(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED, Ecore_Event_Key *ev EINA_UNUSED) { if (_pager_popup_show()) _pager_popup_modifiers_set(ev->modifiers); } static void -_pager_popup_cb_action_switch(E_Object *obj __UNUSED__, const char *params, Ecore_Event_Key *ev) +_pager_popup_cb_action_switch(E_Object *obj EINA_UNUSED, const char *params, Ecore_Event_Key *ev) { int max_x, max_y, desk_x; int x = 0, y = 0; @@ -1812,7 +1812,7 @@ _pager_popup_cb_action_switch(E_Object *obj __UNUSED__, const char *params, Ecor } static Eina_Bool -_pager_popup_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_popup_cb_mouse_wheel(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Wheel *ev = event; Pager_Popup *pp = act_popup; @@ -1831,7 +1831,7 @@ _pager_popup_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *ev } static Eina_Bool -_pager_popup_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_popup_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Key *ev; @@ -1902,7 +1902,7 @@ _pager_popup_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event } static Eina_Bool -_pager_popup_cb_key_up(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_popup_cb_key_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Key *ev; @@ -2077,7 +2077,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_gadcon_provider_unregister(&_gadcon_class); @@ -2103,7 +2103,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.pager", conf_edd, pager_config); return 1; diff --git a/src/modules/pager_plain/e_mod_config.c b/src/modules/pager_plain/e_mod_config.c index 57846a18cb..91191232a0 100644 --- a/src/modules/pager_plain/e_mod_config.c +++ b/src/modules/pager_plain/e_mod_config.c @@ -36,13 +36,13 @@ struct _E_Config_Dialog_Data /* local function prototypes */ static void *_create_data(E_Config_Dialog *cfd); static void _fill_data(E_Config_Dialog_Data *cfdata); -static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static int _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static Evas_Object *_adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); -static int _adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); +static void _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static int _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static Evas_Object *_adv_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _adv_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static int _adv_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); static void _update_btns(E_Config_Dialog_Data *cfdata); static void _update_btn(E_Config_Dialog_Data *cfdata, Evas_Object *button, const int mouse_button); static void _grab_window_show(void *data1, void *data2); @@ -78,7 +78,7 @@ _config_pager_module(Config_Item *ci) /* local function prototypes */ static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -108,7 +108,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { cfdata->gui.popup_list = eina_list_free(cfdata->gui.popup_list); cfdata->gui.urgent_list = eina_list_free(cfdata->gui.urgent_list); @@ -150,7 +150,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { pager_config->popup = cfdata->popup.show; pager_config->flip_desk = cfdata->flip_desk; @@ -163,7 +163,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if ((int)pager_config->popup != cfdata->popup.show) return 1; if ((int)pager_config->flip_desk != cfdata->flip_desk) return 1; @@ -298,7 +298,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) } static int -_adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_adv_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { pager_config->popup = cfdata->popup.show; pager_config->popup_speed = cfdata->popup.speed; @@ -321,7 +321,7 @@ _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_adv_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if ((int)pager_config->popup != cfdata->popup.show) return 1; if (pager_config->popup_speed != cfdata->popup.speed) return 1; @@ -450,7 +450,7 @@ _grab_window_show(void *data1, void *data2) } static Eina_Bool -_grab_cb_mouse_down(void *data, __UNUSED__ int type, void *event) +_grab_cb_mouse_down(void *data, EINA_UNUSED int type, void *event) { E_Config_Dialog_Data *cfdata = NULL; Ecore_Event_Mouse_Button *ev; @@ -487,7 +487,7 @@ _grab_cb_mouse_down(void *data, __UNUSED__ int type, void *event) } static Eina_Bool -_grab_cb_key_down(void *data, __UNUSED__ int type, void *event) +_grab_cb_key_down(void *data, EINA_UNUSED int type, void *event) { E_Config_Dialog_Data *cfdata = NULL; Ecore_Event_Key *ev; diff --git a/src/modules/pager_plain/e_mod_main.c b/src/modules/pager_plain/e_mod_main.c index dea0423f4d..26adfc2f84 100644 --- a/src/modules/pager_plain/e_mod_main.c +++ b/src/modules/pager_plain/e_mod_main.c @@ -4,10 +4,10 @@ /* gadcon requirements */ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); -static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__); -static const char *_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__); -static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas); -static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__); +static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED); +static const char *_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED); +static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas); +static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED); /* and actually define the gadcon class that this module provides (just 1) */ static const E_Gadcon_Client_Class _gadcon_class = @@ -98,47 +98,47 @@ struct _Pager_Popup }; static void _pager_desk_livethumb_setup(Pager_Desk *pd); -static void _pager_cb_obj_moveresize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__); -static void _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); -static void _pager_inst_cb_menu_configure(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__); -static void _pager_inst_cb_menu_virtual_desktops_dialog(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__); +static void _pager_cb_obj_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _button_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); +static void _pager_inst_cb_menu_configure(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED); +static void _pager_inst_cb_menu_virtual_desktops_dialog(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED); static void _pager_instance_drop_zone_recalc(Instance *inst); -static Eina_Bool _pager_cb_event_bg_update(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_client_resize(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_client_move(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_client_add(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_client_remove(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_client_iconify(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_client_uniconify(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_client_stick(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_client_unstick(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_client_desk_set(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_client_stack(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_client_icon_change(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_client_urgent_change(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_client_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_client_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_client_property(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_zone_desk_count_set(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_desk_show(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_desk_name_change(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_cb_event_compositor_resize(void *data __UNUSED__, int type __UNUSED__, void *event); -static void _pager_window_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); -static void _pager_window_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); -static void _pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); +static Eina_Bool _pager_cb_event_bg_update(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_client_resize(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_client_move(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_client_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_client_remove(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_client_iconify(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_client_uniconify(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_client_stick(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_client_unstick(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_client_desk_set(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_client_stack(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_client_icon_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_client_urgent_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_client_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_client_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_client_property(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_zone_desk_count_set(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_desk_show(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_desk_name_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_cb_event_compositor_resize(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static void _pager_window_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); +static void _pager_window_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); +static void _pager_window_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); static void *_pager_window_cb_drag_convert(E_Drag *drag, const char *type); static void _pager_window_cb_drag_finished(E_Drag *drag, int dropped); -static void _pager_drop_cb_enter(void *data, const char *type __UNUSED__, void *event_info); -static void _pager_drop_cb_move(void *data, const char *type __UNUSED__, void *event_info); -static void _pager_drop_cb_leave(void *data, const char *type __UNUSED__, void *event_info __UNUSED__); +static void _pager_drop_cb_enter(void *data, const char *type EINA_UNUSED, void *event_info); +static void _pager_drop_cb_move(void *data, const char *type EINA_UNUSED, void *event_info); +static void _pager_drop_cb_leave(void *data, const char *type EINA_UNUSED, void *event_info EINA_UNUSED); static void _pager_drop_cb_drop(void *data, const char *type, void *event_info); static void _pager_inst_cb_scroll(void *data); static void _pager_update_drop_position(Pager *p, Evas_Coord x, Evas_Coord y); -static void _pager_desk_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); -static void _pager_desk_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); -static void _pager_desk_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); +static void _pager_desk_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); +static void _pager_desk_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); +static void _pager_desk_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); static void _pager_desk_cb_drag_finished(E_Drag *drag, int dropped); -static void _pager_desk_cb_mouse_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); +static void _pager_desk_cb_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); static Eina_Bool _pager_popup_cb_timeout(void *data); static Pager *_pager_new(Evas *evas, E_Zone *zone, E_Gadcon *gc); static void _pager_free(Pager *p); @@ -162,16 +162,16 @@ static Pager_Popup *_pager_popup_find(E_Zone *zone); /* functions for pager popup on key actions */ static int _pager_popup_show(void); static void _pager_popup_hide(int switch_desk); -static Eina_Bool _pager_popup_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_popup_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_popup_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_popup_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event); +static Eina_Bool _pager_popup_cb_mouse_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_popup_cb_mouse_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_popup_cb_mouse_move(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_popup_cb_mouse_wheel(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); static void _pager_popup_desk_switch(int x, int y); static void _pager_popup_modifiers_set(int mod); -static Eina_Bool _pager_popup_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _pager_popup_cb_key_up(void *data __UNUSED__, int type __UNUSED__, void *event); -static void _pager_popup_cb_action_show(E_Object *obj __UNUSED__, const char *params __UNUSED__, Ecore_Event_Key *ev __UNUSED__); -static void _pager_popup_cb_action_switch(E_Object *obj __UNUSED__, const char *params, Ecore_Event_Key *ev); +static Eina_Bool _pager_popup_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _pager_popup_cb_key_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static void _pager_popup_cb_action_show(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED, Ecore_Event_Key *ev EINA_UNUSED); +static void _pager_popup_cb_action_switch(E_Object *obj EINA_UNUSED, const char *params, Ecore_Event_Key *ev); /* variables for pager popup on key actions */ static E_Action *act_popup_show = NULL; @@ -242,7 +242,7 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { Instance *inst; int aspect_w, aspect_h; @@ -270,13 +270,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("Pager"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o; char buf[PATH_MAX]; @@ -842,7 +842,7 @@ _pager_popup_find(E_Zone *zone) } static void -_pager_cb_obj_moveresize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_pager_cb_obj_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Instance *inst; @@ -851,7 +851,7 @@ _pager_cb_obj_moveresize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS } static void -_button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_button_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Instance *inst; Evas_Event_Mouse_Down *ev; @@ -889,7 +889,7 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_ } static void -_pager_inst_cb_menu_configure(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_pager_inst_cb_menu_configure(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { if (!pager_config) return; if (pager_config->config_dialog) return; @@ -898,7 +898,7 @@ _pager_inst_cb_menu_configure(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Men } static E_Config_Dialog * -_pager_config_dialog(Evas_Object *parent __UNUSED__, const char *params __UNUSED__) +_pager_config_dialog(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { if (!pager_config) return NULL; if (pager_config->config_dialog) return NULL; @@ -908,7 +908,7 @@ _pager_config_dialog(Evas_Object *parent __UNUSED__, const char *params __UNUSED } static void -_pager_inst_cb_menu_virtual_desktops_dialog(void *data EINA_UNUSED, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_pager_inst_cb_menu_virtual_desktops_dialog(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_configure_registry_call("screen/virtual_desktops", NULL, NULL); } @@ -955,7 +955,7 @@ _pager_cb_config_updated(void) } static Eina_Bool -_pager_cb_event_client_resize(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_client_resize(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; Eina_List *l, *l2; @@ -978,7 +978,7 @@ _pager_cb_event_client_resize(void *data __UNUSED__, int type __UNUSED__, void * } static Eina_Bool -_pager_cb_event_client_move(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_client_move(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; Eina_List *l; @@ -1011,7 +1011,7 @@ _pager_cb_event_client_move(void *data __UNUSED__, int type __UNUSED__, void *ev } static Eina_Bool -_pager_cb_event_client_add(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_client_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; Eina_List *l; @@ -1035,7 +1035,7 @@ _pager_cb_event_client_add(void *data __UNUSED__, int type __UNUSED__, void *eve } static Eina_Bool -_pager_cb_event_client_remove(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_client_remove(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; Eina_List *l; @@ -1062,7 +1062,7 @@ _pager_cb_event_client_remove(void *data __UNUSED__, int type __UNUSED__, void * } static Eina_Bool -_pager_cb_event_client_iconify(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_client_iconify(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; Eina_List *l; @@ -1091,7 +1091,7 @@ _pager_cb_event_client_iconify(void *data __UNUSED__, int type __UNUSED__, void } static Eina_Bool -_pager_cb_event_client_uniconify(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_client_uniconify(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; Eina_List *l; @@ -1117,7 +1117,7 @@ _pager_cb_event_client_uniconify(void *data __UNUSED__, int type __UNUSED__, voi } static Eina_Bool -_pager_cb_event_client_stick(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_client_stick(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client_Property *ev = event; Eina_List *l; @@ -1146,7 +1146,7 @@ _pager_cb_event_client_stick(void *data __UNUSED__, int type __UNUSED__, void *e } static Eina_Bool -_pager_cb_event_client_unstick(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_client_unstick(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client_Property *ev = event; Eina_List *l; @@ -1296,7 +1296,7 @@ _pager_window_desk_change(Pager *pager, E_Client *ec) } static Eina_Bool -_pager_cb_event_client_desk_set(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_client_desk_set(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client_Desk_Set *ev = event; Eina_List *l; @@ -1309,7 +1309,7 @@ _pager_cb_event_client_desk_set(void *data __UNUSED__, int type __UNUSED__, void } static Eina_Bool -_pager_cb_event_client_stack(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_client_stack(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; Eina_List *l; @@ -1352,7 +1352,7 @@ _pager_cb_event_client_stack(void *data __UNUSED__, int type __UNUSED__, void *e } static Eina_Bool -_pager_cb_event_client_icon_change(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_client_icon_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client_Property *ev = event; Eina_List *l; @@ -1396,7 +1396,7 @@ _pager_cb_event_client_icon_change(void *data __UNUSED__, int type __UNUSED__, v } static Eina_Bool -_pager_cb_event_client_urgent_change(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_client_urgent_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client_Property *ev = event; Eina_List *l, *l2; @@ -1465,7 +1465,7 @@ _pager_cb_event_client_urgent_change(void *data __UNUSED__, int type __UNUSED__, } static Eina_Bool -_pager_cb_event_client_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_client_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; Instance *inst; @@ -1511,7 +1511,7 @@ _pager_cb_event_client_focus_in(void *data __UNUSED__, int type __UNUSED__, void } static Eina_Bool -_pager_cb_event_client_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_client_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; Eina_List *l; @@ -1559,7 +1559,7 @@ _pager_cb_event_client_focus_out(void *data __UNUSED__, int type __UNUSED__, voi } static Eina_Bool -_pager_cb_event_client_property(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_client_property(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client_Property *ev = event; Eina_List *l, *l2; @@ -1648,7 +1648,7 @@ _pager_cb_event_client_property(void *data __UNUSED__, int type __UNUSED__, void } static Eina_Bool -_pager_cb_event_zone_desk_count_set(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_pager_cb_event_zone_desk_count_set(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { Eina_List *l; Pager *p; @@ -1664,7 +1664,7 @@ _pager_cb_event_zone_desk_count_set(void *data __UNUSED__, int type __UNUSED__, } static Eina_Bool -_pager_cb_event_desk_show(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_desk_show(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Desk_Show *ev = event; Eina_List *l; @@ -1699,7 +1699,7 @@ _pager_cb_event_desk_show(void *data __UNUSED__, int type __UNUSED__, void *even } static Eina_Bool -_pager_cb_event_desk_name_change(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_desk_name_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Desk_Name_Change *ev = event; Eina_List *l; @@ -1728,7 +1728,7 @@ _pager_cb_event_desk_name_change(void *data __UNUSED__, int type __UNUSED__, voi } static Eina_Bool -_pager_cb_event_bg_update(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_cb_event_bg_update(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Bg_Update *ev = event; Eina_List *l, *ll; @@ -1759,7 +1759,7 @@ _pager_cb_event_bg_update(void *data __UNUSED__, int type __UNUSED__, void *even } static Eina_Bool -_pager_cb_event_compositor_resize(void *data __UNUSED__, int type __UNUSED__, void *event EINA_UNUSED) +_pager_cb_event_compositor_resize(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { Eina_List *l; Pager *p; @@ -1781,7 +1781,7 @@ _pager_cb_event_compositor_resize(void *data __UNUSED__, int type __UNUSED__, vo } static void -_pager_window_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_pager_window_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; Pager_Win *pw; @@ -1810,7 +1810,7 @@ _pager_window_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __U } static void -_pager_window_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_pager_window_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Up *ev; Pager_Win *pw; @@ -1840,7 +1840,7 @@ _pager_window_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU } static void -_pager_window_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_pager_window_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev; Pager_Win *pw; @@ -2056,7 +2056,7 @@ _pager_update_drop_position(Pager *p, Evas_Coord x, Evas_Coord y) } static void -_pager_drop_cb_enter(void *data, const char *type __UNUSED__, void *event_info EINA_UNUSED) +_pager_drop_cb_enter(void *data, const char *type EINA_UNUSED, void *event_info EINA_UNUSED) { Pager *p = data; @@ -2072,7 +2072,7 @@ _pager_drop_cb_enter(void *data, const char *type __UNUSED__, void *event_info E } static void -_pager_drop_cb_move(void *data, const char *type __UNUSED__, void *event_info) +_pager_drop_cb_move(void *data, const char *type EINA_UNUSED, void *event_info) { E_Event_Dnd_Move *ev; Pager *p; @@ -2089,7 +2089,7 @@ _pager_drop_cb_move(void *data, const char *type __UNUSED__, void *event_info) } static void -_pager_drop_cb_leave(void *data, const char *type __UNUSED__, void *event_info __UNUSED__) +_pager_drop_cb_leave(void *data, const char *type EINA_UNUSED, void *event_info EINA_UNUSED) { Pager *p = data; @@ -2202,7 +2202,7 @@ _pager_drop_cb_drop(void *data, const char *type, void *event_info) } static void -_pager_desk_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_pager_desk_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; Pager_Desk *pd; @@ -2231,7 +2231,7 @@ _pager_desk_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU } static void -_pager_desk_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_pager_desk_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Up *ev; Pager_Desk *pd; @@ -2258,7 +2258,7 @@ _pager_desk_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE } static void -_pager_desk_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_pager_desk_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Move *ev; Pager_Desk *pd; @@ -2391,7 +2391,7 @@ _pager_desk_cb_drag_finished(E_Drag *drag, int dropped) } static void -_pager_desk_cb_mouse_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_pager_desk_cb_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Wheel *ev; Pager_Desk *pd; @@ -2547,14 +2547,14 @@ _pager_popup_desk_switch(int x, int y) } static void -_pager_popup_cb_action_show(E_Object *obj __UNUSED__, const char *params __UNUSED__, Ecore_Event_Key *ev __UNUSED__) +_pager_popup_cb_action_show(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED, Ecore_Event_Key *ev EINA_UNUSED) { if (_pager_popup_show()) _pager_popup_modifiers_set(ev->modifiers); } static void -_pager_popup_cb_action_switch(E_Object *obj __UNUSED__, const char *params, Ecore_Event_Key *ev) +_pager_popup_cb_action_switch(E_Object *obj EINA_UNUSED, const char *params, Ecore_Event_Key *ev) { int max_x, max_y, desk_x; int x = 0, y = 0; @@ -2595,7 +2595,7 @@ _pager_popup_cb_action_switch(E_Object *obj __UNUSED__, const char *params, Ecor } static Eina_Bool -_pager_popup_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_popup_cb_mouse_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Button *ev; Pager_Popup *pp = act_popup; @@ -2609,7 +2609,7 @@ _pager_popup_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *eve } static Eina_Bool -_pager_popup_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_popup_cb_mouse_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Button *ev; Pager_Popup *pp = act_popup; @@ -2623,7 +2623,7 @@ _pager_popup_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event } static Eina_Bool -_pager_popup_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_popup_cb_mouse_move(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Move *ev; Pager_Popup *pp = act_popup; @@ -2641,7 +2641,7 @@ _pager_popup_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *eve } static Eina_Bool -_pager_popup_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_popup_cb_mouse_wheel(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Wheel *ev = event; Pager_Popup *pp = act_popup; @@ -2660,7 +2660,7 @@ _pager_popup_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *ev } static Eina_Bool -_pager_popup_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_popup_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Key *ev; @@ -2731,7 +2731,7 @@ _pager_popup_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event } static Eina_Bool -_pager_popup_cb_key_up(void *data __UNUSED__, int type __UNUSED__, void *event) +_pager_popup_cb_key_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Key *ev; @@ -2924,7 +2924,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_gadcon_provider_unregister(&_gadcon_class); @@ -2950,7 +2950,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.pager_plain", conf_edd, pager_config); return 1; diff --git a/src/modules/quickaccess/e_mod_config.c b/src/modules/quickaccess/e_mod_config.c index 5db0dc1b71..3898bbbd5b 100644 --- a/src/modules/quickaccess/e_mod_config.c +++ b/src/modules/quickaccess/e_mod_config.c @@ -102,7 +102,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_Inlist *l; Config_Entry *ce; @@ -115,7 +115,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_advanced_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Config_Entry *ce; #define CHECK(X) \ @@ -134,7 +134,7 @@ _advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *c } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { #define CHECK(X) \ if (cfdata->X != qa_config->X) return 1 @@ -200,7 +200,7 @@ _rename_ok(void *data, char *text) } static void -_list_delete(void *data __UNUSED__, void *list) +_list_delete(void *data EINA_UNUSED, void *list) { Config_Entry *ce; @@ -352,7 +352,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia static int -_advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_advanced_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Config_Entry *ce; Eina_Bool entry_changed = EINA_FALSE, transient_changed = EINA_FALSE; @@ -390,7 +390,7 @@ _advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfd } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { #define SET(X) qa_config->X = cfdata->X SET(autohide); @@ -538,7 +538,7 @@ e_qa_config_entry_add(E_Quick_Access_Entry *entry) } E_Config_Dialog * -e_int_config_qa_module(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_qa_module(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; diff --git a/src/modules/quickaccess/e_mod_main.c b/src/modules/quickaccess/e_mod_main.c index b9038c4ddc..485d7b99a3 100644 --- a/src/modules/quickaccess/e_mod_main.c +++ b/src/modules/quickaccess/e_mod_main.c @@ -84,14 +84,14 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { _e_modapi_shutdown(); return 1; } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.quickaccess", conf_edd, qa_config); return 1; diff --git a/src/modules/quickaccess/e_mod_main.h b/src/modules/quickaccess/e_mod_main.h index 1fd37a0c84..5b3013ddc8 100644 --- a/src/modules/quickaccess/e_mod_main.h +++ b/src/modules/quickaccess/e_mod_main.h @@ -93,12 +93,12 @@ void *e_qa_config_dd_free(void); void e_qa_config_entry_free(E_Quick_Access_Entry *entry); void e_qa_config_entry_add(E_Quick_Access_Entry *entry); void e_qa_config_entry_transient_convert(E_Quick_Access_Entry *entry); -E_Config_Dialog *e_int_config_qa_module(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_qa_module(Evas_Object *parent, const char *params EINA_UNUSED); char *e_qa_db_class_lookup(const char *class); void e_qa_entry_bindings_cleanup(E_Quick_Access_Entry *entry); void e_qa_entry_bindings_rename(E_Quick_Access_Entry *entry, const char *name); -EAPI int e_modapi_shutdown(E_Module *m __UNUSED__); +EAPI int e_modapi_shutdown(E_Module *m EINA_UNUSED); #endif diff --git a/src/modules/quickaccess/e_mod_quickaccess.c b/src/modules/quickaccess/e_mod_quickaccess.c index 05ca7c3b84..36a65fcc4c 100644 --- a/src/modules/quickaccess/e_mod_quickaccess.c +++ b/src/modules/quickaccess/e_mod_quickaccess.c @@ -140,7 +140,7 @@ _e_qa_entry_find_match(const E_Client *ec, Eina_Bool nontrans) } static Eina_Bool -_e_qa_event_exe_del_cb(void *data, int type __UNUSED__, Ecore_Exe_Event_Del *ev) +_e_qa_event_exe_del_cb(void *data, int type EINA_UNUSED, Ecore_Exe_Event_Del *ev) { E_Quick_Access_Entry *entry; @@ -156,7 +156,7 @@ _e_qa_event_exe_del_cb(void *data, int type __UNUSED__, Ecore_Exe_Event_Del *ev) } static void -_e_qa_entry_border_props_restore(E_Quick_Access_Entry *entry __UNUSED__, E_Client *ec) +_e_qa_entry_border_props_restore(E_Quick_Access_Entry *entry EINA_UNUSED, E_Client *ec) { #undef SET #define SET(X) \ @@ -469,19 +469,19 @@ _e_qa_border_new(E_Quick_Access_Entry *entry) } static void -_e_qa_del_cb(E_Object *obj __UNUSED__, const char *params __UNUSED__) +_e_qa_del_cb(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED) { _e_qa_bd_menu_del(_e_qa_entry_find_border(e_client_focused_get()), NULL, NULL); } static void -_e_qa_add_cb(E_Object *obj __UNUSED__, const char *params __UNUSED__) +_e_qa_add_cb(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED) { _e_qa_bd_menu_del(e_client_focused_get(), NULL, NULL); } static void -_e_qa_toggle_cb(E_Object *obj __UNUSED__, const char *params) +_e_qa_toggle_cb(E_Object *obj EINA_UNUSED, const char *params) { E_Quick_Access_Entry *entry; @@ -533,7 +533,7 @@ _e_qa_client_is_valid(const E_Client *ec) } static void -_e_qa_border_eval_pre_post_fetch_cb(void *data __UNUSED__, E_Client *ec) +_e_qa_border_eval_pre_post_fetch_cb(void *data EINA_UNUSED, E_Client *ec) { E_Quick_Access_Entry *entry; @@ -546,7 +546,7 @@ _e_qa_border_eval_pre_post_fetch_cb(void *data __UNUSED__, E_Client *ec) } static Eina_Bool -_e_qa_event_border_focus_out_cb(void *data __UNUSED__, int type __UNUSED__, E_Event_Client *ev) +_e_qa_event_border_focus_out_cb(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Client *ev) { E_Quick_Access_Entry *entry; @@ -609,7 +609,7 @@ _e_qa_begin(void) } static Eina_Bool -_e_qa_event_border_remove_cb(void *data __UNUSED__, int type __UNUSED__, E_Event_Client *ev) +_e_qa_event_border_remove_cb(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Client *ev) { E_Quick_Access_Entry *entry; @@ -664,7 +664,7 @@ _e_qa_entry_transient_new(E_Client *ec) } static Eina_Bool -_grab_key_down_cb(void *data, int type __UNUSED__, void *event) +_grab_key_down_cb(void *data, int type EINA_UNUSED, void *event) { Ecore_Event_Key *ev = event; E_Client *ec = data; @@ -713,20 +713,20 @@ _grab_key_down_cb(void *data, int type __UNUSED__, void *event) } static void -_grab_wnd_hide(void *data __UNUSED__) +_grab_wnd_hide(void *data EINA_UNUSED) { eg = NULL; } static void -_e_qa_bd_menu_transient(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_qa_bd_menu_transient(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Quick_Access_Entry *entry = data; _e_qa_entry_transient_convert(entry); } static void -_e_qa_bd_menu_relaunch(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_qa_bd_menu_relaunch(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Quick_Access_Entry *entry = data; @@ -739,7 +739,7 @@ _e_qa_bd_menu_relaunch(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSE } static void -_e_qa_bd_menu_jump(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_qa_bd_menu_jump(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Quick_Access_Entry *entry = data; @@ -754,7 +754,7 @@ _e_qa_bd_menu_jump(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) } static void -_e_qa_bd_menu_hideraise(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_qa_bd_menu_hideraise(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Quick_Access_Entry *entry = data; @@ -762,7 +762,7 @@ _e_qa_bd_menu_hideraise(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUS } static void -_e_qa_bd_menu_autohide(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_qa_bd_menu_autohide(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Quick_Access_Entry *entry = data; @@ -771,13 +771,13 @@ _e_qa_bd_menu_autohide(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSE } static void -_e_qa_bd_menu_help(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_qa_bd_menu_help(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_qa_help(); } static void -_e_qa_bd_menu_del(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_qa_bd_menu_del(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Quick_Access_Entry *entry = data; @@ -787,13 +787,13 @@ _e_qa_bd_menu_del(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) } static void -_e_qa_bd_menu_config(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_qa_bd_menu_config(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { e_configure_registry_call("launcher/quickaccess", NULL, NULL); } static void -_e_qa_bd_menu_add(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_qa_bd_menu_add(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Client *ec = data; if (!ec) return; @@ -804,13 +804,13 @@ _e_qa_bd_menu_add(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) } static void -_e_qa_bd_menu_free(void *data __UNUSED__) +_e_qa_bd_menu_free(void *data EINA_UNUSED) { qa_mod->menu = NULL; } static void -_e_qa_bd_menu_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) +_e_qa_bd_menu_pre(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi) { E_Quick_Access_Entry *entry = data; E_Menu *subm; @@ -875,7 +875,7 @@ _e_qa_bd_menu_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) } static void -_e_qa_bd_menu_hook(void *d __UNUSED__, E_Client *ec) +_e_qa_bd_menu_hook(void *d EINA_UNUSED, E_Client *ec) { E_Menu_Item *mi; E_Menu *m; @@ -914,7 +914,7 @@ _e_qa_entry_config_apply(E_Quick_Access_Entry *entry) } static Eina_Bool -_e_qa_help_timeout(void *data __UNUSED__) +_e_qa_help_timeout(void *data EINA_UNUSED) { if (qa_mod->help_dia) e_object_del(qa_mod->help_dia); if (qa_mod->demo_dia) @@ -932,7 +932,7 @@ _e_qa_help_timeout(void *data __UNUSED__) } static void -_e_qa_dia_end_del(void *data __UNUSED__) +_e_qa_dia_end_del(void *data EINA_UNUSED) { qa_mod->help_dia = NULL; _e_qa_help_timeout(NULL); @@ -940,7 +940,7 @@ _e_qa_dia_end_del(void *data __UNUSED__) } static void -_e_qa_dia_del(void *data __UNUSED__) +_e_qa_dia_del(void *data EINA_UNUSED) { qa_mod->help_dia = NULL; if (qa_mod->help_timeout) @@ -950,14 +950,14 @@ _e_qa_dia_del(void *data __UNUSED__) } static void -_e_qa_demo_dia_del(void *data __UNUSED__) +_e_qa_demo_dia_del(void *data EINA_UNUSED) { qa_mod->demo_dia = NULL; _e_qa_help_timeout(NULL); } static void -_e_qa_help_cancel(void *data __UNUSED__) +_e_qa_help_cancel(void *data EINA_UNUSED) { qa_config->first_run = EINA_TRUE; _e_qa_help_timeout(NULL); @@ -982,7 +982,7 @@ e_qa_help(void) } static void -_e_qa_help6(void *data __UNUSED__) +_e_qa_help6(void *data EINA_UNUSED) { if (qa_mod->help_dia) { @@ -993,7 +993,7 @@ _e_qa_help6(void *data __UNUSED__) } static void -_e_qa_help5(void *data __UNUSED__) +_e_qa_help5(void *data EINA_UNUSED) { char buf[PATH_MAX]; @@ -1061,7 +1061,7 @@ _e_qa_help_activate_hook(E_Quick_Access_Entry *entry) } static void -_e_qa_help4(void *data __UNUSED__) +_e_qa_help4(void *data EINA_UNUSED) { char buf[PATH_MAX]; @@ -1073,7 +1073,7 @@ _e_qa_help4(void *data __UNUSED__) } static void -_e_qa_help_qa_added_cb(void *data __UNUSED__) +_e_qa_help_qa_added_cb(void *data EINA_UNUSED) { E_Quick_Access_Entry *entry; @@ -1090,7 +1090,7 @@ _e_qa_help_qa_added_cb(void *data __UNUSED__) } static void -_e_qa_help_bd_menu_del(void *data __UNUSED__) +_e_qa_help_bd_menu_del(void *data EINA_UNUSED) { if (qa_mod->help_timer) ecore_timer_del(qa_mod->help_timer); qa_mod->demo_state = 0; @@ -1104,7 +1104,7 @@ _e_qa_help_bd_menu_del(void *data __UNUSED__) } static void -_e_qa_help_bd_menu2_del(void *data __UNUSED__) +_e_qa_help_bd_menu2_del(void *data EINA_UNUSED) { if (qa_mod->help_timer) ecore_timer_del(qa_mod->help_timer); qa_mod->demo_state = 0; @@ -1171,7 +1171,7 @@ _e_qa_help_timer_helper(void) } static Eina_Bool -_e_qa_help_timer2_cb(void *data __UNUSED__) +_e_qa_help_timer2_cb(void *data EINA_UNUSED) { E_Client *ec; @@ -1195,7 +1195,7 @@ _e_qa_help_timer2_cb(void *data __UNUSED__) } static Eina_Bool -_e_qa_help_timer_cb(void *data __UNUSED__) +_e_qa_help_timer_cb(void *data EINA_UNUSED) { E_Client *ec; @@ -1219,7 +1219,7 @@ _e_qa_help_timer_cb(void *data __UNUSED__) } static void -_e_qa_help3(void *data __UNUSED__) +_e_qa_help3(void *data EINA_UNUSED) { char buf[PATH_MAX]; E_Dialog *dia; @@ -1251,7 +1251,7 @@ _e_qa_help3(void *data __UNUSED__) } static void -_e_qa_help2(void *data __UNUSED__) +_e_qa_help2(void *data EINA_UNUSED) { char buf[PATH_MAX]; diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c index bf4055d5be..57ab8f875a 100644 --- a/src/modules/shot/e_mod_main.c +++ b/src/modules/shot/e_mod_main.c @@ -37,11 +37,11 @@ static char *url_ret = NULL; static E_Dialog *fsel_dia = NULL; static E_Client_Menu_Hook *border_hook = NULL; -static void _file_select_ok_cb(void *data __UNUSED__, E_Dialog *dia); -static void _file_select_cancel_cb(void *data __UNUSED__, E_Dialog *dia); +static void _file_select_ok_cb(void *data EINA_UNUSED, E_Dialog *dia); +static void _file_select_cancel_cb(void *data EINA_UNUSED, E_Dialog *dia); static void -_win_cancel_cb(void *data __UNUSED__, void *data2 __UNUSED__) +_win_cancel_cb(void *data EINA_UNUSED, void *data2 EINA_UNUSED) { E_FREE_FUNC(win, evas_object_del); } @@ -53,14 +53,14 @@ _win_delete_cb() } static void -_on_focus_cb(void *data __UNUSED__, Evas_Object *obj) +_on_focus_cb(void *data EINA_UNUSED, Evas_Object *obj) { if (obj == o_content) e_widget_focused_object_clear(o_box); else if (o_content) e_widget_focused_object_clear(o_content); } static void -_key_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Key_Down *ev = event; @@ -118,7 +118,7 @@ _key_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSE } static void -_save_key_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_save_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Key_Down *ev = event; if ((!strcmp(ev->key, "Return")) || (!strcmp(ev->key, "KP_Enter"))) @@ -128,7 +128,7 @@ _save_key_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __ } static void -_screen_change_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_screen_change_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Eina_List *l; E_Zone *z; @@ -206,7 +206,7 @@ _save_to(const char *file) } static void -_file_select_ok_cb(void *data __UNUSED__, E_Dialog *dia) +_file_select_ok_cb(void *data EINA_UNUSED, E_Dialog *dia) { const char *file; @@ -229,20 +229,20 @@ _file_select_ok_cb(void *data __UNUSED__, E_Dialog *dia) } static void -_file_select_cancel_cb(void *data __UNUSED__, E_Dialog *dia) +_file_select_cancel_cb(void *data EINA_UNUSED, E_Dialog *dia) { if (dia) e_util_defer_object_del(E_OBJECT(dia)); fsel_dia = NULL; } static void -_file_select_del_cb(void *d __UNUSED__) +_file_select_del_cb(void *d EINA_UNUSED) { fsel_dia = NULL; } static void -_win_save_cb(void *data __UNUSED__, void *data2 __UNUSED__) +_win_save_cb(void *data EINA_UNUSED, void *data2 EINA_UNUSED) { E_Dialog *dia; Evas_Object *o; @@ -298,7 +298,7 @@ _share_done(void) } static void -_upload_ok_cb(void *data __UNUSED__, E_Dialog *dia) +_upload_ok_cb(void *data EINA_UNUSED, E_Dialog *dia) { // ok just hides dialog and does background upload o_label = NULL; @@ -308,7 +308,7 @@ _upload_ok_cb(void *data __UNUSED__, E_Dialog *dia) } static void -_upload_cancel_cb(void *data __UNUSED__, E_Dialog *dia) +_upload_cancel_cb(void *data EINA_UNUSED, E_Dialog *dia) { o_label = NULL; if (dia) e_util_defer_object_del(E_OBJECT(dia)); @@ -317,7 +317,7 @@ _upload_cancel_cb(void *data __UNUSED__, E_Dialog *dia) } static Eina_Bool -_upload_data_cb(void *data __UNUSED__, int ev_type __UNUSED__, void *event) +_upload_data_cb(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *event) { Ecore_Con_Event_Url_Data *ev = event; if (ev->url_con != url_up) return EINA_TRUE; @@ -352,7 +352,7 @@ _upload_data_cb(void *data __UNUSED__, int ev_type __UNUSED__, void *event) } static Eina_Bool -_upload_progress_cb(void *data __UNUSED__, int ev_type __UNUSED__, void *event) +_upload_progress_cb(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *event) { size_t total, current; Ecore_Con_Event_Url_Progress *ev = event; @@ -377,7 +377,7 @@ _upload_progress_cb(void *data __UNUSED__, int ev_type __UNUSED__, void *event) } static Eina_Bool -_upload_complete_cb(void *data, int ev_type __UNUSED__, void *event) +_upload_complete_cb(void *data, int ev_type EINA_UNUSED, void *event) { int status; Ecore_Con_Event_Url_Complete *ev = event; @@ -401,7 +401,7 @@ _upload_complete_cb(void *data, int ev_type __UNUSED__, void *event) } static void -_win_share_del(void *data __UNUSED__) +_win_share_del(void *data EINA_UNUSED) { if (handlers) ecore_event_handler_data_set(eina_list_last_data_get(handlers), NULL); _upload_cancel_cb(NULL, NULL); @@ -409,7 +409,7 @@ _win_share_del(void *data __UNUSED__) } static void -_win_share_cb(void *data __UNUSED__, void *data2 __UNUSED__) +_win_share_cb(void *data EINA_UNUSED, void *data2 EINA_UNUSED) { E_Dialog *dia; Evas_Object *o, *ol; @@ -544,7 +544,7 @@ _win_share_confirm_cb(void *d EINA_UNUSED, void *d2 EINA_UNUSED) } static void -_rect_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_rect_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev = event_info; Eina_List *l; @@ -903,19 +903,19 @@ _shot(E_Zone *zone) } static void -_e_mod_menu_border_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_mod_menu_border_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { _shot_border(data); } static void -_e_mod_menu_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) +_e_mod_menu_cb(void *data EINA_UNUSED, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) { if (m->zone) _shot(m->zone); } static void -_e_mod_action_border_cb(E_Object *obj __UNUSED__, const char *params __UNUSED__) +_e_mod_action_border_cb(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED) { E_Client *ec; ec = e_client_focused_get(); @@ -951,7 +951,7 @@ _e_mod_action_cb(E_Object *obj, const char *params) } static void -_bd_hook(void *d __UNUSED__, E_Client *ec) +_bd_hook(void *d EINA_UNUSED, E_Client *ec) { E_Menu_Item *mi; E_Menu *m; @@ -975,7 +975,7 @@ _bd_hook(void *d __UNUSED__, E_Client *ec) } static void -_e_mod_menu_add(void *data __UNUSED__, E_Menu *m) +_e_mod_menu_add(void *data EINA_UNUSED, E_Menu *m) { E_Menu_Item *mi; @@ -1028,7 +1028,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { _share_done(); E_FREE_FUNC(win, evas_object_del); @@ -1056,7 +1056,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/start/e_mod_main.c b/src/modules/start/e_mod_main.c index 07b2bddece..d73cce04dc 100644 --- a/src/modules/start/e_mod_main.c +++ b/src/modules/start/e_mod_main.c @@ -178,13 +178,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("Start"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o; char buf[PATH_MAX]; @@ -197,13 +197,13 @@ _gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _gadcon_class.name; } static void -_button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_button_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Instance *inst; Evas_Event_Mouse_Down *ev; @@ -326,7 +326,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { start_module = NULL; e_gadcon_provider_unregister(&_gadcon_class); @@ -334,7 +334,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/syscon/e_int_config_syscon.c b/src/modules/syscon/e_int_config_syscon.c index e8fd31515b..e4d0cf9e0d 100644 --- a/src/modules/syscon/e_int_config_syscon.c +++ b/src/modules/syscon/e_int_config_syscon.c @@ -26,7 +26,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_syscon(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_syscon(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -70,7 +70,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -81,7 +81,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Config_Syscon_Action *sa; @@ -97,7 +97,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *l; E_Config_Syscon_Action *sa, *sa2; @@ -130,7 +130,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if ((cfdata->main.icon_size != e_config->syscon.main.icon_size) || (cfdata->secondary.icon_size != e_config->syscon.secondary.icon_size) || @@ -143,7 +143,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *otb, *ol, *ob; diff --git a/src/modules/syscon/e_mod_main.c b/src/modules/syscon/e_mod_main.c index d87f89a9d0..88469fb76d 100644 --- a/src/modules/syscon/e_mod_main.c +++ b/src/modules/syscon/e_mod_main.c @@ -41,7 +41,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; while ((cfd = e_config_dialog_get("E", "advanced/conf_syscon"))) @@ -96,20 +96,20 @@ _e_mod_syscon_defer_cb(void *data) } static void -_e_mod_syscon_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) +_e_mod_syscon_cb(void *data EINA_UNUSED, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) { ecore_idle_enterer_add(_e_mod_syscon_defer_cb, m->zone); } static void -_e_mod_menu_generate(void *data __UNUSED__, E_Menu *m) +_e_mod_menu_generate(void *data EINA_UNUSED, E_Menu *m) { e_syscon_menu_fill(m); } /* menu item add hook */ static void -_e_mod_menu_add(void *data __UNUSED__, E_Menu *m) +_e_mod_menu_add(void *data EINA_UNUSED, E_Menu *m) { E_Menu *sub; E_Menu_Item *mi; diff --git a/src/modules/syscon/e_mod_main.h b/src/modules/syscon/e_mod_main.h index 0a30da5cf0..55d60008d6 100644 --- a/src/modules/syscon/e_mod_main.h +++ b/src/modules/syscon/e_mod_main.h @@ -7,7 +7,7 @@ int e_syscon_shutdown(void); int e_syscon_show(E_Zone *zone, const char *defact); void e_syscon_hide(void); -E_Config_Dialog *e_int_config_syscon(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_syscon(Evas_Object *parent, const char *params EINA_UNUSED); void e_syscon_gadget_init(E_Module *m); void e_syscon_gadget_shutdown(void); diff --git a/src/modules/syscon/e_syscon.c b/src/modules/syscon/e_syscon.c index e928dd38cf..9749b3d27a 100644 --- a/src/modules/syscon/e_syscon.c +++ b/src/modules/syscon/e_syscon.c @@ -2,7 +2,7 @@ #include "e_mod_main.h" /* local subsystem functions */ -static Eina_Bool _cb_key_down(__UNUSED__ void *data, Ecore_Event_Key *ev); +static Eina_Bool _cb_key_down(EINA_UNUSED void *data, Ecore_Event_Key *ev); static void _cb_signal_close(void *data, Evas_Object *obj, const char *emission, const char *source); static void _cb_signal_syscon(void *data, Evas_Object *obj, const char *emission, const char *source); static void _cb_signal_action(void *data, Evas_Object *obj, const char *emission, const char *source); @@ -300,7 +300,7 @@ e_syscon_hide(void) /* local subsystem functions */ static Eina_Bool -_cb_key_down(__UNUSED__ void *data, Ecore_Event_Key *ev) +_cb_key_down(EINA_UNUSED void *data, Ecore_Event_Key *ev) { if (!strcmp(ev->key, "Escape")) e_syscon_hide(); @@ -430,7 +430,7 @@ _cb_key_down(__UNUSED__ void *data, Ecore_Event_Key *ev) } static void -_cb_signal_close(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_signal_close(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { e_syscon_hide(); } @@ -458,14 +458,14 @@ _do_action_name(const char *action) } static void -_cb_signal_syscon(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source) +_cb_signal_syscon(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source) { e_syscon_hide(); _do_action_name(source); } static void -_cb_signal_action(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_signal_action(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Config_Syscon_Action *sca; E_Action *a; @@ -479,7 +479,7 @@ _cb_signal_action(void *data, Evas_Object *obj __UNUSED__, const char *emission } static void -_cb_signal_action_extra(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_signal_action_extra(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { E_Sys_Con_Action *sca; @@ -490,7 +490,7 @@ _cb_signal_action_extra(void *data, Evas_Object *obj __UNUSED__, const char *emi } static Eina_Bool -_cb_timeout_defaction(void *data __UNUSED__) +_cb_timeout_defaction(void *data EINA_UNUSED) { const char *defact = NULL; deftimer = NULL; diff --git a/src/modules/syscon/e_syscon_gadget.c b/src/modules/syscon/e_syscon_gadget.c index 605e95fae2..9e1baa79c3 100644 --- a/src/modules/syscon/e_syscon_gadget.c +++ b/src/modules/syscon/e_syscon_gadget.c @@ -19,12 +19,12 @@ typedef struct Syscon_Config static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); -static const char *_gc_label(const E_Gadcon_Client_Class *cc __UNUSED__); +static const char *_gc_label(const E_Gadcon_Client_Class *cc EINA_UNUSED); static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *cc, Evas *evas); static const char *_gc_id_new(const E_Gadcon_Client_Class *cc); -static void _cb_shutdown_show(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__); -static void _cb_menu_post(void *data, E_Menu *m __UNUSED__); -static void _cb_menu_sel(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__); +static void _cb_shutdown_show(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); +static void _cb_menu_post(void *data, E_Menu *m EINA_UNUSED); +static void _cb_menu_sel(void *data, E_Menu *m, E_Menu_Item *mi EINA_UNUSED); static E_Config_Syscon_Action *_find_action(const char *name); static void _create_menu(Instance *inst); @@ -46,14 +46,14 @@ static const E_Gadcon_Client_Class _gc_class = /* local functions */ static void -_cb_menu_change(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_cb_menu_change(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { syscon_config->menu = !syscon_config->menu; } static void -_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Instance *inst; Evas_Event_Mouse_Down *ev; @@ -129,20 +129,20 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { e_gadcon_client_aspect_set(gcc, 16, 16); e_gadcon_client_min_size_set(gcc, 16, 16); } static const char * -_gc_label(const E_Gadcon_Client_Class *cc __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *cc EINA_UNUSED) { return _("System"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *cc EINA_UNUSED, Evas *evas) { Evas_Object *obj; char buff[PATH_MAX]; @@ -164,7 +164,7 @@ _gc_id_new(const E_Gadcon_Client_Class *cc) } static void -_cb_shutdown_show(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_cb_shutdown_show(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Instance *inst; E_Zone *zone; @@ -240,7 +240,7 @@ _cb_menu_post(void *data, E_Menu *m) } static void -_cb_menu_sel(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_cb_menu_sel(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_Config_Syscon_Action *sca; E_Action *act; @@ -394,7 +394,7 @@ e_syscon_menu_fill(E_Menu *m) EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.syscon", conf_edd, syscon_config); return 1; diff --git a/src/modules/systray/e_mod_main.c b/src/modules/systray/e_mod_main.c index 4cd3b6a247..fed2de8580 100644 --- a/src/modules/systray/e_mod_main.c +++ b/src/modules/systray/e_mod_main.c @@ -114,7 +114,7 @@ _systray_menu_new(Instance *inst, Evas_Event_Mouse_Down *ev) } static void -_systray_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +_systray_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Instance *inst = data; Evas_Event_Mouse_Down *ev = event; @@ -352,13 +352,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("Systray"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o; @@ -368,7 +368,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _name; } @@ -408,7 +408,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_gadcon_provider_unregister(&_gc_class); systray_mod = NULL; @@ -422,7 +422,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save(_name, ctx->conf_edd, ctx->config); return 1; diff --git a/src/modules/systray/e_mod_notifier_host.c b/src/modules/systray/e_mod_notifier_host.c index ba2edb6b82..7c14b195ab 100644 --- a/src/modules/systray/e_mod_notifier_host.c +++ b/src/modules/systray/e_mod_notifier_host.c @@ -101,7 +101,7 @@ image_load(const char *name, const char *path, Evas_Object *image) } static void -_sub_item_clicked_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_sub_item_clicked_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { E_DBusMenu_Item *item = data; e_dbusmenu_event_send(item, E_DBUSMENU_ITEM_EVENT_CLICKED); @@ -162,7 +162,7 @@ _item_submenu_new(E_DBusMenu_Item *item, E_Menu_Item *mi) } void -_clicked_item_cb(void *data, Evas *evas, Evas_Object *obj __UNUSED__, void *event) +_clicked_item_cb(void *data, Evas *evas, Evas_Object *obj EINA_UNUSED, void *event) { Notifier_Item_Icon *ii = data; Evas_Event_Mouse_Down *ev = event; diff --git a/src/modules/tasks/e_mod_config.c b/src/modules/tasks/e_mod_config.c index 7320eaafec..361fac8a68 100644 --- a/src/modules/tasks/e_mod_config.c +++ b/src/modules/tasks/e_mod_config.c @@ -59,7 +59,7 @@ _create_data(E_Config_Dialog *cfd) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if (!tasks_config) return; tasks_config->config_dialog = NULL; @@ -67,7 +67,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static void -_toggle_check(void *data, Evas_Object *obj __UNUSED__) +_toggle_check(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; e_widget_disabled_set(cfdata->text, cfdata->icon_only); @@ -75,7 +75,7 @@ _toggle_check(void *data, Evas_Object *obj __UNUSED__) } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ob, *ow; diff --git a/src/modules/tasks/e_mod_main.c b/src/modules/tasks/e_mod_main.c index 2c2d76b7fe..f7f81c75e9 100644 --- a/src/modules/tasks/e_mod_main.c +++ b/src/modules/tasks/e_mod_main.c @@ -73,7 +73,7 @@ static Config_Item *_tasks_config_item_get(const char *id); static void _tasks_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi); static void _tasks_cb_item_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _tasks_cb_item_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _tasks_cb_item_mouse_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info); +static void _tasks_cb_item_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info); static Eina_Bool _tasks_cb_event_client_add(void *data, int type, void *event); static Eina_Bool _tasks_cb_event_client_remove(void *data, int type, void *event); @@ -159,7 +159,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { Ecore_Event_Handler *eh; Tasks *tasks; @@ -194,7 +194,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.tasks", conf_edd, tasks_config); return 1; @@ -287,13 +287,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("Tasks"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o; char buf[4096]; @@ -306,7 +306,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { Config_Item *config; @@ -712,7 +712,7 @@ _tasks_config_updated(Config_Item *config) } static void -_tasks_cb_menu_configure(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_tasks_cb_menu_configure(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { Tasks *tasks; @@ -721,7 +721,7 @@ _tasks_cb_menu_configure(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNU } static void -_tasks_cb_item_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_tasks_cb_item_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Down *ev; Tasks_Item *item; @@ -768,7 +768,7 @@ _tasks_cb_item_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU } static void -_tasks_cb_item_mouse_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_tasks_cb_item_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Wheel *ev; Tasks_Item *item; @@ -789,7 +789,7 @@ _tasks_cb_item_mouse_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UN } static void -_tasks_cb_item_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_tasks_cb_item_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Mouse_Up *ev; Tasks_Item *item; @@ -862,7 +862,7 @@ _tasks_cb_item_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE /************ BORDER CALLBACKS *********************/ static Eina_Bool -_tasks_cb_event_client_add(void *data __UNUSED__, int type __UNUSED__, void *event) +_tasks_cb_event_client_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; Tasks *tasks; @@ -879,7 +879,7 @@ _tasks_cb_event_client_add(void *data __UNUSED__, int type __UNUSED__, void *eve } static Eina_Bool -_tasks_cb_event_client_remove(void *data __UNUSED__, int type __UNUSED__, void *event) +_tasks_cb_event_client_remove(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; Tasks *tasks; @@ -895,7 +895,7 @@ _tasks_cb_event_client_remove(void *data __UNUSED__, int type __UNUSED__, void * } static Eina_Bool -_tasks_cb_event_client_iconify(void *data __UNUSED__, int type __UNUSED__, void *event) +_tasks_cb_event_client_iconify(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; _tasks_signal_emit(ev->ec, "e,state,iconified", "e"); @@ -903,7 +903,7 @@ _tasks_cb_event_client_iconify(void *data __UNUSED__, int type __UNUSED__, void } static Eina_Bool -_tasks_cb_event_client_uniconify(void *data __UNUSED__, int type __UNUSED__, void *event) +_tasks_cb_event_client_uniconify(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; _tasks_signal_emit(ev->ec, "e,state,uniconified", "e"); @@ -911,7 +911,7 @@ _tasks_cb_event_client_uniconify(void *data __UNUSED__, int type __UNUSED__, voi } static Eina_Bool -_tasks_cb_window_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event) +_tasks_cb_window_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; _tasks_signal_emit(ev->ec, "e,state,focused", "e"); @@ -919,7 +919,7 @@ _tasks_cb_window_focus_in(void *data __UNUSED__, int type __UNUSED__, void *even } static Eina_Bool -_tasks_cb_window_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event) +_tasks_cb_window_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; _tasks_signal_emit(ev->ec, "e,state,unfocused", "e"); @@ -927,7 +927,7 @@ _tasks_cb_window_focus_out(void *data __UNUSED__, int type __UNUSED__, void *eve } static Eina_Bool -_tasks_cb_event_client_urgent_change(void *data __UNUSED__, int type __UNUSED__, void *event) +_tasks_cb_event_client_urgent_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client_Property *ev = event; @@ -940,7 +940,7 @@ _tasks_cb_event_client_urgent_change(void *data __UNUSED__, int type __UNUSED__, } static Eina_Bool -_tasks_cb_event_client_title_change(void *data __UNUSED__, int type __UNUSED__, void *event) +_tasks_cb_event_client_title_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client_Property *ev = event; @@ -950,7 +950,7 @@ _tasks_cb_event_client_title_change(void *data __UNUSED__, int type __UNUSED__, } static Eina_Bool -_tasks_cb_event_client_icon_change(void *data __UNUSED__, int type __UNUSED__, void *event) +_tasks_cb_event_client_icon_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client_Property *ev = event; @@ -960,21 +960,21 @@ _tasks_cb_event_client_icon_change(void *data __UNUSED__, int type __UNUSED__, v } static Eina_Bool -_tasks_cb_event_client_zone_set(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_tasks_cb_event_client_zone_set(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { _tasks_refill_all(); return EINA_TRUE; } static Eina_Bool -_tasks_cb_event_client_desk_set(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_tasks_cb_event_client_desk_set(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { _tasks_refill_all(); return EINA_TRUE; } static Eina_Bool -_tasks_cb_event_desk_show(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_tasks_cb_event_desk_show(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { _tasks_refill_all(); return EINA_TRUE; diff --git a/src/modules/teamwork/e_mod_main.c b/src/modules/teamwork/e_mod_main.c index 30f8e8c61d..6da7d73ce0 100644 --- a/src/modules/teamwork/e_mod_main.c +++ b/src/modules/teamwork/e_mod_main.c @@ -179,14 +179,14 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { _e_modapi_shutdown(); return 1; } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.teamwork", conf_edd, tw_config); return 1; diff --git a/src/modules/teamwork/e_mod_main.h b/src/modules/teamwork/e_mod_main.h index 11c0499c42..f27e0c1c0a 100644 --- a/src/modules/teamwork/e_mod_main.h +++ b/src/modules/teamwork/e_mod_main.h @@ -59,7 +59,7 @@ EINTERN void tw_uri_show(const char *uri); EINTERN E_Config_Dialog *e_int_config_teamwork_module(Evas_Object *parent, const char *params EINA_UNUSED); -EAPI int e_modapi_shutdown(E_Module *m __UNUSED__); +EAPI int e_modapi_shutdown(E_Module *m EINA_UNUSED); #undef DBG #undef INF #undef WRN diff --git a/src/modules/temperature/e_mod_config.c b/src/modules/temperature/e_mod_config.c index 90b4922ff7..3e938c2a60 100644 --- a/src/modules/temperature/e_mod_config.c +++ b/src/modules/temperature/e_mod_config.c @@ -32,10 +32,10 @@ struct _E_Config_Dialog_Data static void *_create_data(E_Config_Dialog *cfd); static void _fill_data_tempget(E_Config_Dialog_Data *cfdata); static void _fill_sensors(E_Config_Dialog_Data *cfdata, const char *name); -static void _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata); +static void _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static void _cb_display_changed(void *data, Evas_Object *obj __UNUSED__); +static void _cb_display_changed(void *data, Evas_Object *obj EINA_UNUSED); void config_temperature_module(Config_Face *inst) @@ -182,7 +182,7 @@ _fill_sensors(E_Config_Dialog_Data *cfdata, const char *name) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { char *sensor; @@ -193,7 +193,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *otb, *ol, *ow; E_Radio_Group *rg; @@ -278,7 +278,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { cfdata->inst->poll_interval = cfdata->poll.interval; cfdata->inst->units = cfdata->unit_method; @@ -297,7 +297,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static void -_cb_display_changed(void *data, Evas_Object *obj __UNUSED__) +_cb_display_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata; int val; diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c index 023df652fd..9e165a80f8 100644 --- a/src/modules/temperature/e_mod_main.c +++ b/src/modules/temperature/e_mod_main.c @@ -37,8 +37,8 @@ static void _temperature_face_cb_mouse_down(void *data, Evas *e, Evas_Object *ob static void _temperature_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi); -static Eina_Bool _temperature_face_shutdown(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *hdata, void *fdata __UNUSED__); -static Eina_Bool _temperature_face_id_max(const Eina_Hash *hash __UNUSED__, const void *key, void *hdata __UNUSED__, void *fdata); +static Eina_Bool _temperature_face_shutdown(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *hdata, void *fdata EINA_UNUSED); +static Eina_Bool _temperature_face_id_max(const Eina_Hash *hash EINA_UNUSED, const void *key, void *hdata EINA_UNUSED, void *fdata); static E_Config_DD *conf_edd = NULL; static E_Config_DD *conf_face_edd = NULL; @@ -161,20 +161,20 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { e_gadcon_client_aspect_set(gcc, 16, 16); e_gadcon_client_min_size_set(gcc, 16, 16); } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("Temperature"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o; char buf[PATH_MAX]; @@ -187,7 +187,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { Config_Face *inst; char id[128]; @@ -212,7 +212,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__) } static void -_temperature_face_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_temperature_face_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Config_Face *inst; Evas_Event_Mouse_Down *ev; @@ -254,7 +254,7 @@ _temperature_face_level_set(Config_Face *inst, double level) } static void -_temperature_face_cb_menu_configure(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) +_temperature_face_cb_menu_configure(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { Config_Face *inst; @@ -264,7 +264,7 @@ _temperature_face_cb_menu_configure(void *data, E_Menu *m __UNUSED__, E_Menu_Ite } static Eina_Bool -_temperature_face_shutdown(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *hdata, void *fdata __UNUSED__) +_temperature_face_shutdown(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *hdata, void *fdata EINA_UNUSED) { Config_Face *inst; @@ -285,7 +285,7 @@ _temperature_face_shutdown(const Eina_Hash *hash __UNUSED__, const void *key __U } static Eina_Bool -_temperature_face_id_max(const Eina_Hash *hash __UNUSED__, const void *key, void *hdata __UNUSED__, void *fdata) +_temperature_face_id_max(const Eina_Hash *hash EINA_UNUSED, const void *key, void *hdata EINA_UNUSED, void *fdata) { const char *p; int *max; @@ -450,7 +450,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_gadcon_provider_unregister(&_gadcon_class); if (temperature_config->faces) @@ -464,7 +464,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.temperature", conf_edd, temperature_config); return 1; diff --git a/src/modules/temperature/e_mod_tempget.c b/src/modules/temperature/e_mod_tempget.c index 29ef3b4da3..5091d07b8c 100644 --- a/src/modules/temperature/e_mod_tempget.c +++ b/src/modules/temperature/e_mod_tempget.c @@ -2,7 +2,7 @@ #include "e_mod_main.h" Eina_Bool -_temperature_cb_exe_data(void *data, __UNUSED__ int type, void *event) +_temperature_cb_exe_data(void *data, EINA_UNUSED int type, void *event) { Ecore_Exe_Event_Data *ev; Config_Face *inst; @@ -63,7 +63,7 @@ _temperature_cb_exe_data(void *data, __UNUSED__ int type, void *event) } Eina_Bool -_temperature_cb_exe_del(void *data, __UNUSED__ int type, void *event) +_temperature_cb_exe_del(void *data, EINA_UNUSED int type, void *event) { Ecore_Exe_Event_Del *ev; Config_Face *inst; diff --git a/src/modules/temperature/tempget.c b/src/modules/temperature/tempget.c index 6d614a1789..b033341259 100644 --- a/src/modules/temperature/tempget.c +++ b/src/modules/temperature/tempget.c @@ -550,7 +550,7 @@ error: } static Eina_Bool -poll_cb(void *data __UNUSED__) +poll_cb(void *data EINA_UNUSED) { int t, pp; diff --git a/src/modules/winlist/e_int_config_winlist.c b/src/modules/winlist/e_int_config_winlist.c index 60f2fc3197..15bf16f345 100644 --- a/src/modules/winlist/e_int_config_winlist.c +++ b/src/modules/winlist/e_int_config_winlist.c @@ -5,8 +5,8 @@ static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdat static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static void _width_limits_changed(void *data, Evas_Object *obj __UNUSED__); -static void _height_limits_changed(void *data, Evas_Object *obj __UNUSED__); +static void _width_limits_changed(void *data, Evas_Object *obj EINA_UNUSED); +static void _height_limits_changed(void *data, Evas_Object *obj EINA_UNUSED); struct _E_Config_Dialog_Data { @@ -36,7 +36,7 @@ struct _E_Config_Dialog_Data }; E_Config_Dialog * -e_int_config_winlist(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +e_int_config_winlist(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -92,7 +92,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; @@ -103,13 +103,13 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { free(cfdata); } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { #define DO(_e_config, _cfdata) \ e_config->winlist_##_e_config = cfdata->_cfdata @@ -143,7 +143,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { #define DO(_e_config, _cfdata) \ if (e_config->winlist_##_e_config != cfdata->_cfdata) return 1; @@ -175,7 +175,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static Evas_Object * -_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *otb, *ol, *ob, *iconified, *scroll_animate, *ck; @@ -326,7 +326,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data } static void -_width_limits_changed(void *data, Evas_Object *obj __UNUSED__) +_width_limits_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; @@ -335,7 +335,7 @@ _width_limits_changed(void *data, Evas_Object *obj __UNUSED__) } static void -_height_limits_changed(void *data, Evas_Object *obj __UNUSED__) +_height_limits_changed(void *data, Evas_Object *obj EINA_UNUSED) { E_Config_Dialog_Data *cfdata = data; diff --git a/src/modules/winlist/e_mod_main.c b/src/modules/winlist/e_mod_main.c index 5ae1f9fa8d..318b750278 100644 --- a/src/modules/winlist/e_mod_main.c +++ b/src/modules/winlist/e_mod_main.c @@ -68,7 +68,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -100,7 +100,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/winlist/e_mod_main.h b/src/modules/winlist/e_mod_main.h index 4b196bc6d7..4b4ec1e835 100644 --- a/src/modules/winlist/e_mod_main.h +++ b/src/modules/winlist/e_mod_main.h @@ -5,7 +5,7 @@ extern const char *_winlist_act; extern E_Action *_act_winlist; -E_Config_Dialog *e_int_config_winlist(Evas_Object *parent, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_winlist(Evas_Object *parent, const char *params EINA_UNUSED); /** * @addtogroup Optional_Control * @{ diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c index 8e43c051bb..2d30e42a32 100644 --- a/src/modules/winlist/e_winlist.c +++ b/src/modules/winlist/e_winlist.c @@ -1073,7 +1073,7 @@ _e_winlist_restore_desktop(void) } static Eina_Bool -_e_winlist_cb_event_border_add(void *data __UNUSED__, int type __UNUSED__, +_e_winlist_cb_event_border_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; @@ -1085,7 +1085,7 @@ _e_winlist_cb_event_border_add(void *data __UNUSED__, int type __UNUSED__, } static Eina_Bool -_e_winlist_cb_event_border_remove(void *data __UNUSED__, int type __UNUSED__, +_e_winlist_cb_event_border_remove(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { E_Event_Client *ev = event; @@ -1096,7 +1096,7 @@ _e_winlist_cb_event_border_remove(void *data __UNUSED__, int type __UNUSED__, } static Eina_Bool -_e_winlist_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_winlist_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Key *ev; @@ -1172,7 +1172,7 @@ _e_winlist_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_winlist_cb_key_up(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_winlist_cb_key_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Key *ev; Eina_List *l; @@ -1238,7 +1238,7 @@ _e_winlist_cb_key_up(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_winlist_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_winlist_cb_mouse_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Button *ev; @@ -1250,7 +1250,7 @@ _e_winlist_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event } static Eina_Bool -_e_winlist_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_winlist_cb_mouse_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Button *ev; @@ -1264,7 +1264,7 @@ _e_winlist_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_winlist_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_winlist_cb_mouse_wheel(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Wheel *ev; int i; @@ -1287,7 +1287,7 @@ _e_winlist_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *even } static Eina_Bool -_e_winlist_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_winlist_cb_mouse_move(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Move *ev; int x, y, w, h; @@ -1303,7 +1303,7 @@ _e_winlist_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event } static Eina_Bool -_e_winlist_scroll_timer(void *data __UNUSED__) +_e_winlist_scroll_timer(void *data EINA_UNUSED) { if (_scroll_to) { @@ -1319,7 +1319,7 @@ _e_winlist_scroll_timer(void *data __UNUSED__) } static Eina_Bool -_e_winlist_animator(void *data __UNUSED__) +_e_winlist_animator(void *data EINA_UNUSED) { if (_scroll_to) { diff --git a/src/modules/wizard/e_mod_main.c b/src/modules/wizard/e_mod_main.c index 7c5a5ad173..d2fffb0e9e 100644 --- a/src/modules/wizard/e_mod_main.c +++ b/src/modules/wizard/e_mod_main.c @@ -91,7 +91,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_wizard_shutdown(); wiz_module = NULL; @@ -102,7 +102,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c index 4f1b8d255d..24df045f14 100644 --- a/src/modules/wizard/e_wizard.c +++ b/src/modules/wizard/e_wizard.c @@ -310,7 +310,7 @@ _e_wizard_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) } static void -_e_wizard_cb_next(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) +_e_wizard_cb_next(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { /* TODO: Disable button in theme */ if (next_can) @@ -379,7 +379,7 @@ _e_wizard_next_xdg(void) } static Eina_Bool -_e_wizard_cb_next_page(void *data __UNUSED__) +_e_wizard_cb_next_page(void *data EINA_UNUSED) { next_timer = NULL; _e_wizard_next_xdg(); @@ -388,7 +388,7 @@ _e_wizard_cb_next_page(void *data __UNUSED__) static Eina_Bool -_e_wizard_cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev) +_e_wizard_cb_desktops_update(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev) { Efreet_Event_Cache_Update *e; @@ -403,7 +403,7 @@ _e_wizard_cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__, void } static Eina_Bool -_e_wizard_cb_icons_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__) +_e_wizard_cb_icons_update(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev EINA_UNUSED) { got_icons = EINA_TRUE; if (_e_wizard_check_xdg()) diff --git a/src/modules/wizard/page_000.c b/src/modules/wizard/page_000.c index 4727c2078f..a739d5893b 100644 --- a/src/modules/wizard/page_000.c +++ b/src/modules/wizard/page_000.c @@ -6,19 +6,19 @@ static Ecore_Timer *_next_timer = NULL; /* EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ static Eina_Bool -_next_page(void *data __UNUSED__) +_next_page(void *data EINA_UNUSED) { _next_timer = NULL; e_wizard_button_next_enable_set(1); @@ -27,7 +27,7 @@ _next_page(void *data __UNUSED__) } EAPI int -wizard_page_show(E_Wizard_Page *pg __UNUSED__) +wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { Evas_Object *o; @@ -44,7 +44,7 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__) } EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { if (_next_timer) ecore_timer_del(_next_timer); _next_timer = NULL; @@ -52,7 +52,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__) } /* EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c index daa667214a..755dae013c 100644 --- a/src/modules/wizard/page_010.c +++ b/src/modules/wizard/page_010.c @@ -82,7 +82,7 @@ _basic_lang_list_sort(const void *data1, const void *data2) } EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { FILE *output; @@ -143,7 +143,7 @@ wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UN } EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { eina_list_free(blang_list); return 1; @@ -223,7 +223,7 @@ wizard_page_show(E_Wizard_Page *pg) } EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { // evas_object_del(pg->data); /* special - language inits its stuff the moment it goes away */ @@ -239,7 +239,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__) } EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { // do this again as we want it to apply to the new profile eina_stringshare_del(e_config->language); diff --git a/src/modules/wizard/page_011.c b/src/modules/wizard/page_011.c index 2681dfc610..41bf68a072 100644 --- a/src/modules/wizard/page_011.c +++ b/src/modules/wizard/page_011.c @@ -121,7 +121,7 @@ implement_layout(void) } EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { // parse kbd rules here find_rules(); @@ -130,7 +130,7 @@ wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UN } /* EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } @@ -186,7 +186,7 @@ wizard_page_show(E_Wizard_Page *pg) } EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { /* special - key layout inits its stuff the moment it goes away */ implement_layout(); @@ -194,7 +194,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__) } EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { // do this again as we want it to apply to the new profile implement_layout(); diff --git a/src/modules/wizard/page_020.c b/src/modules/wizard/page_020.c index 8a1b33be0c..b08764cebb 100644 --- a/src/modules/wizard/page_020.c +++ b/src/modules/wizard/page_020.c @@ -5,7 +5,7 @@ static const char *profile = NULL; static Evas_Object *textblock = NULL; static void -_profile_change(void *data __UNUSED__, Evas_Object *obj __UNUSED__) +_profile_change(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED) { char buf[PATH_MAX]; char *dir; @@ -28,13 +28,13 @@ _profile_change(void *data __UNUSED__, Evas_Object *obj __UNUSED__) } /* EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } @@ -134,7 +134,7 @@ wizard_page_show(E_Wizard_Page *pg) } EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { // evas_object_del(pg->data); // actually apply profile @@ -147,7 +147,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__) } /* EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/page_030.c b/src/modules/wizard/page_030.c index a878b7cfb9..2b93cd51b2 100644 --- a/src/modules/wizard/page_030.c +++ b/src/modules/wizard/page_030.c @@ -2,19 +2,19 @@ #include "e_wizard.h" /* EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ EAPI int -wizard_page_show(E_Wizard_Page *pg __UNUSED__) +wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { char buf[PATH_MAX]; @@ -25,13 +25,13 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__) } /* EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/page_040.c b/src/modules/wizard/page_040.c index 71dd1fdee6..fc255dde0e 100644 --- a/src/modules/wizard/page_040.c +++ b/src/modules/wizard/page_040.c @@ -4,20 +4,20 @@ static Ecore_Timer *_next_timer = NULL; EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons EINA_UNUSED) { *need_xdg_desktops = EINA_TRUE; return 1; } /* EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ static Eina_Bool -_next_page(void *data __UNUSED__) +_next_page(void *data EINA_UNUSED) { _next_timer = NULL; e_wizard_button_next_enable_set(1); @@ -26,7 +26,7 @@ _next_page(void *data __UNUSED__) } EAPI int -wizard_page_show(E_Wizard_Page *pg __UNUSED__) +wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { Eina_List *extra_desks, *desks; Efreet_Desktop *desk, *extra_desk; @@ -111,7 +111,7 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__) } EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { if (_next_timer) ecore_timer_del(_next_timer); _next_timer = NULL; @@ -119,7 +119,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__) } /* EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/page_050.c b/src/modules/wizard/page_050.c index e06b3621d1..7a8e4a45b6 100644 --- a/src/modules/wizard/page_050.c +++ b/src/modules/wizard/page_050.c @@ -5,13 +5,13 @@ static double scale = 1.0; static Eina_List *obs = NULL; /* EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } @@ -42,7 +42,7 @@ _scale_preview_sel_set(Evas_Object *ob, int sel) } static void -_scale_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_scale_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Evas_Object *ob = data; @@ -173,7 +173,7 @@ wizard_page_show(E_Wizard_Page *pg) } EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { obs = eina_list_free(obs); // evas_object_del(pg->data); @@ -186,7 +186,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__) } /* EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/page_060.c b/src/modules/wizard/page_060.c index 00a1bad27c..5f12a79bbf 100644 --- a/src/modules/wizard/page_060.c +++ b/src/modules/wizard/page_060.c @@ -4,13 +4,13 @@ static int focus_mode = 1; /* EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } @@ -46,7 +46,7 @@ wizard_page_show(E_Wizard_Page *pg) } EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { if (!focus_mode) { @@ -80,7 +80,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__) } /* EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/page_070.c b/src/modules/wizard/page_070.c index b681c7f625..02a6a63854 100644 --- a/src/modules/wizard/page_070.c +++ b/src/modules/wizard/page_070.c @@ -2,20 +2,20 @@ #include "e_wizard.h" EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons) { *need_xdg_icons = EINA_TRUE; return 1; } /* EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ EAPI int -wizard_page_show(E_Wizard_Page *pg __UNUSED__) +wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { Eina_List *l, *themes = efreet_icon_theme_list_get(); Efreet_Icon_Theme *th; @@ -56,13 +56,13 @@ done: } /* EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/page_080.c b/src/modules/wizard/page_080.c index efb9ae2f78..fecd8d4477 100644 --- a/src/modules/wizard/page_080.c +++ b/src/modules/wizard/page_080.c @@ -2,20 +2,20 @@ #include "e_wizard.h" EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons EINA_UNUSED) { *need_xdg_desktops = EINA_TRUE; return 1; } /* EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ EAPI int -wizard_page_show(E_Wizard_Page *pg __UNUSED__) +wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { FILE *f, *fin; char buf[PATH_MAX]; @@ -63,13 +63,13 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__) } /* EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/page_090.c b/src/modules/wizard/page_090.c index 343ef2e028..f5814807fc 100644 --- a/src/modules/wizard/page_090.c +++ b/src/modules/wizard/page_090.c @@ -32,19 +32,19 @@ read_file(const char *file) } /* EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ EAPI int -wizard_page_show(E_Wizard_Page *pg __UNUSED__) +wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { int hav_bat = 0; Eina_List *dir; @@ -117,13 +117,13 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__) } /* EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/page_100.c b/src/modules/wizard/page_100.c index 61dbe553a2..0f46b18fb2 100644 --- a/src/modules/wizard/page_100.c +++ b/src/modules/wizard/page_100.c @@ -31,19 +31,19 @@ read_file(const char *file) #endif /* EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ EAPI int -wizard_page_show(E_Wizard_Page *pg __UNUSED__) +wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { int hav_cpufreq = 0; #ifdef __FreeBSD__ @@ -93,13 +93,13 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__) } /* EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/page_110.c b/src/modules/wizard/page_110.c index 3904b1d9ee..c833c2764f 100644 --- a/src/modules/wizard/page_110.c +++ b/src/modules/wizard/page_110.c @@ -78,7 +78,7 @@ _page_next_call(void *data EINA_UNUSED) static void _check_connman_owner(void *data, const Eldbus_Message *msg, - Eldbus_Pending *pending __UNUSED__) + Eldbus_Pending *pending EINA_UNUSED) { const char *id; pending_connman = NULL; @@ -108,13 +108,13 @@ fail: /* EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } @@ -165,7 +165,7 @@ wizard_page_show(E_Wizard_Page *pg) } EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { if (pending_connman) { @@ -189,7 +189,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__) } /* EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/page_120.c b/src/modules/wizard/page_120.c index a7079ad710..ee7e983729 100644 --- a/src/modules/wizard/page_120.c +++ b/src/modules/wizard/page_120.c @@ -78,19 +78,19 @@ _wizard_temperature_get_bus_files(const char *bus) /* EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ EAPI int -wizard_page_show(E_Wizard_Page *pg __UNUSED__) +wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { Eina_List *tempdevs = NULL; const char *sensor_path[] = { @@ -190,13 +190,13 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__) } /* EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/page_130.c b/src/modules/wizard/page_130.c index a37b82d400..307d436c96 100644 --- a/src/modules/wizard/page_130.c +++ b/src/modules/wizard/page_130.c @@ -2,19 +2,19 @@ #include "e_wizard.h" /* EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ EAPI int -wizard_page_show(E_Wizard_Page *pg __UNUSED__) +wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { int hav_backlight = 0; @@ -42,13 +42,13 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__) } /* EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/page_150.c b/src/modules/wizard/page_150.c index 2064fa968b..8f3786247e 100644 --- a/src/modules/wizard/page_150.c +++ b/src/modules/wizard/page_150.c @@ -101,7 +101,7 @@ wizard_page_show(E_Wizard_Page *pg) } EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { E_Comp_Config *conf = NULL; diff --git a/src/modules/wizard/page_160.c b/src/modules/wizard/page_160.c index 2f202f4407..5e9033ccb1 100644 --- a/src/modules/wizard/page_160.c +++ b/src/modules/wizard/page_160.c @@ -2,19 +2,19 @@ #include "e_wizard.h" /* EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ EAPI int -wizard_page_show(E_Wizard_Page *pg __UNUSED__) +wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { Eina_List *files; char buf[PATH_MAX], buf2[PATH_MAX], *file; @@ -38,13 +38,13 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__) } /* EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/page_170.c b/src/modules/wizard/page_170.c index 0fe0dc1e15..1cdd097f64 100644 --- a/src/modules/wizard/page_170.c +++ b/src/modules/wizard/page_170.c @@ -4,13 +4,13 @@ static int do_up = 1; /* EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } @@ -62,7 +62,7 @@ wizard_page_show(E_Wizard_Page *pg) } EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { e_config->update.check = do_up; e_config_save_queue(); @@ -70,7 +70,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__) } /* EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; } diff --git a/src/modules/wizard/page_180.c b/src/modules/wizard/page_180.c index ac057897a2..f9cdf00b0d 100644 --- a/src/modules/wizard/page_180.c +++ b/src/modules/wizard/page_180.c @@ -4,13 +4,13 @@ static int do_tasks = 1; /* EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } @@ -47,13 +47,13 @@ wizard_page_show(E_Wizard_Page *pg) } /* EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { E_Config_Module *em; Eina_List *l; diff --git a/src/modules/wizard/page_200.c b/src/modules/wizard/page_200.c index cdfbd52f9e..bb2d1d3b55 100644 --- a/src/modules/wizard/page_200.c +++ b/src/modules/wizard/page_200.c @@ -3,31 +3,31 @@ #if 0 EAPI int -wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__) +wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } EAPI int -wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__) +wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } EAPI int -wizard_page_show(E_Wizard_Page *pg __UNUSED__) +wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { return 0; /* 1 == show ui, and wait for user, 0 == just continue */ } EAPI int -wizard_page_hide(E_Wizard_Page *pg __UNUSED__) +wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } #endif EAPI int -wizard_page_apply(E_Wizard_Page *pg __UNUSED__) +wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { // save the config now everyone has modified it e_config_save(); diff --git a/src/modules/wl_screenshot/e_mod_main.c b/src/modules/wl_screenshot/e_mod_main.c index eadc89ab40..6910301326 100644 --- a/src/modules/wl_screenshot/e_mod_main.c +++ b/src/modules/wl_screenshot/e_mod_main.c @@ -17,14 +17,14 @@ static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); static const char *_gc_label(const E_Gadcon_Client_Class *cc); static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *cc, Evas *evas); static const char *_gc_id_new(const E_Gadcon_Client_Class *cc); -static void _cb_btn_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event); +static void _cb_btn_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event); static void _cb_handle_global(void *data, struct wl_registry *registry, unsigned int name, const char *interface, unsigned int version); -static void _cb_handle_global_remove(void *data __UNUSED__, struct wl_registry *registry __UNUSED__, unsigned int name __UNUSED__); +static void _cb_handle_global_remove(void *data EINA_UNUSED, struct wl_registry *registry EINA_UNUSED, unsigned int name EINA_UNUSED); static struct wl_buffer *_create_shm_buffer(struct wl_shm *_shm, int width, int height, void **data_out); -static void _cb_handle_geometry(void *data __UNUSED__, struct wl_output *wl_output __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__, int subpixel __UNUSED__, const char *make __UNUSED__, const char *model __UNUSED__, int transform __UNUSED__); +static void _cb_handle_geometry(void *data EINA_UNUSED, struct wl_output *wl_output EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int subpixel EINA_UNUSED, const char *make EINA_UNUSED, const char *model EINA_UNUSED, int transform EINA_UNUSED); static void _cb_handle_mode(void *data, struct wl_output *wl_output, unsigned int flags, int w, int h, int refresh); static void _save_png(int w, int h, void *data); -static Eina_Bool _cb_timer(void *data __UNUSED__); +static Eina_Bool _cb_timer(void *data EINA_UNUSED); static const E_Gadcon_Client_Class _gc = { @@ -85,7 +85,7 @@ e_modapi_init(E_Module *m) } EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { _mod = NULL; e_gadcon_provider_unregister(&_gc); @@ -94,7 +94,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } @@ -138,7 +138,7 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { Instance *inst; Evas_Coord mw, mh; @@ -155,13 +155,13 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) } static const char * -_gc_label(const E_Gadcon_Client_Class *cc __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *cc EINA_UNUSED) { return _("Screenshooter"); } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *cc EINA_UNUSED, Evas *evas) { Evas_Object *o; char buf[PATH_MAX]; @@ -173,13 +173,13 @@ _gc_icon(const E_Gadcon_Client_Class *cc __UNUSED__, Evas *evas) } static const char * -_gc_id_new(const E_Gadcon_Client_Class *cc __UNUSED__) +_gc_id_new(const E_Gadcon_Client_Class *cc EINA_UNUSED) { return _gc.name; } static void -_cb_btn_down(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_cb_btn_down(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Mouse_Down *ev; @@ -192,7 +192,7 @@ _cb_btn_down(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj __UN } static void -_cb_handle_global(void *data __UNUSED__, struct wl_registry *registry, unsigned int name, const char *interface, unsigned int version __UNUSED__) +_cb_handle_global(void *data EINA_UNUSED, struct wl_registry *registry, unsigned int name, const char *interface, unsigned int version EINA_UNUSED) { if (!strcmp(interface, "screenshooter")) { @@ -210,7 +210,7 @@ _cb_handle_global(void *data __UNUSED__, struct wl_registry *registry, unsigned } static void -_cb_handle_global_remove(void *data __UNUSED__, struct wl_registry *registry __UNUSED__, unsigned int name __UNUSED__) +_cb_handle_global_remove(void *data EINA_UNUSED, struct wl_registry *registry EINA_UNUSED, unsigned int name EINA_UNUSED) { /* no-op */ } @@ -266,13 +266,13 @@ _create_shm_buffer(struct wl_shm *_shm, int width, int height, void **data_out) } static void -_cb_handle_geometry(void *data __UNUSED__, struct wl_output *wl_output __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__, int subpixel __UNUSED__, const char *make __UNUSED__, const char *model __UNUSED__, int transform __UNUSED__) +_cb_handle_geometry(void *data EINA_UNUSED, struct wl_output *wl_output EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int subpixel EINA_UNUSED, const char *make EINA_UNUSED, const char *model EINA_UNUSED, int transform EINA_UNUSED) { /* no-op */ } static void -_cb_handle_mode(void *data __UNUSED__, struct wl_output *wl_output __UNUSED__, unsigned int flags __UNUSED__, int w, int h, int refresh __UNUSED__) +_cb_handle_mode(void *data EINA_UNUSED, struct wl_output *wl_output EINA_UNUSED, unsigned int flags EINA_UNUSED, int w, int h, int refresh EINA_UNUSED) { if (ow == 0) ow = w; if (oh == 0) oh = h; @@ -308,7 +308,7 @@ _save_png(int w, int h, void *data) } static Eina_Bool -_cb_timer(void *data __UNUSED__) +_cb_timer(void *data EINA_UNUSED) { struct wl_buffer *buffer; void *d = NULL; diff --git a/src/modules/xkbswitch/e_mod_config.c b/src/modules/xkbswitch/e_mod_config.c index 61db703c2f..f488f01402 100644 --- a/src/modules/xkbswitch/e_mod_config.c +++ b/src/modules/xkbswitch/e_mod_config.c @@ -35,11 +35,11 @@ static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dia static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static void _cb_add(void *data, void *data2 __UNUSED__); -static void _cb_del(void *data, void *data2 __UNUSED__); +static void _cb_add(void *data, void *data2 EINA_UNUSED); +static void _cb_del(void *data, void *data2 EINA_UNUSED); -static void _cb_up(void *data, void *data2 __UNUSED__); -static void _cb_dn(void *data, void *data2 __UNUSED__); +static void _cb_up(void *data, void *data2 EINA_UNUSED); +static void _cb_dn(void *data, void *data2 EINA_UNUSED); static void _dlg_add_cb_ok(void *data, E_Dialog *dlg); static void _dlg_add_cb_cancel(void *data, E_Dialog *dlg); @@ -58,7 +58,7 @@ static Eina_Bool _cb_fill_delay(void *data); /* Externals */ E_Config_Dialog * -_xkb_cfg_dialog(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) +_xkb_cfg_dialog(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -84,7 +84,7 @@ _xkb_cfg_dialog(Evas_Object *parent EINA_UNUSED, const char *params __UNUSED__) /* Locals */ static void * -_create_data(E_Config_Dialog *cfd __UNUSED__) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; Eina_List *l, *ll, *lll; @@ -138,7 +138,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) } static void -_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { E_Config_XKB_Layout *cl; E_XKB_Dialog_Option *od; @@ -165,7 +165,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *l, *l2, *l3; E_Config_XKB_Layout *cl, *nl; @@ -217,7 +217,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static int -_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { Eina_List *l; E_Config_XKB_Layout *cl, *nl; @@ -391,7 +391,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data } static void -_cb_add(void *data, void *data2 __UNUSED__) +_cb_add(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; if (!(cfdata = data)) return; @@ -401,7 +401,7 @@ _cb_add(void *data, void *data2 __UNUSED__) } static void -_cb_del(void *data, void *data2 __UNUSED__) +_cb_del(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; int n = 0; @@ -423,7 +423,7 @@ _cb_del(void *data, void *data2 __UNUSED__) } static void -_cb_up(void *data, void *data2 __UNUSED__) +_cb_up(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; void *nddata; @@ -463,7 +463,7 @@ _cb_up(void *data, void *data2 __UNUSED__) } static void -_cb_dn(void *data, void *data2 __UNUSED__) +_cb_dn(void *data, void *data2 EINA_UNUSED) { E_Config_Dialog_Data *cfdata; void *nddata; @@ -566,7 +566,7 @@ _dlg_add_new(E_Config_Dialog_Data *cfdata) } static void -_dlg_add_cb_ok(void *data __UNUSED__, E_Dialog *dlg) +_dlg_add_cb_ok(void *data EINA_UNUSED, E_Dialog *dlg) { E_Config_Dialog_Data *cfdata = dlg->data; E_Config_XKB_Layout *cl; @@ -610,7 +610,7 @@ _dlg_add_cb_ok(void *data __UNUSED__, E_Dialog *dlg) } static void -_dlg_add_cb_cancel(void *data __UNUSED__, E_Dialog *dlg) +_dlg_add_cb_cancel(void *data EINA_UNUSED, E_Dialog *dlg) { E_Config_Dialog_Data *cfdata = dlg->data; cfdata->dlg_add_new = NULL; diff --git a/src/modules/xkbswitch/e_mod_main.c b/src/modules/xkbswitch/e_mod_main.c index c9ef4ec48b..cd86c5c219 100644 --- a/src/modules/xkbswitch/e_mod_main.c +++ b/src/modules/xkbswitch/e_mod_main.c @@ -7,15 +7,15 @@ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); static const char *_gc_label(const E_Gadcon_Client_Class *client_class); -static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class __UNUSED__); +static const char *_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED); static Evas_Object *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas); /* EVENTS */ -static Eina_Bool _xkb_changed_state(void *data __UNUSED__, int type __UNUSED__, void *event); +static Eina_Bool _xkb_changed_state(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); static void _e_xkb_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event); -static void _e_xkb_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item *mi __UNUSED__); -static void _e_xkb_cb_lmenu_post(void *data, E_Menu *menu __UNUSED__); -static void _e_xkb_cb_lmenu_set(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__); +static void _e_xkb_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item *mi EINA_UNUSED); +static void _e_xkb_cb_lmenu_post(void *data, E_Menu *menu EINA_UNUSED); +static void _e_xkb_cb_lmenu_set(void *data, E_Menu *mn EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED); /* Static variables * The static variables specific to the current code unit. @@ -88,7 +88,7 @@ e_modapi_init(E_Module *m) * and frees up the config. */ EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) +e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_configure_registry_item_del("keyboard_and_mouse/xkbswitch"); e_configure_registry_category_del("keyboard_and_mouse"); @@ -106,7 +106,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) * Used to save the configuration file. */ EAPI int -e_modapi_save(E_Module *m __UNUSED__) +e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } @@ -242,14 +242,14 @@ _gc_shutdown(E_Gadcon_Client *gcc) } static void -_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) +_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED) { e_gadcon_client_aspect_set(gcc, 16, 16); e_gadcon_client_min_size_set(gcc, 16, 16); } static const char * -_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__) +_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED) { return _("Keyboard"); } @@ -265,7 +265,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class) } static Evas_Object * -_gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) +_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) { Evas_Object *o; char buf[PATH_MAX]; @@ -277,7 +277,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) } static Eina_Bool -_xkb_changed_state(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) +_xkb_changed_state(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { Ecore_X_Event_Xkb *ev = (Ecore_X_Event_Xkb *)event; @@ -303,7 +303,7 @@ _xkb_menu_items_sort(const void *data1, const void *data2) #endif static void -_e_xkb_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_e_xkb_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { Evas_Event_Mouse_Down *ev = event; Instance *inst = data; @@ -466,7 +466,7 @@ _e_xkb_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSE } static void -_e_xkb_cb_lmenu_post(void *data, E_Menu *menu __UNUSED__) +_e_xkb_cb_lmenu_post(void *data, E_Menu *menu EINA_UNUSED) { Instance *inst = data; @@ -476,14 +476,14 @@ _e_xkb_cb_lmenu_post(void *data, E_Menu *menu __UNUSED__) } static void -_e_xkb_cb_menu_configure(void *data __UNUSED__, E_Menu *mn EINA_UNUSED, E_Menu_Item *mi __UNUSED__) +_e_xkb_cb_menu_configure(void *data EINA_UNUSED, E_Menu *mn EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { if (_xkb.cfd) return; _xkb_cfg_dialog(NULL, NULL); } static void -_e_xkb_cb_lmenu_set(void *data, E_Menu *mn __UNUSED__, E_Menu_Item *mi __UNUSED__) +_e_xkb_cb_lmenu_set(void *data, E_Menu *mn EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) { Eina_List *l; int cur_group = -1, grp = -1; |