From 683fe228ad339879b55e5321b04d95cbe26db81c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 6 Jan 2017 12:56:22 -0500 Subject: [PATCH] resolve conf_* module float-equal warnings Reviewed-by: Derek Foreman --- .../conf_bindings/e_int_config_edgebindings.c | 2 +- src/modules/conf_display/e_int_config_desklock.c | 7 +++---- src/modules/conf_display/e_int_config_dpms.c | 10 +++++----- .../conf_display/e_int_config_screensaver.c | 4 ++-- .../conf_interaction/e_int_config_interaction.c | 4 ++-- src/modules/conf_interaction/e_int_config_mouse.c | 6 +++--- src/modules/conf_menus/e_int_config_menus.c | 14 +++++++------- .../conf_performance/e_int_config_performance.c | 2 +- .../e_int_config_powermanagement.c | 10 +++++----- src/modules/conf_theme/e_int_config_scale.c | 8 ++++---- .../conf_window_manipulation/e_int_config_focus.c | 2 +- .../e_int_config_window_display.c | 2 +- .../e_int_config_window_geometry.c | 2 +- .../e_int_config_window_process.c | 2 +- 14 files changed, 37 insertions(+), 38 deletions(-) diff --git a/src/modules/conf_bindings/e_int_config_edgebindings.c b/src/modules/conf_bindings/e_int_config_edgebindings.c index f80715cb1..1c17db34c 100644 --- a/src/modules/conf_bindings/e_int_config_edgebindings.c +++ b/src/modules/conf_bindings/e_int_config_edgebindings.c @@ -1426,7 +1426,7 @@ _edge_binding_text_get(E_Zone_Edge edge, float delay, int mod, int drag_only) } } - if (delay) + if (!eina_flteq(delay, 0.0)) { if (eina_strbuf_length_get(b)) eina_strbuf_append(b, " "); if (dblequal(delay, -1.0)) diff --git a/src/modules/conf_display/e_int_config_desklock.c b/src/modules/conf_display/e_int_config_desklock.c index bb62f1a65..3b21ab62f 100644 --- a/src/modules/conf_display/e_int_config_desklock.c +++ b/src/modules/conf_display/e_int_config_desklock.c @@ -569,11 +569,10 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd if (e_config->desklock_autolock_screensaver != cfdata->screensaver_lock) return 1; - if (e_config->desklock_post_screensaver_time != - cfdata->post_screensaver_time) + if (!EINA_DBL_CMP(e_config->desklock_post_screensaver_time, cfdata->post_screensaver_time)) return 1; - if (e_config->desklock_autolock_idle_timeout != cfdata->idle_time * 60) + if (!EINA_DBL_CMP(e_config->desklock_autolock_idle_timeout, cfdata->idle_time * 60)) return 1; if (cfdata->bg_method_prev != (int)cfdata->bg_method) return 1; @@ -607,7 +606,7 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd return 1; return (e_config->desklock_ask_presentation != cfdata->ask_presentation) || - (e_config->desklock_ask_presentation_timeout != cfdata->ask_presentation_timeout); + (!EINA_DBL_CMP(e_config->desklock_ask_presentation_timeout, cfdata->ask_presentation_timeout)); } static void diff --git a/src/modules/conf_display/e_int_config_dpms.c b/src/modules/conf_display/e_int_config_dpms.c index 8f8be4771..2b607e5d4 100644 --- a/src/modules/conf_display/e_int_config_dpms.c +++ b/src/modules/conf_display/e_int_config_dpms.c @@ -127,13 +127,13 @@ _advanced_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data * e_widget_disabled_set(cfdata->backlight_slider_idle, !cfdata->enable_idle_dim); e_widget_disabled_set(cfdata->backlight_slider_fade, !cfdata->enable_idle_dim); - return (e_config->backlight.normal * 100.0 != cfdata->backlight_normal) || - (e_config->backlight.dim * 100.0 != cfdata->backlight_dim) || - (e_config->backlight.transition != cfdata->backlight_transition) || - (e_config->backlight.timer != cfdata->backlight_timeout) || + return (!EINA_DBL_CMP(e_config->backlight.normal * 100.0, cfdata->backlight_normal)) || + (!EINA_DBL_CMP(e_config->backlight.dim * 100.0, cfdata->backlight_dim)) || + (!EINA_DBL_CMP(e_config->backlight.transition, cfdata->backlight_transition)) || + (!EINA_DBL_CMP(e_config->backlight.timer, cfdata->backlight_timeout)) || (e_config->backlight.idle_dim != cfdata->enable_idle_dim) || (e_config->screensaver_ask_presentation != cfdata->ask_presentation) || - (e_config->screensaver_ask_presentation_timeout != cfdata->ask_presentation_timeout); + (!EINA_DBL_CMP(e_config->screensaver_ask_presentation_timeout, cfdata->ask_presentation_timeout)); } static int diff --git a/src/modules/conf_display/e_int_config_screensaver.c b/src/modules/conf_display/e_int_config_screensaver.c index b06e36aa7..1064045ca 100644 --- a/src/modules/conf_display/e_int_config_screensaver.c +++ b/src/modules/conf_display/e_int_config_screensaver.c @@ -145,10 +145,10 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd return ((e_config->screensaver_enable != cfdata->enable_screensaver) || (e_config->screensaver_timeout != lround(cfdata->timeout * 60.0)) || (e_config->screensaver_ask_presentation != cfdata->ask_presentation) || - (e_config->screensaver_ask_presentation_timeout != cfdata->ask_presentation_timeout) || + (!EINA_DBL_CMP(e_config->screensaver_ask_presentation_timeout, cfdata->ask_presentation_timeout)) || (e_config->screensaver_suspend != cfdata->screensaver_suspend) || (e_config->screensaver_suspend_on_ac != cfdata->screensaver_suspend_on_ac) || - (e_config->screensaver_suspend_delay != cfdata->screensaver_suspend_delay) || + (!EINA_DBL_CMP(e_config->screensaver_suspend_delay, cfdata->screensaver_suspend_delay)) || (e_config->screensaver_wake_on_notify != cfdata->wake_on_notify) || (e_config->screensaver_wake_on_urgent != cfdata->wake_on_urgent) || (e_config->dpms_off_timeout != cfdata->no_dpms_on_fullscreen) diff --git a/src/modules/conf_interaction/e_int_config_interaction.c b/src/modules/conf_interaction/e_int_config_interaction.c index 62fc2b518..f7f37d647 100644 --- a/src/modules/conf_interaction/e_int_config_interaction.c +++ b/src/modules/conf_interaction/e_int_config_interaction.c @@ -70,8 +70,8 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd { return ((cfdata->thumbscroll_enable != e_config->thumbscroll_enable) || (cfdata->thumbscroll_threshhold != e_config->thumbscroll_threshhold) || - (cfdata->thumbscroll_momentum_threshhold != e_config->thumbscroll_momentum_threshhold) || - (cfdata->thumbscroll_friction != e_config->thumbscroll_friction)); + (!EINA_DBL_CMP(cfdata->thumbscroll_momentum_threshhold, e_config->thumbscroll_momentum_threshhold)) || + (!EINA_DBL_CMP(cfdata->thumbscroll_friction, e_config->thumbscroll_friction))); } static int diff --git a/src/modules/conf_interaction/e_int_config_mouse.c b/src/modules/conf_interaction/e_int_config_mouse.c index fc22e0760..d8d054e24 100644 --- a/src/modules/conf_interaction/e_int_config_mouse.c +++ b/src/modules/conf_interaction/e_int_config_mouse.c @@ -83,9 +83,9 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd (cfdata->use_e_cursor == e_config->use_e_cursor) && (cfdata->cursor_size == e_config->cursor_size) && (cfdata->mouse_hand == e_config->mouse_hand) && - (cfdata->numerator == e_config->mouse_accel_numerator) && - (cfdata->denominator == e_config->mouse_accel_denominator) && - (cfdata->threshold == e_config->mouse_accel_threshold)); + EINA_DBL_CMP(cfdata->numerator, e_config->mouse_accel_numerator) && + EINA_DBL_CMP(cfdata->denominator, e_config->mouse_accel_denominator) && + EINA_DBL_CMP(cfdata->threshold, e_config->mouse_accel_threshold)); } static void diff --git a/src/modules/conf_menus/e_int_config_menus.c b/src/modules/conf_menus/e_int_config_menus.c index 39ab2f510..d94a33606 100644 --- a/src/modules/conf_menus/e_int_config_menus.c +++ b/src/modules/conf_menus/e_int_config_menus.c @@ -335,10 +335,10 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) e_config->menu_eap_comment_show = cfdata->show_comment; e_config->menu_gadcon_client_toplevel = cfdata->menu_gadcon_client_toplevel; - if (cfdata->scroll_speed == 0) e_config->menus_scroll_speed = 1.0; + if (EINA_DBL_CMP(cfdata->scroll_speed, 0.0)) e_config->menus_scroll_speed = 1.0; else e_config->menus_scroll_speed = cfdata->scroll_speed; - if (cfdata->fast_mouse_move_threshhold == 0) + if (EINA_DBL_CMP(cfdata->fast_mouse_move_threshhold, 0.0)) e_config->menus_fast_mouse_move_threshhold = 1.0; else { @@ -370,12 +370,12 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd { double scroll_speed, move_threshold; - if (cfdata->scroll_speed == 0) + if (EINA_DBL_CMP(cfdata->scroll_speed, 0.0)) scroll_speed = 1.0; else scroll_speed = cfdata->scroll_speed; - if (cfdata->fast_mouse_move_threshhold == 0) + if (EINA_DBL_CMP(cfdata->fast_mouse_move_threshhold, 0.0)) move_threshold = 1.0; else move_threshold = cfdata->fast_mouse_move_threshhold; @@ -386,11 +386,11 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd (e_config->menu_eap_name_show != cfdata->show_name) || (e_config->menu_eap_generic_show != cfdata->show_generic) || (e_config->menu_eap_comment_show != cfdata->show_comment) || - (e_config->menus_click_drag_timeout != cfdata->click_drag_timeout) || + (!EINA_DBL_CMP(e_config->menus_click_drag_timeout, cfdata->click_drag_timeout)) || (e_config->menu_autoscroll_margin != cfdata->autoscroll_margin) || (e_config->menu_autoscroll_cursor_margin != cfdata->autoscroll_cursor_margin) || - (e_config->menus_scroll_speed != scroll_speed) || - (e_config->menus_fast_mouse_move_threshhold != move_threshold) || + (!EINA_DBL_CMP(e_config->menus_scroll_speed, scroll_speed)) || + (!EINA_DBL_CMP(e_config->menus_fast_mouse_move_threshhold, move_threshold)) || (e_config->menu_gadcon_client_toplevel != cfdata->menu_gadcon_client_toplevel) || (!((cfdata->default_system_menu) && (e_config->default_system_menu) && diff --git a/src/modules/conf_performance/e_int_config_performance.c b/src/modules/conf_performance/e_int_config_performance.c index d420ecff9..06f58b394 100644 --- a/src/modules/conf_performance/e_int_config_performance.c +++ b/src/modules/conf_performance/e_int_config_performance.c @@ -70,7 +70,7 @@ static int _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) || + return ((!EINA_DBL_CMP(e_config->framerate, cfdata->framerate)) || (e_config->priority != cfdata->priority) || (e_config->no_module_delay != (!cfdata->module_delay))); } diff --git a/src/modules/conf_performance/e_int_config_powermanagement.c b/src/modules/conf_performance/e_int_config_powermanagement.c index 7bae62929..7a01fd645 100644 --- a/src/modules/conf_performance/e_int_config_powermanagement.c +++ b/src/modules/conf_performance/e_int_config_powermanagement.c @@ -94,11 +94,11 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd { return ((e_config->powersave.min != cfdata->powersave_min) || (e_config->powersave.max != cfdata->powersave_max) || - (e_config->powersave.none != cfdata->powersave_none) || - (e_config->powersave.low != cfdata->powersave_low) || - (e_config->powersave.medium != cfdata->powersave_medium) || - (e_config->powersave.high != cfdata->powersave_high) || - (e_config->powersave.extreme != cfdata->powersave_extreme)); + (!EINA_DBL_CMP(e_config->powersave.none, cfdata->powersave_none)) || + (!EINA_DBL_CMP(e_config->powersave.low, cfdata->powersave_low)) || + (!EINA_DBL_CMP(e_config->powersave.medium, cfdata->powersave_medium)) || + (!EINA_DBL_CMP(e_config->powersave.high, cfdata->powersave_high)) || + (!EINA_DBL_CMP(e_config->powersave.extreme, cfdata->powersave_extreme))); } static Evas_Object * diff --git a/src/modules/conf_theme/e_int_config_scale.c b/src/modules/conf_theme/e_int_config_scale.c index 6ff288d1e..6278ff2d7 100644 --- a/src/modules/conf_theme/e_int_config_scale.c +++ b/src/modules/conf_theme/e_int_config_scale.c @@ -52,7 +52,7 @@ _scale_preview_sel_set(Evas_Object *ob, int sel) v = (int)(unsigned long)evas_object_data_get(ob, "scale"); scl = (double)v / 1000.0; if (sc) *sc = scl; - e_config_dialog_changed_set(cfdata->cfd, (scl != e_config->scale.factor)); + e_config_dialog_changed_set(cfdata->cfd, (!EINA_DBL_CMP(scl, e_config->scale.factor))); if (evas_object_data_get(ob, "dpi")) { cfdata->use_dpi = EINA_TRUE; @@ -422,9 +422,9 @@ _adv_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) return (use_dpi != e_config->scale.use_dpi) || (use_custom != e_config->scale.use_custom) || - (cfdata->min != e_config->scale.min) || - (cfdata->max != e_config->scale.max) || - (cfdata->factor != e_config->scale.factor) || + (!EINA_DBL_CMP(cfdata->min, e_config->scale.min)) || + (!EINA_DBL_CMP(cfdata->max, e_config->scale.max)) || + (!EINA_DBL_CMP(cfdata->factor, e_config->scale.factor)) || (cfdata->base_dpi != e_config->scale.base_dpi); } 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 f5c6f00df..ef0563643 100644 --- a/src/modules/conf_window_manipulation/e_int_config_focus.c +++ b/src/modules/conf_window_manipulation/e_int_config_focus.c @@ -215,7 +215,7 @@ _advanced_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data * (e_config->disable_all_pointer_warps != cfdata->disable_all_pointer_warps) || (fabs(e_config->pointer_warp_speed - cfdata->pointer_warp_speed) > DBL_EPSILON) || (e_config->use_auto_raise != cfdata->use_auto_raise) || - (e_config->auto_raise_delay != cfdata->auto_raise_delay) || + (!EINA_DBL_CMP(e_config->auto_raise_delay, cfdata->auto_raise_delay)) || (e_config->border_raise_on_mouse_action != cfdata->border_raise_on_mouse_action) || (e_config->raise_on_revert_focus != cfdata->raise_on_revert_focus); } 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 4db67d823..cdb2aed2d 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 @@ -121,7 +121,7 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd (e_config->resize_info_follows != cfdata->resize_info_follows) || (e_config->border_shade_animate != cfdata->border_shade_animate) || (e_config->border_shade_transition != cfdata->border_shade_transition) || - (e_config->border_shade_speed != cfdata->border_shade_speed) || + (!EINA_DBL_CMP(e_config->border_shade_speed, cfdata->border_shade_speed)) || (e_config->window_maximize_animate != cfdata->window_maximize_animate) || (e_config->window_maximize_transition != cfdata->window_maximize_transition) || (!dblequal(e_config->window_maximize_time, cfdata->window_maximize_time)) || 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 b30e4f59f..b2b43cc09 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 @@ -146,7 +146,7 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd (e_config->gadget_resist != cfdata->gadget_resist) || (e_config->geometry_auto_resize_limit != cfdata->geometry_auto_resize_limit) || (e_config->geometry_auto_move != cfdata->geometry_auto_move) || - (e_config->border_keyboard.timeout != cfdata->border_keyboard.timeout) || + (!EINA_DBL_CMP(e_config->border_keyboard.timeout, cfdata->border_keyboard.timeout)) || (e_config->border_keyboard.move.dx != cfdata->border_keyboard.move.dx) || (e_config->border_keyboard.move.dy != cfdata->border_keyboard.move.dx) || (e_config->border_keyboard.resize.dx != cfdata->border_keyboard.resize.dx) || 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 2620252cb..4bb1afa1e 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 @@ -80,7 +80,7 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd { return ((e_config->kill_if_close_not_possible != cfdata->kill_if_close_not_possible) || (e_config->kill_process != cfdata->kill_process) || - (e_config->kill_timer_wait != cfdata->kill_timer_wait) || + (!EINA_DBL_CMP(e_config->kill_timer_wait, cfdata->kill_timer_wait)) || (e_config->ping_clients != cfdata->ping_clients) || (e_config->ping_clients_interval != cfdata->ping_clients_interval)); }