aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-03-10 13:13:45 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-03-10 13:14:29 -0800
commit633d2557c8a79ceeb02f6064a47e205093685b2e (patch)
tree78a5f030e280ee89b4518af2b6e5b7988a4a553f
parentcolorclass: allocate memory to fit the original size of data type (diff)
downloadelementary-633d2557c8a79ceeb02f6064a47e205093685b2e.tar.gz
efl: followup with renaming efl animator.
-rw-r--r--src/bin/test_anim.c2
-rw-r--r--src/lib/elc_naviframe.c4
-rw-r--r--src/lib/elm_genlist.c4
-rw-r--r--src/lib/elm_interface_scrollable.c6
-rw-r--r--src/lib/elm_map.c6
-rw-r--r--src/lib/elm_panel.c4
-rw-r--r--src/lib/elm_photocam.c18
7 files changed, 22 insertions, 22 deletions
diff --git a/src/bin/test_anim.c b/src/bin/test_anim.c
index a688a1961..24125bcff 100644
--- a/src/bin/test_anim.c
+++ b/src/bin/test_anim.c
@@ -93,5 +93,5 @@ test_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info
evas_object_resize(win, 480, 800);
evas_object_show(win);
- eo_event_callback_add(win, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _anim_tick, NULL);
+ eo_event_callback_add(win, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _anim_tick, NULL);
}
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 29e92a37d..757ffc701 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1437,7 +1437,7 @@ _deferred(void *data, const Eo_Event *event EINA_UNUSED)
free(nfo);
}
- eo_event_callback_del(nfd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, nfd);
+ eo_event_callback_del(nfd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, nfd);
return EO_CALLBACK_CONTINUE;
}
@@ -1522,7 +1522,7 @@ static void
_schedule_deferred(Elm_Naviframe_Op *nfo, Elm_Naviframe_Data *sd)
{
if (!sd->ops)
- eo_event_callback_add(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, sd);
+ eo_event_callback_add(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, sd);
sd->ops = eina_list_append(sd->ops, nfo);
}
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 3573492e1..70711cdd7 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -2433,7 +2433,7 @@ _elm_genlist_tree_effect_setup(Elm_Genlist_Data *sd)
evas_object_stack_below(sd->event_block_rect, sd->stack[1]);
evas_object_show(sd->event_block_rect);
sd->start_time = ecore_time_get();
- eo_event_callback_add(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj);
+ eo_event_callback_add(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj);
sd->tree_effect_animator = 1;
return EINA_TRUE;
}
@@ -2446,7 +2446,7 @@ _elm_genlist_tree_effect_stop(Elm_Genlist_Data *sd)
if (sd->tree_effect_animator)
{
sd->tree_effect_animator = 0;
- eo_event_callback_del(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj);
+ eo_event_callback_del(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj);
}
}
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index 3b49929b2..196244137 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -31,12 +31,12 @@
}
#define ELM_ANIMATOR_CONNECT(Obj, Bool, Callback, Data) \
- eo_event_callback_del(Obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \
- eo_event_callback_add(Obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \
+ eo_event_callback_del(Obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \
+ eo_event_callback_add(Obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \
Bool = 1;
#define ELM_ANIMATOR_DISCONNECT(Obj, Bool, Callback, Data) \
- eo_event_callback_del(Obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \
+ eo_event_callback_del(Obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \
Bool = 0;
static const char SIG_CHANGED[] = "changed";
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index d6d94ba2b..ecc75dc50 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -1207,9 +1207,9 @@ _zoom_animator_set(Elm_Map_Data *sd,
Eina_Bool r = EINA_FALSE;
sd->zoom_animator = !!callback;
- r = eo_event_callback_del(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, sd->obj);
- r |= eo_event_callback_del(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_bring_anim_cb, sd->obj);
- if (callback) eo_event_callback_add(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, callback, sd->obj);
+ r = eo_event_callback_del(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, sd->obj);
+ r |= eo_event_callback_del(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_bring_anim_cb, sd->obj);
+ if (callback) eo_event_callback_add(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, callback, sd->obj);
return r;
}
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 17fb5693f..95a52e442 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -1125,7 +1125,7 @@ _elm_panel_evas_object_smart_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord w, E
break;
}
- eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj);
+ eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj);
}
EOLIAN static void
@@ -1379,7 +1379,7 @@ _elm_panel_scrollable_content_size_set(Eo *obj, Elm_Panel_Data *sd, double ratio
break;
}
- eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj);
+ eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj);
}
EOLIAN static Eina_Bool
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index 6671ff35e..bf9946827 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -786,7 +786,7 @@ _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
{
sd->no_smooth--;
if (!sd->no_smooth) _smooth_update(data);
- eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
+ eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL);
}
@@ -1079,7 +1079,7 @@ _bounce_eval(void *data, const Eo_Event *event EINA_UNUSED)
elm_interface_scrollable_freeze_set(obj, EINA_FALSE);
- eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
+ eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
return EO_CALLBACK_CONTINUE;
}
@@ -1088,7 +1088,7 @@ _elm_photocam_bounce_reset(Eo *obj, Elm_Photocam_Data *sd EINA_UNUSED)
{
Eina_Bool r;
- r = eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
+ r = eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
if (r) _zoom_do(obj, 1.0);
}
@@ -1097,7 +1097,7 @@ _elm_photocam_zoom_reset(Eo *obj, Elm_Photocam_Data *sd)
{
Eina_Bool r;
- r = eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
+ r = eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
if (r)
{
sd->no_smooth--;
@@ -1302,7 +1302,7 @@ _g_layer_zoom_end_cb(void *data,
sd->g_layer_zoom.bounce.t_end = t +
_elm_config->page_scroll_friction;
- eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
+ eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
}
else
{
@@ -1470,8 +1470,8 @@ _elm_photocam_evas_object_smart_del(Eo *obj, Elm_Photocam_Data *sd)
ecore_job_del(sd->calc_job);
ecore_timer_del(sd->scr_timer);
ecore_timer_del(sd->long_timer);
- eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
- eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
+ eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
+ eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
evas_obj_smart_del(eo_super(obj, MY_CLASS));
}
@@ -1940,8 +1940,8 @@ done:
}
else
{
- an = eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
- eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
+ an = eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
+ eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
if (!an)
{
sd->no_smooth++;