aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-03-18 18:09:09 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-03-18 18:09:09 -0400
commit471dcb24cb9964a3f25dd98628176533f4ba3751 (patch)
tree2b7c631586578b2cf44079c19919bf75923eb660
parentupdate contact module for api changes + remove E_Comp usage (diff)
downloadenlightenment-471dcb24cb9964a3f25dd98628176533f4ba3751.tar.gz
__UNUSED__ -> EINA_UNUSED
this has been bugging me forever. __UNUSED__ is no longer a valid macro here.
-rw-r--r--configure.ac1
-rw-r--r--m4/ac_attribute.m447
-rw-r--r--src/bin/e_acpi.c16
-rw-r--r--src/bin/e_actions.c142
-rw-r--r--src/bin/e_backlight.c10
-rw-r--r--src/bin/e_bg.c14
-rw-r--r--src/bin/e_color_dialog.c6
-rw-r--r--src/bin/e_comp.c6
-rw-r--r--src/bin/e_comp_x.c6
-rw-r--r--src/bin/e_config.c2
-rw-r--r--src/bin/e_config_dialog.c12
-rw-r--r--src/bin/e_configure.c10
-rw-r--r--src/bin/e_confirm_dialog.c4
-rw-r--r--src/bin/e_desk.c12
-rw-r--r--src/bin/e_desklock.c22
-rw-r--r--src/bin/e_desktop_editor.c18
-rw-r--r--src/bin/e_dialog.c4
-rw-r--r--src/bin/e_dnd.c24
-rw-r--r--src/bin/e_dpms.c8
-rw-r--r--src/bin/e_entry_dialog.c6
-rw-r--r--src/bin/e_exec.c14
-rw-r--r--src/bin/e_exehist.c2
-rw-r--r--src/bin/e_filereg.c10
-rw-r--r--src/bin/e_flowlayout.c2
-rw-r--r--src/bin/e_fm.c182
-rw-r--r--src/bin/e_fm/e_fm_ipc.c18
-rw-r--r--src/bin/e_fm/e_fm_main_eeze.c34
-rw-r--r--src/bin/e_fm/e_fm_main_udisks.c26
-rw-r--r--src/bin/e_fm/e_fm_main_udisks2.c12
-rw-r--r--src/bin/e_fm_cmdline.c6
-rw-r--r--src/bin/e_fm_custom.c8
-rw-r--r--src/bin/e_fm_device.c4
-rw-r--r--src/bin/e_fm_mime.c8
-rw-r--r--src/bin/e_fm_op.c6
-rw-r--r--src/bin/e_fm_op_registry.c6
-rw-r--r--src/bin/e_fm_prop.c10
-rw-r--r--src/bin/e_focus.c2
-rw-r--r--src/bin/e_font.c4
-rw-r--r--src/bin/e_gadcon.c106
-rw-r--r--src/bin/e_gadcon_popup.c8
-rw-r--r--src/bin/e_grab_dialog.c6
-rw-r--r--src/bin/e_grabinput.c2
-rw-r--r--src/bin/e_hints.c2
-rw-r--r--src/bin/e_icon.c4
-rw-r--r--src/bin/e_ilist.c10
-rw-r--r--src/bin/e_import_config_dialog.c6
-rw-r--r--src/bin/e_import_dialog.c4
-rw-r--r--src/bin/e_init.c4
-rw-r--r--src/bin/e_int_client_locks.c10
-rw-r--r--src/bin/e_int_client_menu.c100
-rw-r--r--src/bin/e_int_client_prop.c6
-rw-r--r--src/bin/e_int_client_remember.c4
-rw-r--r--src/bin/e_int_config_comp.c8
-rw-r--r--src/bin/e_int_config_comp_match.c2
-rw-r--r--src/bin/e_int_config_modules.c20
-rw-r--r--src/bin/e_int_gadcon_config.c28
-rw-r--r--src/bin/e_int_menus.c54
-rw-r--r--src/bin/e_int_shelf_config.c20
-rw-r--r--src/bin/e_int_toolbar_config.c6
-rw-r--r--src/bin/e_intl.c4
-rw-r--r--src/bin/e_ipc.c12
-rw-r--r--src/bin/e_layout.c2
-rw-r--r--src/bin/e_log.c2
-rw-r--r--src/bin/e_main.c30
-rw-r--r--src/bin/e_menu.c18
-rw-r--r--src/bin/e_module.c4
-rw-r--r--src/bin/e_moveresize.c12
-rw-r--r--src/bin/e_msg.c4
-rw-r--r--src/bin/e_msgbus.c34
-rw-r--r--src/bin/e_obj_dialog.c4
-rw-r--r--src/bin/e_open.c2
-rw-r--r--src/bin/e_order.c4
-rw-r--r--src/bin/e_pan.c4
-rw-r--r--src/bin/e_path.c2
-rw-r--r--src/bin/e_place.c2
-rw-r--r--src/bin/e_powersave.c6
-rw-r--r--src/bin/e_remember.c8
-rw-r--r--src/bin/e_resist.c2
-rw-r--r--src/bin/e_screensaver.c26
-rw-r--r--src/bin/e_scrollframe.c20
-rw-r--r--src/bin/e_shelf.c36
-rw-r--r--src/bin/e_signals.c10
-rw-r--r--src/bin/e_slidecore.c6
-rw-r--r--src/bin/e_slider.c16
-rw-r--r--src/bin/e_slidesel.c8
-rw-r--r--src/bin/e_start_main.c2
-rw-r--r--src/bin/e_startup.c4
-rw-r--r--src/bin/e_sys.c24
-rw-r--r--src/bin/e_theme.c8
-rw-r--r--src/bin/e_theme_about.c2
-rw-r--r--src/bin/e_thumb.c8
-rw-r--r--src/bin/e_thumb_main.c16
-rw-r--r--src/bin/e_toolbar.c26
-rw-r--r--src/bin/e_update.c14
-rw-r--r--src/bin/e_utils.c12
-rw-r--r--src/bin/e_widget.c4
-rw-r--r--src/bin/e_widget_aspect.c2
-rw-r--r--src/bin/e_widget_bgpreview.c12
-rw-r--r--src/bin/e_widget_button.c2
-rw-r--r--src/bin/e_widget_check.c4
-rw-r--r--src/bin/e_widget_color_well.c8
-rw-r--r--src/bin/e_widget_config_list.c10
-rw-r--r--src/bin/e_widget_csel.c4
-rw-r--r--src/bin/e_widget_cslider.c18
-rw-r--r--src/bin/e_widget_entry.c12
-rw-r--r--src/bin/e_widget_filepreview.c30
-rw-r--r--src/bin/e_widget_flist.c10
-rw-r--r--src/bin/e_widget_font_preview.c4
-rw-r--r--src/bin/e_widget_fsel.c26
-rw-r--r--src/bin/e_widget_ilist.c8
-rw-r--r--src/bin/e_widget_preview.c2
-rw-r--r--src/bin/e_widget_radio.c4
-rw-r--r--src/bin/e_widget_scrollframe.c4
-rw-r--r--src/bin/e_widget_slider.c4
-rw-r--r--src/bin/e_widget_spectrum.c12
-rw-r--r--src/bin/e_widget_textblock.c2
-rw-r--r--src/bin/e_widget_toolbar.c12
-rw-r--r--src/bin/e_win.c18
-rw-r--r--src/bin/e_xsettings.c4
-rw-r--r--src/bin/e_zone.c10
-rw-r--r--src/bin/e_zoomap.c4
-rw-r--r--src/modules/access/e_mod_config.c14
-rw-r--r--src/modules/access/e_mod_main.c48
-rw-r--r--src/modules/appmenu/e_mod_dbus_registrar_server.c2
-rw-r--r--src/modules/appmenu/e_mod_main.c4
-rw-r--r--src/modules/backlight/e_mod_main.c22
-rw-r--r--src/modules/battery/batget.c24
-rw-r--r--src/modules/battery/e_mod_config.c26
-rw-r--r--src/modules/battery/e_mod_main.c22
-rw-r--r--src/modules/battery/e_mod_main.h2
-rw-r--r--src/modules/battery/e_mod_udev.c4
-rw-r--r--src/modules/battery/e_mod_upower.c16
-rw-r--r--src/modules/bluez4/e_mod_main.c12
-rw-r--r--src/modules/clock/e_mod_config.c8
-rw-r--r--src/modules/clock/e_mod_main.c42
-rw-r--r--src/modules/conf/e_conf.c8
-rw-r--r--src/modules/conf/e_mod_config.c12
-rw-r--r--src/modules/conf/e_mod_main.c34
-rw-r--r--src/modules/conf_applications/e_int_config_apps.c42
-rw-r--r--src/modules/conf_applications/e_int_config_apps_personal.c22
-rw-r--r--src/modules/conf_applications/e_int_config_defapps.c18
-rw-r--r--src/modules/conf_applications/e_int_config_deskenv.c12
-rw-r--r--src/modules/conf_applications/e_mod_main.c4
-rw-r--r--src/modules/conf_applications/e_mod_main.h20
-rw-r--r--src/modules/conf_bindings/e_int_config_acpibindings.c28
-rw-r--r--src/modules/conf_bindings/e_int_config_edgebindings.c24
-rw-r--r--src/modules/conf_bindings/e_int_config_keybindings.c16
-rw-r--r--src/modules/conf_bindings/e_int_config_mousebindings.c20
-rw-r--r--src/modules/conf_bindings/e_int_config_signalbindings.c14
-rw-r--r--src/modules/conf_bindings/e_mod_main.c4
-rw-r--r--src/modules/conf_bindings/e_mod_main.h8
-rw-r--r--src/modules/conf_dialogs/e_int_config_dialogs.c12
-rw-r--r--src/modules/conf_dialogs/e_int_config_profiles.c14
-rw-r--r--src/modules/conf_dialogs/e_mod_main.c4
-rw-r--r--src/modules/conf_dialogs/e_mod_main.h4
-rw-r--r--src/modules/conf_display/e_int_config_desk.c6
-rw-r--r--src/modules/conf_display/e_int_config_desklock.c14
-rw-r--r--src/modules/conf_display/e_int_config_desklock_fsel.c14
-rw-r--r--src/modules/conf_display/e_int_config_desks.c14
-rw-r--r--src/modules/conf_display/e_int_config_dpms.c14
-rw-r--r--src/modules/conf_display/e_int_config_screensaver.c14
-rw-r--r--src/modules/conf_display/e_mod_main.c4
-rw-r--r--src/modules/conf_display/e_mod_main.h10
-rw-r--r--src/modules/conf_interaction/e_int_config_interaction.c14
-rw-r--r--src/modules/conf_interaction/e_int_config_mouse.c12
-rw-r--r--src/modules/conf_interaction/e_mod_main.c4
-rw-r--r--src/modules/conf_interaction/e_mod_main.h4
-rw-r--r--src/modules/conf_intl/e_int_config_imc.c40
-rw-r--r--src/modules/conf_intl/e_int_config_imc_import.c10
-rw-r--r--src/modules/conf_intl/e_int_config_intl.c38
-rw-r--r--src/modules/conf_intl/e_mod_main.c4
-rw-r--r--src/modules/conf_intl/e_mod_main.h6
-rw-r--r--src/modules/conf_menus/e_int_config_menus.c14
-rw-r--r--src/modules/conf_menus/e_mod_main.c4
-rw-r--r--src/modules/conf_menus/e_mod_main.h2
-rw-r--r--src/modules/conf_paths/e_int_config_env.c14
-rw-r--r--src/modules/conf_paths/e_int_config_paths.c6
-rw-r--r--src/modules/conf_paths/e_mod_main.c4
-rw-r--r--src/modules/conf_paths/e_mod_main.h4
-rw-r--r--src/modules/conf_performance/e_int_config_performance.c12
-rw-r--r--src/modules/conf_performance/e_int_config_powermanagement.c16
-rw-r--r--src/modules/conf_performance/e_mod_main.c4
-rw-r--r--src/modules/conf_performance/e_mod_main.h6
-rw-r--r--src/modules/conf_randr/e_int_config_randr.h2
-rw-r--r--src/modules/conf_randr/e_mod_main.c4
-rw-r--r--src/modules/conf_shelves/e_int_config_shelf.c28
-rw-r--r--src/modules/conf_shelves/e_int_config_shelf.h2
-rw-r--r--src/modules/conf_shelves/e_mod_main.c8
-rw-r--r--src/modules/conf_shelves/e_mod_main.h2
-rw-r--r--src/modules/conf_theme/e_int_config_borders.c10
-rw-r--r--src/modules/conf_theme/e_int_config_color_classes.c10
-rw-r--r--src/modules/conf_theme/e_int_config_fonts.c26
-rw-r--r--src/modules/conf_theme/e_int_config_scale.c30
-rw-r--r--src/modules/conf_theme/e_int_config_theme.c28
-rw-r--r--src/modules/conf_theme/e_int_config_theme_import.c10
-rw-r--r--src/modules/conf_theme/e_int_config_transitions.c12
-rw-r--r--src/modules/conf_theme/e_int_config_wallpaper.c20
-rw-r--r--src/modules/conf_theme/e_int_config_xsettings.c8
-rw-r--r--src/modules/conf_theme/e_mod_main.c10
-rw-r--r--src/modules/conf_theme/e_mod_main.h16
-rw-r--r--src/modules/conf_window_manipulation/e_int_config_clientlist.c12
-rw-r--r--src/modules/conf_window_manipulation/e_int_config_focus.c18
-rw-r--r--src/modules/conf_window_manipulation/e_int_config_window_display.c12
-rw-r--r--src/modules/conf_window_manipulation/e_int_config_window_geometry.c12
-rw-r--r--src/modules/conf_window_manipulation/e_int_config_window_process.c12
-rw-r--r--src/modules/conf_window_manipulation/e_mod_main.c4
-rw-r--r--src/modules/conf_window_manipulation/e_mod_main.h10
-rw-r--r--src/modules/conf_window_remembers/e_int_config_remembers.c18
-rw-r--r--src/modules/conf_window_remembers/e_mod_main.c4
-rw-r--r--src/modules/conf_window_remembers/e_mod_main.h2
-rw-r--r--src/modules/connman/agent.c6
-rw-r--r--src/modules/contact/e_edges.c12
-rw-r--r--src/modules/contact/e_mod_main.c22
-rw-r--r--src/modules/contact/e_policy.c24
-rw-r--r--src/modules/cpufreq/e_mod_config.c12
-rw-r--r--src/modules/cpufreq/e_mod_main.c52
-rw-r--r--src/modules/everything/e_mod_main.c12
-rw-r--r--src/modules/everything/evry.c22
-rw-r--r--src/modules/everything/evry_config.c22
-rw-r--r--src/modules/everything/evry_gadget.c24
-rw-r--r--src/modules/everything/evry_history.c8
-rw-r--r--src/modules/everything/evry_plug_aggregator.c2
-rw-r--r--src/modules/everything/evry_plug_apps.c30
-rw-r--r--src/modules/everything/evry_plug_calc.c12
-rw-r--r--src/modules/everything/evry_plug_clipboard.c2
-rw-r--r--src/modules/everything/evry_plug_collection.c4
-rw-r--r--src/modules/everything/evry_plug_files.c22
-rw-r--r--src/modules/everything/evry_plug_settings.c6
-rw-r--r--src/modules/everything/evry_plug_text.c2
-rw-r--r--src/modules/everything/evry_plug_windows.c8
-rw-r--r--src/modules/everything/evry_util.c2
-rw-r--r--src/modules/everything/evry_view.c34
-rw-r--r--src/modules/everything/evry_view_help.c4
-rw-r--r--src/modules/everything/evry_view_tabs.c6
-rw-r--r--src/modules/fileman/e_fwin.c102
-rw-r--r--src/modules/fileman/e_fwin_nav.c42
-rw-r--r--src/modules/fileman/e_int_config_mime.c6
-rw-r--r--src/modules/fileman/e_int_config_mime_edit.c12
-rw-r--r--src/modules/fileman/e_mod_config.c14
-rw-r--r--src/modules/fileman/e_mod_dbus.c4
-rw-r--r--src/modules/fileman/e_mod_main.c8
-rw-r--r--src/modules/fileman/e_mod_main.h4
-rw-r--r--src/modules/fileman/e_mod_menu.c16
-rw-r--r--src/modules/fileman_opinfo/e_mod_main.c20
-rw-r--r--src/modules/gadman/e_mod_config.c20
-rw-r--r--src/modules/gadman/e_mod_gadman.c62
-rw-r--r--src/modules/gadman/e_mod_gadman.h2
-rw-r--r--src/modules/gadman/e_mod_main.c16
-rw-r--r--src/modules/ibar/e_mod_config.c12
-rw-r--r--src/modules/ibar/e_mod_main.c64
-rw-r--r--src/modules/ibox/e_mod_config.c4
-rw-r--r--src/modules/ibox/e_mod_main.c54
-rw-r--r--src/modules/illume-bluetooth/e_mod_main.c12
-rw-r--r--src/modules/illume-home-toggle/e_mod_main.c14
-rw-r--r--src/modules/illume-home/e_mod_config.c14
-rw-r--r--src/modules/illume-home/e_mod_main.c40
-rw-r--r--src/modules/illume-indicator/e_mod_ind_win.c48
-rw-r--r--src/modules/illume-indicator/e_mod_main.c4
-rw-r--r--src/modules/illume-kbd-toggle/e_mod_main.c28
-rw-r--r--src/modules/illume-keyboard/e_kbd_buf.c8
-rw-r--r--src/modules/illume-keyboard/e_kbd_dict.c4
-rw-r--r--src/modules/illume-keyboard/e_kbd_int.c18
-rw-r--r--src/modules/illume-keyboard/e_mod_config.c12
-rw-r--r--src/modules/illume-keyboard/e_mod_main.c6
-rw-r--r--src/modules/illume-mode-toggle/e_mod_main.c28
-rw-r--r--src/modules/illume-softkey/e_mod_main.c4
-rw-r--r--src/modules/illume-softkey/e_mod_sft_win.c24
-rw-r--r--src/modules/illume2/e_mod_config_animation.c12
-rw-r--r--src/modules/illume2/e_mod_config_policy.c10
-rw-r--r--src/modules/illume2/e_mod_config_windows.c32
-rw-r--r--src/modules/illume2/e_mod_kbd.c32
-rw-r--r--src/modules/illume2/e_mod_kbd_device.c4
-rw-r--r--src/modules/illume2/e_mod_main.c4
-rw-r--r--src/modules/illume2/e_mod_main.h6
-rw-r--r--src/modules/illume2/e_mod_policy.c44
-rw-r--r--src/modules/illume2/e_mod_quickpanel.c28
-rw-r--r--src/modules/illume2/e_mod_select_window.c8
-rw-r--r--src/modules/illume2/policies/tablet/policy.c4
-rw-r--r--src/modules/mixer/app_mixer.c14
-rw-r--r--src/modules/mixer/conf_gadget.c4
-rw-r--r--src/modules/mixer/conf_module.c4
-rw-r--r--src/modules/mixer/e_mod_main.c36
-rw-r--r--src/modules/mixer/pa.c4
-rw-r--r--src/modules/mixer/pa.h6
-rw-r--r--src/modules/mixer/serial.c2
-rw-r--r--src/modules/mixer/sys_alsa.c2
-rw-r--r--src/modules/mixer/sys_dummy.c36
-rw-r--r--src/modules/mixer/sys_pulse.c22
-rw-r--r--src/modules/mixer/tag.c2
-rw-r--r--src/modules/msgbus/e_mod_main.c4
-rw-r--r--src/modules/msgbus/msgbus_audit.c2
-rw-r--r--src/modules/msgbus/msgbus_desktop.c16
-rw-r--r--src/modules/msgbus/msgbus_lang.c2
-rw-r--r--src/modules/music-control/ui.c10
-rw-r--r--src/modules/notification/e_mod_config.c16
-rw-r--r--src/modules/notification/e_mod_main.c8
-rw-r--r--src/modules/notification/e_mod_popup.c18
-rw-r--r--src/modules/pager/e_mod_config.c30
-rw-r--r--src/modules/pager/e_mod_main.c110
-rw-r--r--src/modules/pager_plain/e_mod_config.c30
-rw-r--r--src/modules/pager_plain/e_mod_main.c188
-rw-r--r--src/modules/quickaccess/e_mod_config.c14
-rw-r--r--src/modules/quickaccess/e_mod_main.c4
-rw-r--r--src/modules/quickaccess/e_mod_main.h4
-rw-r--r--src/modules/quickaccess/e_mod_quickaccess.c74
-rw-r--r--src/modules/shot/e_mod_main.c52
-rw-r--r--src/modules/start/e_mod_main.c12
-rw-r--r--src/modules/syscon/e_int_config_syscon.c12
-rw-r--r--src/modules/syscon/e_mod_main.c8
-rw-r--r--src/modules/syscon/e_mod_main.h2
-rw-r--r--src/modules/syscon/e_syscon.c14
-rw-r--r--src/modules/syscon/e_syscon_gadget.c24
-rw-r--r--src/modules/systray/e_mod_main.c12
-rw-r--r--src/modules/systray/e_mod_notifier_host.c4
-rw-r--r--src/modules/tasks/e_mod_config.c6
-rw-r--r--src/modules/tasks/e_mod_main.c44
-rw-r--r--src/modules/teamwork/e_mod_main.c4
-rw-r--r--src/modules/teamwork/e_mod_main.h2
-rw-r--r--src/modules/temperature/e_mod_config.c12
-rw-r--r--src/modules/temperature/e_mod_main.c24
-rw-r--r--src/modules/temperature/e_mod_tempget.c4
-rw-r--r--src/modules/temperature/tempget.c2
-rw-r--r--src/modules/winlist/e_int_config_winlist.c20
-rw-r--r--src/modules/winlist/e_mod_main.c4
-rw-r--r--src/modules/winlist/e_mod_main.h2
-rw-r--r--src/modules/winlist/e_winlist.c20
-rw-r--r--src/modules/wizard/e_mod_main.c4
-rw-r--r--src/modules/wizard/e_wizard.c8
-rw-r--r--src/modules/wizard/page_000.c12
-rw-r--r--src/modules/wizard/page_010.c8
-rw-r--r--src/modules/wizard/page_011.c8
-rw-r--r--src/modules/wizard/page_020.c10
-rw-r--r--src/modules/wizard/page_030.c10
-rw-r--r--src/modules/wizard/page_040.c12
-rw-r--r--src/modules/wizard/page_050.c10
-rw-r--r--src/modules/wizard/page_060.c8
-rw-r--r--src/modules/wizard/page_070.c10
-rw-r--r--src/modules/wizard/page_080.c10
-rw-r--r--src/modules/wizard/page_090.c10
-rw-r--r--src/modules/wizard/page_100.c10
-rw-r--r--src/modules/wizard/page_110.c10
-rw-r--r--src/modules/wizard/page_120.c10
-rw-r--r--src/modules/wizard/page_130.c10
-rw-r--r--src/modules/wizard/page_150.c2
-rw-r--r--src/modules/wizard/page_160.c10
-rw-r--r--src/modules/wizard/page_170.c8
-rw-r--r--src/modules/wizard/page_180.c8
-rw-r--r--src/modules/wizard/page_200.c10
-rw-r--r--src/modules/wl_screenshot/e_mod_main.c32
-rw-r--r--src/modules/xkbswitch/e_mod_config.c30
-rw-r--r--src/modules/xkbswitch/e_mod_main.c30
351 files changed, 2705 insertions, 2753 deletions
diff --git a/configure.ac b/configure.ac
index c56e2e483..580e4492b 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 23479a92a..000000000
--- 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 dc67a39f4..09379bca3 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 2da334fb7..67d905ad1 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 c9e308aef..83a229277 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 2c72f4ab5..f8c740e5d 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 5c7754eaf..0da0a06d7 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 019e4703a..e77f98924 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 4cb03a7bc..75e6ed261 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 f15082a52..f45b8b303 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 b75f13943..04aa2c7a6 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 dff626257..ec7a85b13 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 67e0dbee5..6d1ac39be 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 10bc1fca6..84a17184b 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 42c8e6a21..c3091fafa 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 6665cfb43..4ec89ea6a 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 873b24e1b..8c1de989a 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 34a96f4b5..61ddde2b6 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 f600a96dc..fde8e4f2b 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 fad92c10d..4f8051fe1 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 83e7139f7..8fa157091 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 b37114f9e..488fd6256 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 d92b508be..944340730 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 4e93e68e2..0b576dd10 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 bce1d5859..fe19ee8c3 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 8348afdf3..b390d9c06 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 4841175f6..bc862465c 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 066568570..a4592bf3f 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 2a10a6ff5..5431bc3d7 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 f2c77f0e7..0d51faa2c 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 fd9db85fe..f4b027012 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 8e96a3d09..92b1f5319 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 7ea2f6314..501819e54 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 d0bc6bffd..4f7f5a7ce 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 00ece4173..8b5832ad8 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 bf6f4b417..c71c21cb5 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 72bbf8f8a..171d1adfb 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 27eb0d6bd..d1952d0aa 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 07a71a92c..2f9fb05eb 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 24f5dd933..836f06180 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 8c3546ffa..57fcf19c9 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 08d9c71f3..2f2feb520 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 0420387bb..51fe3298c 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 ca347943d..5fc446add 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 c3d3c66c5..c1c20ac0b 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 5575d3065..10646ad77 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 5e4ea8795..057e7cfab 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 9bd3e8824..2ab6f6140 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 c9bc0c1d5..42ae50848 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 5d5a1139d..422b75009 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 7ef85f02a..0905748e4 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 75f37a05d..87dced408 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 c436f522a..f53f24a1e 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 31dedabce..f5d80c236 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 7ebf166f0..fa9687c39 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 6251c11b8..79d6d2952 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 b4fccc12a..c44cde169 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 c8ab81ba8..3043ed2c6 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 57928b6f2..e82874dd3 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 b7f808e41..1609228f7 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 5af2f69c4..d5fddd9d9 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 5026e0806..7820a96cd 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 56e5500be..6e694dba5 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 385f90d7a..10fe41e74 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 bd0ea2317..2f084994c 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 8940c242d..108bf089a 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 8d82dcabf..b5a844d70 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 536b01298..4edcc43ce 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 5f3c47892..1c8a9347c 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 3cb74451b..07325f66e 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 e3870270b..721f2759d 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 72c6f26f9..1c0fe7b07 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 9ba5a3c48..5183c4d1e 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 4d1dc64a1..f19a53346 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 2e12bf890..e35496f59 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 fc5a16eeb..d3c81cc9b 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 61076d92f..ab1fa2331 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 8b9482306..ea0b830b1 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 6be9b7ab8..ef1071209 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 fe2e9b61d..9935d5385 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 47c30a494..6045f0483 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 7d2b8e22b..b37e04306 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 77a1afac1..081c72202 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 1da664e79..7445256dc 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 6387a7f4c..c1e73bdf3 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 9394284e4..80bacf339 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 f952fc157..bb9cff63a 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 15ff12373..0b28fade2 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 05525d080..cc6b59ee3 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 bc825ea65..5006d62a3 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 12ab83b25..d1b016eca 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 c508ddde1..eab0da16d 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 56880fb47..01a0cf147 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 c57bea591..6f4e38479 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 d40e657d1..439d8f090 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 4b72f9d2e..8107b0fcd 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 07d0c7dd3..7232599d1 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 d935bcd13..12b1531f9 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 db46639b8..b0cbb693a 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 eae79b607..52126e6f2 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 0b3d5fcb7..7b2730e7d 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 4537a20d4..d6d65227b 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 191c2b2b3..e616ffe0f 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 bb630dc72..0eff97523 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 19fa0f0cf..05c767685 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 f7b08279b..711758393 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 84bf36277..d4e122631 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 56b67bcc4..e0759cb7a 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 df4df3258..e9ef5a068 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 3279801e3..824867b40 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 ccfe13c5c..37b17d6a2 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 1f00269ae..83a2ec61b 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 2d7c262ce..aeaa9373a 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 da657f815..a73cb5171 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 4649dbd47..68882904e 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 ecd3e1487..d3ba61a23 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 a12674482..a27202b32 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 32e0ea379..8797c6780 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 ab1c04dc8..4815d3be0 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 f461c3abf..a756dc650 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 82e895c32..7b49ab91b 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 21a137175..51eb577fc 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 5964e01e4..984b79d09 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 c2bc3efd6..2219de917 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 1cc862b83..6b9528f62 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 ec6b1678b..0f816695a 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 212662fa1..b2c340488 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 f0bc3ed02..6de56298d 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 acddc97f3..32f4c26e5 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 63daca7dc..7c642238a 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 0d2f380e2..ef305f8f1 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 2aa023ad9..8fd85fc7b 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 3351e6be1..61cbbb5d7 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 bfa139433..2afcaa6d7 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 4ebdbd20e..6f857205d 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 732c8b090..fa029a037 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 3c4f5283f..6e0f93b50 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 3f1a852c9..748501ad6 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 548df0efd..aa28f79ee 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 a589585b1..e3a8b1537 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 5a371887d..c6d2d2893 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 0bb949f76..16656335e 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 b4376a352..4d665e3df 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 e54e7f877..0b798aa0f 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 e94174815..4c18a51f7 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 da1524c16..6c3bca9ce 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 43a615c5e..22899692a 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 4a5d24245..fb84a910c 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 41b7527f5..82e456a29 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 e370c36a8..287d71bfe 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 f254c62f6..d33fab98d 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 ad1058b0b..e929b2c46 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 4defb0cdb..938c83057 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 dd02242bb..f949f4e0f 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 90ae3084b..5702552ba 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 4fc00136c..435f7825b 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 58d1a17f2..8e36f8872 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 b642e5351..a0a52ea11 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 96bc2cbef..2b54c6be3 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 1a88708f2..8f8be4771 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 10587527a..b06e36aa7 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 1aaca93a9..ab8c3e351 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 8debe7220..bd1e79643 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 640331637..62fc2b518 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 6ad251554..dadad8cc5 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 626c6867f..25101de45 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 628914dbb..d0d82e9f4 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 5baf0801c..966ccfbda 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 5905aa80a..aff37ad01 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 53e8cf31e..2843900fa 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 517447db0..c960a48d9 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 eec806a3f..3f46802fc 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 c3db9df52..39ab2f510 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 a80334ad6..74890deb8 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 4bf6738af..6a923196d 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 9f7c850ff..4474a1bfd 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 808f77279..4b67fe36c 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 395f00afc..16166f968 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 2a23f8478..dc5900499 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 ce0e49eac..f99c84bc5 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 4d1b6739f..7bae62929 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 21eecd48b..882c416d5 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 80b19ee91..6e6ac2438 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 a0d91f841..0a25973af 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 d8cb733ac..30bf5fcbf 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 64c45eaf4..63f8f85a9 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 5ac7a3fcb..561b12161 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 7f794127f..92875b665 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 5058fd664..2b8cf2238 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 cac3c7681..59f5836e9 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 a927360f9..f891cd77b 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 df8d388c3..ed7ba040b 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 d7655ff01..548540dd2 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 b4c7c1ca3..e5d3225cb 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 4da72b3ed..95d4dc398 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 7c56a44f8..256726b58 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 f736d7aa8..467b20963 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 8ab39606f..e5cf725cd 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 d36f20efa..c638115b8 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 4ffd8402a..f4a3e2fb6 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 7494c6f4d..adc3bd5ca 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 0a27e61b1..ceb84f3ed 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 0e3e52d08..a3c49619d 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 6f63a9fa6..b30e4f59f 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 373bf1955..2620252cb 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 519c593c5..7376a9166 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 273d7a787..b095af9f9 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 8172b86bb..82e6dc599 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 c8377cd37..fb2d4e8c5 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 cf3db0d80..d8a3191c8 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 707bab6f8..dfc75539a 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 8301db415..33bdaabc6 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 def007e6c..90784a8d2 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 69ac664bb..473ade7ed 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 f2731b33d..fe7df18b6 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 b7453974d..2e7fe5caf 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 7839bf59d..77ee737c4 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 998224941..670d52b3a 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 eb5d8a01e..fb02a4087 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 62bd56c36..e6981b0b8 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 40d804d94..a729f8bc4 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 3102591f0..2a3c701d0 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 337b74d72..423a90df2 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