From 3ad6c0c88c6c026438e1f377a39268f459f755b1 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 6 Jan 2017 12:56:22 -0500 Subject: [PATCH] resolve evry float-equal warnings Reviewed-by: Derek Foreman --- src/modules/everything/evry_plug_aggregator.c | 8 ++++---- src/modules/everything/evry_plug_apps.c | 6 +++--- src/modules/everything/evry_view.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/modules/everything/evry_plug_aggregator.c b/src/modules/everything/evry_plug_aggregator.c index 2a3c701d0..e6b3a0424 100644 --- a/src/modules/everything/evry_plug_aggregator.c +++ b/src/modules/everything/evry_plug_aggregator.c @@ -92,10 +92,10 @@ _fetch(Evry_Plugin *plugin, const char *input) /* give plugin item the highest priority of its items */ EINA_LIST_FOREACH (pp->items, ll, it) { - if (it->usage >= 0) + if (it->usage > -1.0) evry_history_item_usage_set(it, input, context); - if (it->usage && (it->usage > max_usage)) + if (it->usage > max_usage) max_usage = it->usage; if (it->fuzzy_match == 0) @@ -113,7 +113,7 @@ _fetch(Evry_Plugin *plugin, const char *input) evry_history_item_usage_set(itp, NULL, NULL); itp->usage /= 100.0; - if ((itp->usage && max_usage) && (itp->usage < max_usage)) + if ((!eina_dbleq(itp->usage, 0)) && (!eina_dbleq(max_usage, 0)) && (itp->usage < max_usage)) itp->usage = max_usage; itp->fuzzy_match = min_fuzz; @@ -195,7 +195,7 @@ _fetch(Evry_Plugin *plugin, const char *input) evry_history_item_usage_set(it, input, context); if ((subj_sel) && (top_level) && - (!it->usage) && ((int) inp_len < plugin->config->min_query)) + eina_dbleq(it->usage, 0) && ((int) inp_len < plugin->config->min_query)) continue; items = eina_list_append(items, it); diff --git a/src/modules/everything/evry_plug_apps.c b/src/modules/everything/evry_plug_apps.c index 366d4cff9..578948a54 100644 --- a/src/modules/everything/evry_plug_apps.c +++ b/src/modules/everything/evry_plug_apps.c @@ -151,11 +151,11 @@ _cb_sort(const void *data1, const void *data2) const Evry_Item *it1 = data1; const Evry_Item *it2 = data2; - if (it1->usage && it2->usage) + if ((!eina_dbleq(it1->usage, 0)) && (!eina_dbleq(it2->usage, 0))) return it1->usage > it2->usage ? -1 : 1; - if (it1->usage && !it2->usage) + if ((!eina_dbleq(it1->usage, 0)) && eina_dbleq(it2->usage, 0)) return -1; - if (it2->usage && !it1->usage) + if ((!eina_dbleq(it2->usage, 0)) && eina_dbleq(it1->usage, 0)) return 1; if (it1->fuzzy_match || it2->fuzzy_match) diff --git a/src/modules/everything/evry_view.c b/src/modules/everything/evry_view.c index dea0446c6..107f0f847 100644 --- a/src/modules/everything/evry_view.c +++ b/src/modules/everything/evry_view.c @@ -764,7 +764,7 @@ _animator(void *data) int wait = 0; - if (sd->scroll_align != sd->scroll_align_to) + if (!EINA_DBL_CMP(sd->scroll_align, sd->scroll_align_to)) { sd->scroll_align = ((sd->scroll_align * (1.0 - spd)) + (sd->scroll_align_to * spd)); @@ -867,7 +867,7 @@ _pan_item_select(Evas_Object *obj, Item *it, int scroll) { sd->scroll_align_to = align; - if (align != sd->cy && !sd->animator) + if ((!EINA_DBL_CMP(align, sd->cy)) && !sd->animator) sd->animator = ecore_animator_add(_animator, obj); } else