aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/ecore/ecore_timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ecore/ecore_timer.c')
-rw-r--r--src/lib/ecore/ecore_timer.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 9b828564ee..23c314ac76 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -97,7 +97,7 @@ ecore_timer_add(double in,
Ecore_Timer *timer = NULL;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
- timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(in, func, data));
+ eo_add(timer, MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(NULL, in, func, data));
return timer;
}
@@ -261,7 +261,7 @@ EAPI void
ecore_timer_freeze(Ecore_Timer *timer)
{
ECORE_TIMER_CHECK(timer);
- eo_do(timer, eo_event_freeze());
+ eo_do(timer, eo_event_freeze(timer));
}
EOLIAN static void
@@ -294,7 +294,7 @@ ecore_timer_freeze_get(Ecore_Timer *timer)
{
int r = 0;
- eo_do(timer, r = eo_event_freeze_count_get());
+ eo_do(timer, r = eo_event_freeze_count_get(timer));
return !!r;
}
@@ -310,7 +310,7 @@ EAPI void
ecore_timer_thaw(Ecore_Timer *timer)
{
ECORE_TIMER_CHECK(timer);
- eo_do(timer, eo_event_thaw());
+ eo_do(timer, eo_event_thaw(timer));
}
EOLIAN static void
@@ -396,7 +396,7 @@ _ecore_timer_loop_add(double in,
const void *data)
{
Ecore_Timer *timer = NULL;
- timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(in, func, data));
+ eo_add(timer, MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(NULL, in, func, data));
return timer;
}
@@ -436,7 +436,7 @@ _ecore_timer_del(Ecore_Timer *obj)
if (timer->delete_me)
timers_delete_me--;
- eo_do(obj, eo_parent_set(NULL));
+ eo_do(obj, eo_parent_set(obj, NULL));
if (eo_destructed_is(obj))
eo_manual_free(obj);
@@ -460,7 +460,7 @@ _ecore_timer_eo_base_destructor(Eo *obj, Ecore_Timer_Data *pd)
timers_delete_me++;
}
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static Eo *
@@ -471,7 +471,7 @@ _ecore_timer_eo_base_finalize(Eo *obj, Ecore_Timer_Data *pd)
return NULL;
}
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+ return eo_super_eo_finalize(MY_CLASS, obj);
}
void
@@ -484,7 +484,7 @@ _ecore_timer_shutdown(void)
timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timers));
eo_data_unref(timer->obj, timer);
- eo_do(timer->obj, eo_parent_set(NULL));
+ eo_do(timer->obj, eo_parent_set(timer->obj, NULL));
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else
@@ -496,7 +496,7 @@ _ecore_timer_shutdown(void)
suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(suspended));
eo_data_unref(timer->obj, timer);
- eo_do(timer->obj, eo_parent_set(NULL));
+ eo_do(timer->obj, eo_parent_set(timer->obj, NULL));
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else
@@ -528,7 +528,7 @@ _ecore_timer_cleanup(void)
timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer));
eo_data_unref(timer->obj, timer);
- eo_do(timer->obj, eo_parent_set(NULL));
+ eo_do(timer->obj, eo_parent_set(timer->obj, NULL));
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else
@@ -553,7 +553,7 @@ _ecore_timer_cleanup(void)
suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer));
eo_data_unref(timer->obj, timer);
- eo_do(timer->obj, eo_parent_set(NULL));
+ eo_do(timer->obj, eo_parent_set(timer->obj, NULL));
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else