raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=3903d44666b208913824acf5b129707212eb5af8
commit 3903d44666b208913824acf5b129707212eb5af8
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Sat Jan 7 14:05:17 2017 +0900
e - BLOODY BUILD AGAIN - DAMN FLOAT WARNINGS...
i swear ... all of this shit over a warning that CAUSED more bugs than
it eveer fixed? sersiously...
ARGH!
---
src/bin/e_bindings.c | 6 +++---
src/bin/e_comp_object.c | 2 +-
src/bin/e_config.c | 2 +-
src/bin/e_flowlayout.c | 2 +-
src/bin/e_fm_op.c | 4 ++--
src/bin/e_focus.c | 2 +-
src/bin/e_int_client_prop.c | 2 +-
src/bin/e_int_config_comp.c | 4 ++--
src/bin/e_powersave.c | 2 +-
src/bin/e_slider.c | 6 +++---
src/bin/efx/efx_fade.c | 2 +-
src/bin/efx/efx_move.c | 4 ++--
src/bin/efx/efx_pan.c | 2 +-
src/bin/efx/efx_resize.c | 2 +-
src/bin/efx/efx_rotate.c | 4 ++--
src/bin/efx/efx_spin.c | 2 +-
src/bin/efx/efx_util.c | 2 +-
src/bin/efx/efx_zoom.c | 8 ++++----
src/modules/battery/e_mod_udev.c | 8 ++++----
src/modules/conf_bindings/e_int_config_edgebindings.c | 2 +-
src/modules/conf_display/e_int_config_desklock.c | 6 +++---
src/modules/conf_display/e_int_config_dpms.c | 10 +++++-----
src/modules/conf_display/e_int_config_screensaver.c | 4 ++--
src/modules/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 +++++++-------
src/modules/conf_performance/e_int_config_performance.c | 2 +-
.../conf_performance/e_int_config_powermanagement.c | 10 +++++-----
src/modules/conf_theme/e_int_config_scale.c | 8 ++++----
src/modules/conf_window_manipulation/e_int_config_focus.c | 2 +-
.../conf_window_manipulation/e_int_config_window_display.c | 2 +-
.../e_int_config_window_geometry.c | 2 +-
.../conf_window_manipulation/e_int_config_window_process.c | 2 +-
src/modules/everything/evry_plug_aggregator.c | 4 ++--
src/modules/everything/evry_plug_apps.c | 6 +++---
src/modules/everything/evry_view.c | 4 ++--
src/modules/fileman/e_mod_config.c | 4 ++--
src/modules/geolocation/e_mod_main.c | 12 ++++++------
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/tiling/e_mod_tiling.c | 2 +-
src/modules/tiling/window_tree.c | 4 ++--
src/modules/winlist/e_int_config_winlist.c | 2 +-
45 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index 9a3f395..16de998 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -809,7 +809,7 @@ e_bindings_edge_get(const char *action, E_Zone_Edge edge,
int click)
EINA_LIST_FOREACH(edge_bindings, l, binding)
{
if ((binding->edge == edge) &&
- ((click && EINA_FLT_CMP(binding->delay, -1.0 * click))
+ ((click && EINA_FLT_EQ(binding->delay, -1.0 * click))
|| (!click && (binding->delay >= 0.0))) &&
(binding->action) && (action) &&
(!strcmp(action, binding->action)))
@@ -831,7 +831,7 @@ e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge
edge, Eina_Bool drag_onl
{
if ((binding->ctxt == ctxt) &&
(binding->mod == mod) &&
- EINA_FLT_CMP(binding->delay, delay) &&
+ EINA_FLT_EQ(binding->delay, delay) &&
(binding->any_mod == any_mod) &&
(binding->drag_only == drag_only) &&
(((binding->action) && (action) && (!strcmp(binding->action,
action))) ||
@@ -862,7 +862,7 @@ e_bindings_edge_event_find(E_Binding_Context ctxt,
E_Event_Zone_Edge *ev, Eina_B
EINA_LIST_FOREACH(edge_bindings, l, binding)
/* A value of <= -1.0 for the delay indicates it as a mouse-click binding
on that edge */
if (((binding->edge == ev->edge)) &&
- ((click && EINA_FLT_CMP(binding->delay, -1.0 * click)) || (!click &&
(binding->delay >= 0.0))) &&
+ ((click && EINA_FLT_EQ(binding->delay, -1.0 * click)) || (!click &&
(binding->delay >= 0.0))) &&
((binding->drag_only == ev->drag) || ev->drag) &&
((binding->any_mod) || (binding->mod == mod)))
{
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index aac3cfc..c05e376 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -2060,7 +2060,7 @@ _e_comp_object_shade_animator(void *data)
evas_object_resize(cw->smart_obj, w, h);
/* we're done */
- if (EINA_DBL_CMP(val, 1))
+ if (EINA_DBL_EQ(val, 1))
{
cw->shade.anim = NULL;
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 73a3d1b..778d39c 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -2118,7 +2118,7 @@ e_config_binding_edge_match(E_Config_Binding_Edge *eb_in)
(eb->modifiers == eb_in->modifiers) &&
(eb->any_mod == eb_in->any_mod) &&
(eb->edge == eb_in->edge) &&
- EINA_FLT_CMP(eb->delay, eb_in->delay) &&
+ EINA_FLT_EQ(eb->delay, eb_in->delay) &&
(eb->drag_only == eb_in->drag_only) &&
(((eb->action) && (eb_in->action) && (!strcmp(eb->action,
eb_in->action))) ||
((!eb->action) && (!eb_in->action))) &&
diff --git a/src/bin/e_flowlayout.c b/src/bin/e_flowlayout.c
index 3e76cf6..e603d29 100644
--- a/src/bin/e_flowlayout.c
+++ b/src/bin/e_flowlayout.c
@@ -451,7 +451,7 @@ e_flowlayout_align_set(Evas_Object *obj, double ax, double
ay)
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
sd = evas_object_smart_data_get(obj);
if (!sd) return;
- if (EINA_DBL_CMP(sd->align.x, ax) && EINA_DBL_CMP(sd->align.y, ay)) return;
+ if (EINA_DBL_EQ(sd->align.x, ax) && EINA_DBL_EQ(sd->align.y, ay)) return;
sd->align.x = ax;
sd->align.y = ay;
sd->changed = 1;
diff --git a/src/bin/e_fm_op.c b/src/bin/e_fm_op.c
index fae75f3..229e61a 100644
--- a/src/bin/e_fm_op.c
+++ b/src/bin/e_fm_op.c
@@ -1132,7 +1132,7 @@ _e_fm_op_update_progress(E_Fm_Op_Task *task, off_t
_plus_e_fm_op_done, off_t _pl
eta = peta;
- if (eina_dbleq(s_time, 0)) s_time = ecore_time_get();
+ if (eina_dbl_exact(s_time, 0)) s_time = ecore_time_get();
/* Update ETA once a second */
if ((_e_fm_op_done) && (ecore_time_get() - c_time > 1.0))
@@ -1143,7 +1143,7 @@ _e_fm_op_update_progress(E_Fm_Op_Task *task, off_t
_plus_e_fm_op_done, off_t _pl
}
if (!task) return;
- if ((percent != ppercent) || (!EINA_DBL_CMP(eta, peta)) || (task !=
ptask))
+ if ((percent != ppercent) || (!EINA_DBL_EQ(eta, peta)) || (task !=
ptask))
{
ppercent = percent;
peta = eta;
diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c
index fd39ad5..712dae8 100644
--- a/src/bin/e_focus.c
+++ b/src/bin/e_focus.c
@@ -18,7 +18,7 @@ e_focus_event_mouse_in(E_Client *ec)
E_FREE_FUNC(ec->raise_timer, ecore_timer_del);
if (e_config->use_auto_raise)
{
- if (eina_dbleq(e_config->auto_raise_delay, 0.0))
+ if (eina_dbl_exact(e_config->auto_raise_delay, 0.0))
{
if (!ec->lock_user_stacking)
evas_object_raise(ec->frame);
diff --git a/src/bin/e_int_client_prop.c b/src/bin/e_int_client_prop.c
index ccf1835..8481b4f 100644
--- a/src/bin/e_int_client_prop.c
+++ b/src/bin/e_int_client_prop.c
@@ -137,7 +137,7 @@ _create_data(E_Dialog *cfd, E_Client *ec)
if ((cfdata->client->icccm.min_aspect > 0.0) &&
(cfdata->client->icccm.max_aspect > 0.0))
{
- if (EINA_DBL_CMP(cfdata->client->icccm.min_aspect,
cfdata->client->icccm.max_aspect))
+ if (EINA_DBL_EQ(cfdata->client->icccm.min_aspect,
cfdata->client->icccm.max_aspect))
snprintf(buf, sizeof(buf), _("%1.3f"),
cfdata->client->icccm.min_aspect);
else
diff --git a/src/bin/e_int_config_comp.c b/src/bin/e_int_config_comp.c
index 93f6120..cb7c10b 100644
--- a/src/bin/e_int_config_comp.c
+++ b/src/bin/e_int_config_comp.c
@@ -426,7 +426,7 @@ _advanced_apply_data(E_Config_Dialog *cfd EINA_UNUSED,
(cfdata->fps_show != conf->fps_show) ||
(cfdata->fps_corner != conf->fps_corner) ||
(cfdata->fps_average_range != conf->fps_average_range) ||
- (!EINA_DBL_CMP(cfdata->first_draw_delay, conf->first_draw_delay)) ||
+ (!EINA_DBL_EQ(cfdata->first_draw_delay, conf->first_draw_delay)) ||
(conf->match.disable_popups != cfdata->match.disable_popups) ||
(conf->match.disable_borders != cfdata->match.disable_borders) ||
(conf->match.disable_overrides != cfdata->match.disable_overrides) ||
@@ -618,7 +618,7 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED,
(cfdata->fps_show != conf->fps_show) ||
(cfdata->fps_corner != conf->fps_corner) ||
(cfdata->fps_average_range != conf->fps_average_range) ||
- (!EINA_DBL_CMP(cfdata->first_draw_delay, conf->first_draw_delay))
+ (!EINA_DBL_EQ(cfdata->first_draw_delay, conf->first_draw_delay))
)
{
if (cfdata->match.toggle_changed)
diff --git a/src/bin/e_powersave.c b/src/bin/e_powersave.c
index c3a3a77..645a979 100644
--- a/src/bin/e_powersave.c
+++ b/src/bin/e_powersave.c
@@ -162,7 +162,7 @@ _e_powersave_mode_eval(void)
return;
break;
}
- if (!EINA_DBL_CMP(t, defer_time))
+ if (!EINA_DBL_EQ(t, defer_time))
{
if (deferred_timer) ecore_timer_del(deferred_timer);
deferred_timer = ecore_timer_add(defer_time,
diff --git a/src/bin/e_slider.c b/src/bin/e_slider.c
index dfdd198..597908c 100644
--- a/src/bin/e_slider.c
+++ b/src/bin/e_slider.c
@@ -375,7 +375,7 @@ _e_smart_signal_cb_drag(void *data, Evas_Object *obj
EINA_UNUSED, const char *em
_e_smart_value_limit(sd);
_e_smart_format_update(sd);
if (sd->changing) return;
- if (!EINA_DBL_CMP(sd->val, pval))
+ if (!EINA_DBL_EQ(sd->val, pval))
evas_object_smart_callback_call(sd->smart_obj, "changed", NULL);
}
@@ -389,7 +389,7 @@ _e_smart_signal_cb_drag_start(void *data, Evas_Object *obj
EINA_UNUSED, const ch
_e_smart_value_limit(sd);
_e_smart_format_update(sd);
if (sd->changing) return;
- if (!EINA_DBL_CMP(sd->val, pval))
+ if (!EINA_DBL_EQ(sd->val, pval))
evas_object_smart_callback_call(sd->smart_obj, "changed", NULL);
}
@@ -404,7 +404,7 @@ _e_smart_signal_cb_drag_stop(void *data, Evas_Object *obj
EINA_UNUSED, const cha
_e_smart_format_update(sd);
_e_smart_value_update(sd);
if (sd->changing) return;
- if (!EINA_DBL_CMP(sd->val, pval))
+ if (!EINA_DBL_EQ(sd->val, pval))
evas_object_smart_callback_call(sd->smart_obj, "changed", NULL);
}
diff --git a/src/bin/efx/efx_fade.c b/src/bin/efx/efx_fade.c
index b8eeccb..c03807b 100644
--- a/src/bin/efx/efx_fade.c
+++ b/src/bin/efx/efx_fade.c
@@ -164,7 +164,7 @@ e_efx_fade(Evas_Object *obj, E_Efx_Effect_Speed speed,
E_Efx_Color *ec, unsigned
INF("fade: %p || %d/%d/%d/%d => %d/%d/%d/%d %s over %gs", obj,
efd->start.r, efd->start.g, efd->start.b, efd->alpha[0], efd->color.r,
efd->color.g, efd->color.b, efd->alpha[1], e_efx_speed_str[speed], total_time);
if (efd->anim) ecore_animator_del(efd->anim);
efd->anim = NULL;
- if (!eina_dbleq(total_time, 0))
+ if (!eina_dbl_exact(total_time, 0))
efd->anim = ecore_animator_timeline_add(total_time,
(Ecore_Timeline_Cb)_fade_cb, efd);
else
_fade_cb(efd, 1.0);
diff --git a/src/bin/efx/efx_move.c b/src/bin/efx/efx_move.c
index e6fcad1..abf332f 100644
--- a/src/bin/efx/efx_move.c
+++ b/src/bin/efx/efx_move.c
@@ -147,7 +147,7 @@ e_efx_move(Evas_Object *obj, E_Efx_Effect_Speed speed,
const Evas_Point *end_poi
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
INF("move: %p - (%d,%d) -> (%d,%d) over %gs: %s", obj, x, y, end_point->x,
end_point->y, total_time, e_efx_speed_str[speed]);
- if (eina_dbleq(total_time, 0))
+ if (eina_dbl_exact(total_time, 0))
{
evas_object_move(obj, end_point->x, end_point->y);
return EINA_TRUE;
@@ -193,7 +193,7 @@ e_efx_move_circle(Evas_Object *obj, E_Efx_Effect_Speed
speed, const Evas_Point *
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
INF("move: %p - (%d,%d) %d over %gs: %s", obj, x, y, degrees, total_time,
e_efx_speed_str[speed]);
- if (eina_dbleq(total_time, 0))
+ if (eina_dbl_exact(total_time, 0))
{
// evas_object_move(obj, end_point->x, end_point->y);
return EINA_TRUE;
diff --git a/src/bin/efx/efx_pan.c b/src/bin/efx/efx_pan.c
index f9970b8..2ac4296 100644
--- a/src/bin/efx/efx_pan.c
+++ b/src/bin/efx/efx_pan.c
@@ -372,7 +372,7 @@ e_efx_pan(Evas_Object *obj, E_Efx_Effect_Speed speed, const
Evas_Point *distance
epd->e = e;
_smart_pan_get(epd->pan, &x, &y);
INF("pan: %p - (%d,%d) += (%d,%d) over %gs: %s", obj, x, y, distance->x,
distance->y, total_time, e_efx_speed_str[speed]);
- if (eina_dbleq(total_time, 0))
+ if (eina_dbl_exact(total_time, 0))
{
_smart_pan_set(epd->pan, x + distance->x, y + distance->y);
return EINA_TRUE;
diff --git a/src/bin/efx/efx_resize.c b/src/bin/efx/efx_resize.c
index 16f0a03..8459b62 100644
--- a/src/bin/efx/efx_resize.c
+++ b/src/bin/efx/efx_resize.c
@@ -225,7 +225,7 @@ e_efx_resize(Evas_Object *obj, E_Efx_Effect_Speed speed,
const Evas_Point *posit
else
evas_object_move(obj, position->x, position->y);
}
- if (!eina_dbleq(total_time, 0))
+ if (!eina_dbl_exact(total_time, 0))
erd->anim = ecore_animator_timeline_add(total_time,
(Ecore_Timeline_Cb)_resize_cb, erd);
else
_resize_cb(erd, 1.0);
diff --git a/src/bin/efx/efx_rotate.c b/src/bin/efx/efx_rotate.c
index 6278b4e..649e835 100644
--- a/src/bin/efx/efx_rotate.c
+++ b/src/bin/efx/efx_rotate.c
@@ -86,7 +86,7 @@ e_efx_rotate(Evas_Object *obj, E_Efx_Effect_Speed speed,
double degrees, const E
E_Efx_Rotate_Data *erd;
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
- if (eina_dbleq(degrees, 0)) return EINA_FALSE;
+ if (eina_dbl_exact(degrees, 0)) return EINA_FALSE;
if (total_time < 0.0) return EINA_FALSE;
if (speed > E_EFX_EFFECT_SPEED_SINUSOIDAL) return EINA_FALSE;
/* can't rotate a spinning object, so we stop it first */
@@ -121,7 +121,7 @@ e_efx_rotate(Evas_Object *obj, E_Efx_Effect_Speed speed,
double degrees, const E
erd->start_degrees = e->map_data.rotation;
erd->cb = cb;
erd->data = (void*)data;
- if (eina_dbleq(total_time, 0))
+ if (eina_dbl_exact(total_time, 0))
{
e->map_data.rotation += degrees;
_rotate_cb(erd, 1.0);
diff --git a/src/bin/efx/efx_spin.c b/src/bin/efx/efx_spin.c
index 09c1c0c..27c6ca7 100644
--- a/src/bin/efx/efx_spin.c
+++ b/src/bin/efx/efx_spin.c
@@ -47,7 +47,7 @@ _spin_cb(E_Efx_Spin_Data *esd)
if (esd->frame % (int)fps == 0)
DBG("frame: %u || rotate: %g", esd->frame, esd->e->map_data.rotation);
*/
- if (eina_dbleq(fmod(esd->e->map_data.rotation, 360.0), 0)) esd->frame = 0;
+ if (eina_dbl_exact(fmod(esd->e->map_data.rotation, 360.0), 0)) esd->frame =
0;
esd->frame++; /* FIXME: this may overflow */
return EINA_TRUE;
diff --git a/src/bin/efx/efx_util.c b/src/bin/efx/efx_util.c
index fbd2f4b..7374d28 100644
--- a/src/bin/efx/efx_util.c
+++ b/src/bin/efx/efx_util.c
@@ -32,7 +32,7 @@ e_efx_realize(Evas_Object *obj)
evas_map_point_coord_get(map, 2, &p2.x, &p2.y, NULL);
x = lround((double)(p1.x + p2.x) / 2.);
y = lround((double)(p1.y + p2.y) / 2.);
- if (!eina_dbleq(e->map_data.zoom, 0))
+ if (!eina_dbl_exact(e->map_data.zoom, 0))
zw = e->map_data.zoom * w, zh = e->map_data.zoom * h;
else
zw = w, zh = h;
diff --git a/src/bin/efx/efx_zoom.c b/src/bin/efx/efx_zoom.c
index 589d566..0f61c8c 100644
--- a/src/bin/efx/efx_zoom.c
+++ b/src/bin/efx/efx_zoom.c
@@ -133,7 +133,7 @@ e_efx_zoom(Evas_Object *obj, E_Efx_Effect_Speed speed,
double starting_zoom, dou
EINA_SAFETY_ON_NULL_RETURN_VAL(e, EINA_FALSE);
if (!e_efx_zoom_center_init(e, zoom_point)) return EINA_FALSE;
INF("zoom: %p - %g%%->%g%% over %gs: %s", obj,
- ((!eina_dbleq(starting_zoom, 0)) ? starting_zoom : e->map_data.zoom) *
100.0,
+ ((!eina_dbl_exact(starting_zoom, 0)) ? starting_zoom : e->map_data.zoom)
* 100.0,
ending_zoom * 100.0, total_time, e_efx_speed_str[speed]);
if (!e->zoom_data)
{
@@ -145,15 +145,15 @@ e_efx_zoom(Evas_Object *obj, E_Efx_Effect_Speed speed,
double starting_zoom, dou
ezd->e = e;
ezd->speed = speed;
ezd->ending_zoom = ending_zoom;
- ezd->starting_zoom = (!eina_dbleq(starting_zoom, 0)) ? starting_zoom :
ezd->e->map_data.zoom;
+ ezd->starting_zoom = (!eina_dbl_exact(starting_zoom, 0)) ? starting_zoom :
ezd->e->map_data.zoom;
ezd->cb = cb;
ezd->data = (void*)data;
- if (!eina_dbleq(total_time, 0))
+ if (!eina_dbl_exact(total_time, 0))
{
_zoom_cb(ezd, 1.0);
return EINA_TRUE;
}
- if (!eina_dbleq(ezd->starting_zoom, 0)) ezd->starting_zoom = 1.0;
+ if (!eina_dbl_exact(ezd->starting_zoom, 0)) ezd->starting_zoom = 1.0;
_zoom_cb(ezd, 0);
if (ezd->anim) ecore_animator_del(ezd->anim);
ezd->anim = ecore_animator_timeline_add(total_time,
(Ecore_Timeline_Cb)_zoom_cb, ezd);
diff --git a/src/modules/battery/e_mod_udev.c b/src/modules/battery/e_mod_udev.c
index 018b5ff..c77df4a 100644
--- a/src/modules/battery/e_mod_udev.c
+++ b/src/modules/battery/e_mod_udev.c
@@ -222,11 +222,11 @@ _battery_udev_battery_update(const char *syspath, Battery
*bat)
GET_STR(bat, model, POWER_SUPPLY_MODEL_NAME);
GET_STR(bat, vendor, POWER_SUPPLY_MANUFACTURER);
GET_NUM(bat, design_charge, POWER_SUPPLY_ENERGY_FULL_DESIGN);
- if (eina_dbleq(bat->design_charge, 0))
+ if (eina_dbl_exact(bat->design_charge, 0))
GET_NUM(bat, design_charge, POWER_SUPPLY_CHARGE_FULL_DESIGN);
}
GET_NUM(bat, last_full_charge, POWER_SUPPLY_ENERGY_FULL);
- if (eina_dbleq(bat->last_full_charge, 0))
+ if (eina_dbl_exact(bat->last_full_charge, 0))
GET_NUM(bat, last_full_charge, POWER_SUPPLY_CHARGE_FULL);
test = eeze_udev_syspath_get_property(bat->udi, "POWER_SUPPLY_ENERGY_NOW");
if (!test)
@@ -238,9 +238,9 @@ _battery_udev_battery_update(const char *syspath, Battery
*bat)
charge = strtod(test, NULL);
eina_stringshare_del(test);
t = ecore_time_get();
- if ((bat->got_prop) && (!eina_dbleq(charge, bat->current_charge)) &&
(!eina_dbleq(bat->current_charge, 0)))
+ if ((bat->got_prop) && (!eina_dbl_exact(charge, bat->current_charge))
&& (!eina_dbl_exact(bat->current_charge, 0)))
charge_rate = ((charge - bat->current_charge) / (t -
bat->last_update));
- if ((!eina_dbleq(charge_rate, 0)) || eina_dbleq(bat->last_update, 0)
|| eina_dbleq(bat->current_charge, 0))
+ if ((!eina_dbl_exact(charge_rate, 0)) ||
eina_dbl_exact(bat->last_update, 0) || eina_dbl_exact(bat->current_charge, 0))
{
bat->last_update = t;
bat->current_charge = charge;
diff --git a/src/modules/conf_bindings/e_int_config_edgebindings.c
b/src/modules/conf_bindings/e_int_config_edgebindings.c
index 1c17db3..49fdaf7 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 (!eina_flteq(delay, 0.0))
+ if (!eina_flt_exact(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 3b21ab6..d382c0a 100644
--- a/src/modules/conf_display/e_int_config_desklock.c
+++ b/src/modules/conf_display/e_int_config_desklock.c
@@ -569,10 +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 (!EINA_DBL_CMP(e_config->desklock_post_screensaver_time,
cfdata->post_screensaver_time))
+ if (!EINA_DBL_EQ(e_config->desklock_post_screensaver_time,
cfdata->post_screensaver_time))
return 1;
- if (!EINA_DBL_CMP(e_config->desklock_autolock_idle_timeout,
cfdata->idle_time * 60))
+ if (!EINA_DBL_EQ(e_config->desklock_autolock_idle_timeout,
cfdata->idle_time * 60))
return 1;
if (cfdata->bg_method_prev != (int)cfdata->bg_method) return 1;
@@ -606,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) ||
- (!EINA_DBL_CMP(e_config->desklock_ask_presentation_timeout,
cfdata->ask_presentation_timeout));
+ (!EINA_DBL_EQ(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 2b607e5..e520de6 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 (!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)) ||
+ return (!EINA_DBL_EQ(e_config->backlight.normal * 100.0,
cfdata->backlight_normal)) ||
+ (!EINA_DBL_EQ(e_config->backlight.dim * 100.0,
cfdata->backlight_dim)) ||
+ (!EINA_DBL_EQ(e_config->backlight.transition,
cfdata->backlight_transition)) ||
+ (!EINA_DBL_EQ(e_config->backlight.timer, cfdata->backlight_timeout))
||
(e_config->backlight.idle_dim != cfdata->enable_idle_dim) ||
(e_config->screensaver_ask_presentation != cfdata->ask_presentation)
||
- (!EINA_DBL_CMP(e_config->screensaver_ask_presentation_timeout,
cfdata->ask_presentation_timeout));
+ (!EINA_DBL_EQ(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 1064045..311bb12 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)
||
- (!EINA_DBL_CMP(e_config->screensaver_ask_presentation_timeout,
cfdata->ask_presentation_timeout)) ||
+ (!EINA_DBL_EQ(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) ||
- (!EINA_DBL_CMP(e_config->screensaver_suspend_delay,
cfdata->screensaver_suspend_delay)) ||
+ (!EINA_DBL_EQ(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 f7f37d6..cbbfdab 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)
||
- (!EINA_DBL_CMP(cfdata->thumbscroll_momentum_threshhold,
e_config->thumbscroll_momentum_threshhold)) ||
- (!EINA_DBL_CMP(cfdata->thumbscroll_friction,
e_config->thumbscroll_friction)));
+ (!EINA_DBL_EQ(cfdata->thumbscroll_momentum_threshhold,
e_config->thumbscroll_momentum_threshhold)) ||
+ (!EINA_DBL_EQ(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 d8d054e..6869972 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) &&
- 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));
+ EINA_DBL_EQ(cfdata->numerator, e_config->mouse_accel_numerator) &&
+ EINA_DBL_EQ(cfdata->denominator, e_config->mouse_accel_denominator)
&&
+ EINA_DBL_EQ(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 d94a336..d0ad0c1 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 (EINA_DBL_CMP(cfdata->scroll_speed, 0.0)) e_config->menus_scroll_speed =
1.0;
+ if (EINA_DBL_EQ(cfdata->scroll_speed, 0.0)) e_config->menus_scroll_speed =
1.0;
else e_config->menus_scroll_speed = cfdata->scroll_speed;
- if (EINA_DBL_CMP(cfdata->fast_mouse_move_threshhold, 0.0))
+ if (EINA_DBL_EQ(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 (EINA_DBL_CMP(cfdata->scroll_speed, 0.0))
+ if (EINA_DBL_EQ(cfdata->scroll_speed, 0.0))
scroll_speed = 1.0;
else
scroll_speed = cfdata->scroll_speed;
- if (EINA_DBL_CMP(cfdata->fast_mouse_move_threshhold, 0.0))
+ if (EINA_DBL_EQ(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) ||
- (!EINA_DBL_CMP(e_config->menus_click_drag_timeout,
cfdata->click_drag_timeout)) ||
+ (!EINA_DBL_EQ(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) ||
- (!EINA_DBL_CMP(e_config->menus_scroll_speed, scroll_speed)) ||
- (!EINA_DBL_CMP(e_config->menus_fast_mouse_move_threshhold,
move_threshold)) ||
+ (!EINA_DBL_EQ(e_config->menus_scroll_speed, scroll_speed)) ||
+ (!EINA_DBL_EQ(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 06f58b3..f417a72 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 ((!EINA_DBL_CMP(e_config->framerate, cfdata->framerate)) ||
+ return ((!EINA_DBL_EQ(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 7a01fd6..01e3bf8 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) ||
- (!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)));
+ (!EINA_DBL_EQ(e_config->powersave.none, cfdata->powersave_none)) ||
+ (!EINA_DBL_EQ(e_config->powersave.low, cfdata->powersave_low)) ||
+ (!EINA_DBL_EQ(e_config->powersave.medium,
cfdata->powersave_medium)) ||
+ (!EINA_DBL_EQ(e_config->powersave.high, cfdata->powersave_high)) ||
+ (!EINA_DBL_EQ(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 6278ff2..72d8ad5 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, (!EINA_DBL_CMP(scl,
e_config->scale.factor)));
+ e_config_dialog_changed_set(cfdata->cfd, (!EINA_DBL_EQ(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) ||
- (!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)) ||
+ (!EINA_DBL_EQ(cfdata->min, e_config->scale.min)) ||
+ (!EINA_DBL_EQ(cfdata->max, e_config->scale.max)) ||
+ (!EINA_DBL_EQ(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 ef05636..4ef610b 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) ||
- (!EINA_DBL_CMP(e_config->auto_raise_delay,
cfdata->auto_raise_delay)) ||
+ (!EINA_DBL_EQ(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 cdb2aed..3f522de 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) ||
- (!EINA_DBL_CMP(e_config->border_shade_speed,
cfdata->border_shade_speed)) ||
+ (!EINA_DBL_EQ(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 b2b43cc..db21973 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) ||
- (!EINA_DBL_CMP(e_config->border_keyboard.timeout,
cfdata->border_keyboard.timeout)) ||
+ (!EINA_DBL_EQ(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 4bb1afa..885f7e0 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) ||
- (!EINA_DBL_CMP(e_config->kill_timer_wait, cfdata->kill_timer_wait))
||
+ (!EINA_DBL_EQ(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));
}
diff --git a/src/modules/everything/evry_plug_aggregator.c
b/src/modules/everything/evry_plug_aggregator.c
index e6b3a04..13e8b4f 100644
--- a/src/modules/everything/evry_plug_aggregator.c
+++ b/src/modules/everything/evry_plug_aggregator.c
@@ -113,7 +113,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
evry_history_item_usage_set(itp, NULL, NULL);
itp->usage /= 100.0;
- if ((!eina_dbleq(itp->usage, 0)) && (!eina_dbleq(max_usage, 0))
&& (itp->usage < max_usage))
+ if ((!eina_dbl_exact(itp->usage, 0)) &&
(!eina_dbl_exact(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) &&
- eina_dbleq(it->usage, 0) && ((int) inp_len <
plugin->config->min_query))
+ eina_dbl_exact(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 578948a..0ab6dc2 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 ((!eina_dbleq(it1->usage, 0)) && (!eina_dbleq(it2->usage, 0)))
+ if ((!eina_dbl_exact(it1->usage, 0)) && (!eina_dbl_exact(it2->usage, 0)))
return it1->usage > it2->usage ? -1 : 1;
- if ((!eina_dbleq(it1->usage, 0)) && eina_dbleq(it2->usage, 0))
+ if ((!eina_dbl_exact(it1->usage, 0)) && eina_dbl_exact(it2->usage, 0))
return -1;
- if ((!eina_dbleq(it2->usage, 0)) && eina_dbleq(it1->usage, 0))
+ if ((!eina_dbl_exact(it2->usage, 0)) && eina_dbl_exact(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 107f0f8..9e2a33a 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 (!EINA_DBL_CMP(sd->scroll_align, sd->scroll_align_to))
+ if (!EINA_DBL_EQ(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 ((!EINA_DBL_CMP(align, sd->cy)) && !sd->animator)
+ if ((!EINA_DBL_EQ(align, sd->cy)) && !sd->animator)
sd->animator = ecore_animator_add(_animator, obj);
}
else
diff --git a/src/modules/fileman/e_mod_config.c
b/src/modules/fileman/e_mod_config.c
index 119c40a..9c78343 100644
--- a/src/modules/fileman/e_mod_config.c
+++ b/src/modules/fileman/e_mod_config.c
@@ -250,8 +250,8 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED,
(fileman_config->icon.icon.w != cfdata->icon.icon.w) ||
(fileman_config->icon.icon.h != cfdata->icon.icon.w) ||
(fileman_config->icon.extension.show != cfdata->icon.extension.show) ||
- (!EINA_DBL_CMP(fileman_config->tooltip.delay, cfdata->tooltip.delay)) ||
- (!EINA_DBL_CMP(fileman_config->tooltip.size, cfdata->tooltip.size)) ||
+ (!EINA_DBL_EQ(fileman_config->tooltip.delay, cfdata->tooltip.delay)) ||
+ (!EINA_DBL_EQ(fileman_config->tooltip.size, cfdata->tooltip.size)) ||
(fileman_config->tooltip.enable != cfdata->tooltip.enable) ||
(fileman_config->tooltip.clamp_size != cfdata->tooltip.clamp_size) ||
(fileman_config->selection.windows_modifiers !=
cfdata->selection.windows_modifiers) ||
diff --git a/src/modules/geolocation/e_mod_main.c
b/src/modules/geolocation/e_mod_main.c
index 1b92f2c..0d1eb1d 100644
--- a/src/modules/geolocation/e_mod_main.c
+++ b/src/modules/geolocation/e_mod_main.c
@@ -80,21 +80,21 @@ popup_update(Instance *inst)
snprintf(buf, sizeof(buf), _("Longitude: %f"), inst->longitude);
e_widget_label_text_set(inst->popup_longitude, buf);
- if (eina_dbleq(inst->altitude, -DBL_MAX))
+ if (eina_dbl_exact(inst->altitude, -DBL_MAX))
snprintf(buf, sizeof(buf), _("Altitude: %f"), inst->altitude);
else
snprintf(buf, sizeof(buf), _("Altitude: N/A"));
e_widget_label_text_set(inst->popup_altitude, buf);
- if (eina_dbleq(inst->speed, -1.0))
+ if (eina_dbl_exact(inst->speed, -1.0))
snprintf(buf, sizeof(buf), _("Speed: %f"), inst->speed);
else
snprintf(buf, sizeof(buf), _("Speed: N/A"));
e_widget_label_text_set(inst->popup_speed, buf);
- if (eina_dbleq(inst->heading, -1.0))
+ if (eina_dbl_exact(inst->heading, -1.0))
snprintf(buf, sizeof(buf), _("Heading: %f"), inst->heading);
else
snprintf(buf, sizeof(buf), _("Heading: N/A"));
@@ -146,7 +146,7 @@ popup_new(Instance *inst)
inst->popup_longitude = e_widget_label_add(evas, buf);
e_widget_list_object_append(list, inst->popup_longitude, 1, 1, 0.5);
- if (eina_dbleq(inst->altitude, -DBL_MAX))
+ if (eina_dbl_exact(inst->altitude, -DBL_MAX))
snprintf(buf, sizeof(buf), _("Altitude: %f"), inst->altitude);
else
snprintf(buf, sizeof(buf), _("Altitude: N/A"));
@@ -154,7 +154,7 @@ popup_new(Instance *inst)
inst->popup_altitude = e_widget_label_add(evas, buf);
e_widget_list_object_append(list, inst->popup_altitude, 1, 1, 0.5);
- if (eina_dbleq(inst->speed, -1.0))
+ if (eina_dbl_exact(inst->speed, -1.0))
snprintf(buf, sizeof(buf), _("Speed: %f"), inst->speed);
else
snprintf(buf, sizeof(buf), _("Speed: N/A"));
@@ -162,7 +162,7 @@ popup_new(Instance *inst)
inst->popup_speed = e_widget_label_add(evas, buf);
e_widget_list_object_append(list, inst->popup_speed, 1, 1, 0.5);
- if (eina_dbleq(inst->heading, -1.0))
+ if (eina_dbl_exact(inst->heading, -1.0))
snprintf(buf, sizeof(buf), _("Heading: %f"), inst->heading);
else
snprintf(buf, sizeof(buf), _("Heading: N/A"));
diff --git a/src/modules/notification/e_mod_config.c
b/src/modules/notification/e_mod_config.c
index 694a764..e7dbb5c 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) ||
- (!EINA_DBL_CMP(cfdata->timeout, notification_cfg->timeout)) ||
+ (!EINA_DBL_EQ(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 c24cf82..a7ebdde 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 (!EINA_DBL_CMP(pager_config->popup_speed, cfdata->popup.speed)) return 1;
+ if (!EINA_DBL_EQ(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 (!EINA_DBL_CMP(pager_config->popup_urgent_speed,
cfdata->popup.urgent_speed))
+ if (!EINA_DBL_EQ(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 0818ce2..8ed46a7 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 (!EINA_DBL_CMP(pager_config->popup_speed, cfdata->popup.speed)) return 1;
+ if (!EINA_DBL_EQ(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 (!EINA_DBL_CMP(pager_config->popup_urgent_speed,
cfdata->popup.urgent_speed))
+ if (!EINA_DBL_EQ(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 6c16274..dae6753 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) ||
- (!EINA_DBL_CMP(cfdata->timeout, e_config->syscon.timeout)) ||
+ (!EINA_DBL_EQ(cfdata->timeout, e_config->syscon.timeout)) ||
(cfdata->do_input != e_config->syscon.do_input))
return 1;
diff --git a/src/modules/tiling/e_mod_tiling.c
b/src/modules/tiling/e_mod_tiling.c
index 6b095bf..3b3f063 100644
--- a/src/modules/tiling/e_mod_tiling.c
+++ b/src/modules/tiling/e_mod_tiling.c
@@ -997,7 +997,7 @@ _move_or_resize(E_Client *ec)
default:
break;
}
- if ((!eina_dbleq(w_diff, 1.0)) || (!eina_dbleq(h_diff, 1.0)))
+ if ((!eina_dbl_exact(w_diff, 1.0)) || (!eina_dbl_exact(h_diff, 1.0)))
{
if (!tiling_window_tree_node_resize(item, w_dir, w_diff, h_dir,
h_diff))
diff --git a/src/modules/tiling/window_tree.c b/src/modules/tiling/window_tree.c
index bf86453..73be5ff 100644
--- a/src/modules/tiling/window_tree.c
+++ b/src/modules/tiling/window_tree.c
@@ -457,7 +457,7 @@ tiling_window_tree_node_resize(Window_Tree *node, int
w_dir, double w_diff,
h_parent = parent;
}
- if ((!eina_dbleq(h_diff, 1.0)) && h_parent)
+ if ((!eina_dbl_exact(h_diff, 1.0)) && h_parent)
{
Window_Tree *tmp_node = (h_parent == parent) ? node : parent;
@@ -466,7 +466,7 @@ tiling_window_tree_node_resize(Window_Tree *node, int
w_dir, double w_diff,
h_diff, h_dir);
}
- if ((!eina_dbleq(w_diff, 1.0)) && w_parent)
+ if ((!eina_dbl_exact(w_diff, 1.0)) && w_parent)
{
Window_Tree *tmp_node = (w_parent == parent) ? node : parent;
diff --git a/src/modules/winlist/e_int_config_winlist.c
b/src/modules/winlist/e_int_config_winlist.c
index a65e405..cd50ba3 100644
--- a/src/modules/winlist/e_int_config_winlist.c
+++ b/src/modules/winlist/e_int_config_winlist.c
@@ -148,7 +148,7 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED,
E_Config_Dialog_Data *cfd
#define DO(_e_config, _cfdata) \
if (e_config->winlist_##_e_config != cfdata->_cfdata) return 1
#define DO_DBL(_e_config, _cfdata) \
- if (!EINA_DBL_CMP(e_config->winlist_##_e_config, cfdata->_cfdata)) return 1
+ if (!EINA_DBL_EQ(e_config->winlist_##_e_config, cfdata->_cfdata)) return 1
DO(list_show_iconified, iconified);
DO(list_show_other_desk_iconified, iconified_other_desks);
--
