From 5166bab6753f4294d82599407926415a315fcedc Mon Sep 17 00:00:00 2001 From: Cedric Bail Date: Wed, 25 Sep 2013 13:32:41 +0900 Subject: [PATCH] ecore: update to new eo_parent_get/set API. --- src/lib/ecore/ecore_anim.c | 4 ++-- src/lib/ecore/ecore_idle_enterer.c | 4 ++-- src/lib/ecore/ecore_idle_exiter.c | 4 ++-- src/lib/ecore/ecore_idler.c | 4 ++-- src/lib/ecore/ecore_job.c | 4 ++-- src/lib/ecore/ecore_poll.c | 6 +++--- src/lib/ecore/ecore_timer.c | 10 +++++----- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c index 006e180d59..5d32c31603 100644 --- a/src/lib/ecore/ecore_anim.c +++ b/src/lib/ecore/ecore_anim.c @@ -143,7 +143,7 @@ _do_tick(void) eina_inlist_remove(EINA_INLIST_GET(animators), EINA_INLIST_GET(animator)); - eo_parent_set(animator->obj, NULL); + eo_do(animator->obj, eo_parent_set(NULL)); if (eo_destructed_is(animator->obj)) eo_manual_free(animator->obj); else @@ -559,7 +559,7 @@ _ecore_animator_shutdown(void) animator = animators; animators = (Ecore_Animator_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(animators), EINA_INLIST_GET(animators)); - eo_parent_set(animator->obj, NULL); + eo_do(animator->obj, eo_parent_set(NULL)); if (eo_destructed_is(animator->obj)) eo_manual_free(animator->obj); else diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c index d5753ae2a5..7cbabc8a52 100644 --- a/src/lib/ecore/ecore_idle_enterer.c +++ b/src/lib/ecore/ecore_idle_enterer.c @@ -202,7 +202,7 @@ _ecore_idle_enterer_shutdown(void) { idle_enterers = (Ecore_Idle_Enterer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(idle_enterers)); - eo_parent_set(ie->obj, NULL); + eo_do(ie->obj, eo_parent_set(NULL)); if (eo_destructed_is(ie->obj)) eo_manual_free(ie->obj); else @@ -262,7 +262,7 @@ _ecore_idle_enterer_call(void) idle_enterers = (Ecore_Idle_Enterer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie)); - eo_parent_set(ie->obj, NULL); + eo_do(ie->obj, eo_parent_set(NULL)); if (eo_destructed_is(ie->obj)) eo_manual_free(ie->obj); else diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c index cf76275027..da85f1dc0f 100644 --- a/src/lib/ecore/ecore_idle_exiter.c +++ b/src/lib/ecore/ecore_idle_exiter.c @@ -152,7 +152,7 @@ _ecore_idle_exiter_shutdown(void) { idle_exiters = (Ecore_Idle_Exiter_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(idle_exiters)); - eo_parent_set(ie->obj, NULL); + eo_do(ie->obj, eo_parent_set(NULL)); if (eo_destructed_is(ie->obj)) eo_manual_free(ie->obj); else @@ -213,7 +213,7 @@ _ecore_idle_exiter_call(void) idle_exiters = (Ecore_Idle_Exiter_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(ie)); - eo_parent_set(ie->obj, NULL); + eo_do(ie->obj, eo_parent_set(NULL)); if (eo_destructed_is(ie->obj)) eo_manual_free(ie->obj); else diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c index 0495b4edfa..051c3e1e7a 100644 --- a/src/lib/ecore/ecore_idler.c +++ b/src/lib/ecore/ecore_idler.c @@ -137,7 +137,7 @@ _ecore_idler_shutdown(void) { idlers = (Ecore_Idler_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(idlers)); - eo_parent_set(ie->obj, NULL); + eo_do(ie->obj, eo_parent_set(NULL)); if (eo_destructed_is(ie->obj)) eo_manual_free(ie->obj); else @@ -194,7 +194,7 @@ _ecore_idler_all_call(void) idlers = (Ecore_Idler_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(ie)); - eo_parent_set(ie->obj, NULL); + eo_do(ie->obj, eo_parent_set(NULL)); if (eo_destructed_is(ie->obj)) eo_manual_free(ie->obj); else diff --git a/src/lib/ecore/ecore_job.c b/src/lib/ecore/ecore_job.c index cfdb1d1891..8720a7f2ee 100644 --- a/src/lib/ecore/ecore_job.c +++ b/src/lib/ecore/ecore_job.c @@ -127,7 +127,7 @@ ecore_job_del(Ecore_Job *obj) Ecore_Job_Private_Data *job = eo_data_scope_get(obj, MY_CLASS); data = job->data; ecore_event_del(job->event); - eo_parent_set(obj, NULL); + eo_do(obj, eo_parent_set(NULL)); return data; } @@ -158,7 +158,7 @@ static void _ecore_job_event_free(void *data, void *job EINA_UNUSED) { - eo_parent_set(data, NULL); + eo_do(data, eo_parent_set(NULL)); Ecore_Job *obj = data; diff --git a/src/lib/ecore/ecore_poll.c b/src/lib/ecore/ecore_poll.c index 886e6531cf..4883d7bb86 100644 --- a/src/lib/ecore/ecore_poll.c +++ b/src/lib/ecore/ecore_poll.c @@ -175,7 +175,7 @@ _ecore_poller_cb_timer(void *data EINA_UNUSED) { pollers[i] = (Ecore_Poller_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(poller)); - eo_parent_set(poller->obj, NULL); + eo_do(poller->obj, eo_parent_set(NULL)); if (eo_destructed_is(poller->obj)) eo_manual_free(poller->obj); else @@ -408,7 +408,7 @@ ecore_poller_del(Ecore_Poller *obj) data = poller->data; pollers[poller->ibit] = (Ecore_Poller_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller)); - eo_parent_set(poller->obj, NULL); + eo_do(poller->obj, eo_parent_set(NULL)); if (eo_destructed_is(poller->obj)) eo_manual_free(obj); else @@ -447,7 +447,7 @@ _ecore_poller_shutdown(void) while ((poller = pollers[i])) { pollers[i] = (Ecore_Poller_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(pollers[i])); - eo_parent_set(poller->obj, NULL); + eo_do(poller->obj, eo_parent_set(NULL)); if (eo_destructed_is(poller->obj)) eo_manual_free(poller->obj); else diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c index 08396d6ae0..eb83321dfb 100644 --- a/src/lib/ecore/ecore_timer.c +++ b/src/lib/ecore/ecore_timer.c @@ -632,7 +632,7 @@ _ecore_timer_del(Ecore_Timer *obj) if (timer->delete_me) timers_delete_me--; - eo_parent_set(obj, NULL); + eo_do(obj, eo_parent_set(NULL)); if (eo_destructed_is(obj)) eo_manual_free(obj); @@ -671,7 +671,7 @@ _ecore_timer_shutdown(void) timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timers)); eo_data_unref(timer->obj, timer); - eo_parent_set(timer->obj, NULL); + eo_do(timer->obj, eo_parent_set(NULL)); if (eo_destructed_is(timer->obj)) eo_manual_free(timer->obj); else @@ -683,7 +683,7 @@ _ecore_timer_shutdown(void) suspended = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(suspended)); eo_data_unref(timer->obj, timer); - eo_parent_set(timer->obj, NULL); + eo_do(timer->obj, eo_parent_set(NULL)); if (eo_destructed_is(timer->obj)) eo_manual_free(timer->obj); else @@ -715,7 +715,7 @@ _ecore_timer_cleanup(void) timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer)); eo_data_unref(timer->obj, timer); - eo_parent_set(timer->obj, NULL); + eo_do(timer->obj, eo_parent_set(NULL)); if (eo_destructed_is(timer->obj)) eo_manual_free(timer->obj); else @@ -740,7 +740,7 @@ _ecore_timer_cleanup(void) suspended = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer)); eo_data_unref(timer->obj, timer); - eo_parent_set(timer->obj, NULL); + eo_do(timer->obj, eo_parent_set(NULL)); if (eo_destructed_is(timer->obj)) eo_manual_free(timer->obj); else