From 0bbdd764692178f5763e9d7dbf8766e9b10b93dd Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 6 Jan 2017 12:56:22 -0500 Subject: [PATCH] resolve misc module float-equal warnings Reviewed-by: Derek Foreman --- src/modules/notification/e_mod_config.c | 2 +- src/modules/pager/e_mod_config.c | 4 ++-- src/modules/pager_plain/e_mod_config.c | 4 ++-- src/modules/syscon/e_int_config_syscon.c | 2 +- src/modules/teamwork/e_mod_tw.c | 4 ++-- src/modules/tiling/window_tree.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/modules/notification/e_mod_config.c b/src/modules/notification/e_mod_config.c index 2d5204ddc..694a7640d 100644 --- a/src/modules/notification/e_mod_config.c +++ b/src/modules/notification/e_mod_config.c @@ -192,7 +192,7 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, (cfdata->show_low != notification_cfg->show_low) || (cfdata->show_normal != notification_cfg->show_normal) || (cfdata->show_critical != notification_cfg->show_critical) || - (cfdata->timeout != notification_cfg->timeout) || + (!EINA_DBL_CMP(cfdata->timeout, notification_cfg->timeout)) || (cfdata->corner != (int)notification_cfg->corner) || (cfdata->force_timeout != notification_cfg->force_timeout) || (cfdata->ignore_replacement != notification_cfg->ignore_replacement) || diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c index 5d57051a2..c24cf8259 100644 --- a/src/modules/pager/e_mod_config.c +++ b/src/modules/pager/e_mod_config.c @@ -316,14 +316,14 @@ static int _adv_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if ((int)pager_config->popup != cfdata->popup.show) return 1; - if (pager_config->popup_speed != cfdata->popup.speed) return 1; + if (!EINA_DBL_CMP(pager_config->popup_speed, cfdata->popup.speed)) return 1; if ((int)pager_config->flip_desk != cfdata->flip_desk) return 1; if ((int)pager_config->popup_urgent != cfdata->popup.urgent_show) return 1; if ((int)pager_config->popup_urgent_stick != cfdata->popup.urgent_stick) return 1; if ((int)pager_config->popup_urgent_focus != cfdata->popup.urgent_focus) return 1; - if (pager_config->popup_urgent_speed != cfdata->popup.urgent_speed) + if (!EINA_DBL_CMP(pager_config->popup_urgent_speed, cfdata->popup.urgent_speed)) return 1; if ((int)pager_config->show_desk_names != cfdata->show_desk_names) return 1; if (pager_config->popup_height != cfdata->popup.height) return 1; diff --git a/src/modules/pager_plain/e_mod_config.c b/src/modules/pager_plain/e_mod_config.c index 91191232a..0818ce2d2 100644 --- a/src/modules/pager_plain/e_mod_config.c +++ b/src/modules/pager_plain/e_mod_config.c @@ -324,7 +324,7 @@ static int _adv_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { if ((int)pager_config->popup != cfdata->popup.show) return 1; - if (pager_config->popup_speed != cfdata->popup.speed) return 1; + if (!EINA_DBL_CMP(pager_config->popup_speed, cfdata->popup.speed)) return 1; if ((int)pager_config->flip_desk != cfdata->flip_desk) return 1; if ((int)pager_config->disable_live_preview != !cfdata->live_preview) return 1; if ((int)pager_config->popup_urgent != cfdata->popup.urgent_show) return 1; @@ -332,7 +332,7 @@ _adv_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdat return 1; if ((int)pager_config->popup_urgent_focus != cfdata->popup.urgent_focus) return 1; - if (pager_config->popup_urgent_speed != cfdata->popup.urgent_speed) + if (!EINA_DBL_CMP(pager_config->popup_urgent_speed, cfdata->popup.urgent_speed)) return 1; if ((int)pager_config->show_desk_names != cfdata->show_desk_names) return 1; if (pager_config->popup_height != cfdata->popup.height) return 1; diff --git a/src/modules/syscon/e_int_config_syscon.c b/src/modules/syscon/e_int_config_syscon.c index e4d0cf9e0..6c1627430 100644 --- a/src/modules/syscon/e_int_config_syscon.c +++ b/src/modules/syscon/e_int_config_syscon.c @@ -135,7 +135,7 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd if ((cfdata->main.icon_size != e_config->syscon.main.icon_size) || (cfdata->secondary.icon_size != e_config->syscon.secondary.icon_size) || (cfdata->extra.icon_size != e_config->syscon.extra.icon_size) || - (cfdata->timeout != e_config->syscon.timeout) || + (!EINA_DBL_CMP(cfdata->timeout, e_config->syscon.timeout)) || (cfdata->do_input != e_config->syscon.do_input)) return 1; diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c index 5c5ea3b4d..5eb2c1284 100644 --- a/src/modules/teamwork/e_mod_tw.c +++ b/src/modules/teamwork/e_mod_tw.c @@ -502,7 +502,7 @@ tw_link_hide(E_Client *ec, const char *uri) ((tw_tmpfile && eina_streq(evas_object_data_get(tw_mod->pop, "uri"), tw_tmpfile)) || eina_streq(evas_object_data_get(tw_mod->pop, "uri"), uri))) { - if (tw_config->mouse_out_delay) + if (EINA_DBL_NONZERO(tw_config->mouse_out_delay)) { if (tw_hide_timer) ecore_timer_reset(tw_hide_timer); else tw_hide_timer = ecore_timer_add(tw_config->mouse_out_delay, tw_hide, NULL); @@ -1122,7 +1122,7 @@ static void tw_handler_hide(void) { if (tw_mod->force || tw_mod->sticky) return; - if (tw_config->mouse_out_delay) + if (EINA_DBL_NONZERO(tw_config->mouse_out_delay)) { if (tw_hide_timer) ecore_timer_reset(tw_hide_timer); else tw_hide_timer = ecore_timer_add(tw_config->mouse_out_delay, tw_hide, NULL); diff --git a/src/modules/tiling/window_tree.c b/src/modules/tiling/window_tree.c index a4e685133..bf8645337 100644 --- a/src/modules/tiling/window_tree.c +++ b/src/modules/tiling/window_tree.c @@ -405,7 +405,7 @@ _tiling_window_tree_node_resize_direction(Window_Tree *node, } /* If it's at the edge, try the grandpa of the parent. */ - if (weight == 0.0) + if (!EINA_DBL_NONZERO(weight)) { if (parent->parent && parent->parent->parent) {