forked from enlightenment/efl
ecore: update to new eo_parent_get/set API.
This commit is contained in:
parent
936a8072f2
commit
5166bab675
|
@ -143,7 +143,7 @@ _do_tick(void)
|
||||||
eina_inlist_remove(EINA_INLIST_GET(animators),
|
eina_inlist_remove(EINA_INLIST_GET(animators),
|
||||||
EINA_INLIST_GET(animator));
|
EINA_INLIST_GET(animator));
|
||||||
|
|
||||||
eo_parent_set(animator->obj, NULL);
|
eo_do(animator->obj, eo_parent_set(NULL));
|
||||||
if (eo_destructed_is(animator->obj))
|
if (eo_destructed_is(animator->obj))
|
||||||
eo_manual_free(animator->obj);
|
eo_manual_free(animator->obj);
|
||||||
else
|
else
|
||||||
|
@ -559,7 +559,7 @@ _ecore_animator_shutdown(void)
|
||||||
animator = animators;
|
animator = animators;
|
||||||
animators = (Ecore_Animator_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(animators), EINA_INLIST_GET(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))
|
if (eo_destructed_is(animator->obj))
|
||||||
eo_manual_free(animator->obj);
|
eo_manual_free(animator->obj);
|
||||||
else
|
else
|
||||||
|
|
|
@ -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));
|
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))
|
if (eo_destructed_is(ie->obj))
|
||||||
eo_manual_free(ie->obj);
|
eo_manual_free(ie->obj);
|
||||||
else
|
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));
|
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))
|
if (eo_destructed_is(ie->obj))
|
||||||
eo_manual_free(ie->obj);
|
eo_manual_free(ie->obj);
|
||||||
else
|
else
|
||||||
|
|
|
@ -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));
|
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))
|
if (eo_destructed_is(ie->obj))
|
||||||
eo_manual_free(ie->obj);
|
eo_manual_free(ie->obj);
|
||||||
else
|
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));
|
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))
|
if (eo_destructed_is(ie->obj))
|
||||||
eo_manual_free(ie->obj);
|
eo_manual_free(ie->obj);
|
||||||
else
|
else
|
||||||
|
|
|
@ -137,7 +137,7 @@ _ecore_idler_shutdown(void)
|
||||||
{
|
{
|
||||||
idlers = (Ecore_Idler_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(idlers));
|
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))
|
if (eo_destructed_is(ie->obj))
|
||||||
eo_manual_free(ie->obj);
|
eo_manual_free(ie->obj);
|
||||||
else
|
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));
|
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))
|
if (eo_destructed_is(ie->obj))
|
||||||
eo_manual_free(ie->obj);
|
eo_manual_free(ie->obj);
|
||||||
else
|
else
|
||||||
|
|
|
@ -127,7 +127,7 @@ ecore_job_del(Ecore_Job *obj)
|
||||||
Ecore_Job_Private_Data *job = eo_data_scope_get(obj, MY_CLASS);
|
Ecore_Job_Private_Data *job = eo_data_scope_get(obj, MY_CLASS);
|
||||||
data = job->data;
|
data = job->data;
|
||||||
ecore_event_del(job->event);
|
ecore_event_del(job->event);
|
||||||
eo_parent_set(obj, NULL);
|
eo_do(obj, eo_parent_set(NULL));
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -158,7 +158,7 @@ static void
|
||||||
_ecore_job_event_free(void *data,
|
_ecore_job_event_free(void *data,
|
||||||
void *job EINA_UNUSED)
|
void *job EINA_UNUSED)
|
||||||
{
|
{
|
||||||
eo_parent_set(data, NULL);
|
eo_do(data, eo_parent_set(NULL));
|
||||||
|
|
||||||
Ecore_Job *obj = data;
|
Ecore_Job *obj = data;
|
||||||
|
|
||||||
|
|
|
@ -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));
|
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))
|
if (eo_destructed_is(poller->obj))
|
||||||
eo_manual_free(poller->obj);
|
eo_manual_free(poller->obj);
|
||||||
else
|
else
|
||||||
|
@ -408,7 +408,7 @@ ecore_poller_del(Ecore_Poller *obj)
|
||||||
data = poller->data;
|
data = poller->data;
|
||||||
pollers[poller->ibit] = (Ecore_Poller_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
|
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))
|
if (eo_destructed_is(poller->obj))
|
||||||
eo_manual_free(obj);
|
eo_manual_free(obj);
|
||||||
else
|
else
|
||||||
|
@ -447,7 +447,7 @@ _ecore_poller_shutdown(void)
|
||||||
while ((poller = pollers[i]))
|
while ((poller = pollers[i]))
|
||||||
{
|
{
|
||||||
pollers[i] = (Ecore_Poller_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(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))
|
if (eo_destructed_is(poller->obj))
|
||||||
eo_manual_free(poller->obj);
|
eo_manual_free(poller->obj);
|
||||||
else
|
else
|
||||||
|
|
|
@ -632,7 +632,7 @@ _ecore_timer_del(Ecore_Timer *obj)
|
||||||
if (timer->delete_me)
|
if (timer->delete_me)
|
||||||
timers_delete_me--;
|
timers_delete_me--;
|
||||||
|
|
||||||
eo_parent_set(obj, NULL);
|
eo_do(obj, eo_parent_set(NULL));
|
||||||
|
|
||||||
if (eo_destructed_is(obj))
|
if (eo_destructed_is(obj))
|
||||||
eo_manual_free(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));
|
timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timers));
|
||||||
|
|
||||||
eo_data_unref(timer->obj, 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))
|
if (eo_destructed_is(timer->obj))
|
||||||
eo_manual_free(timer->obj);
|
eo_manual_free(timer->obj);
|
||||||
else
|
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));
|
suspended = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(suspended));
|
||||||
|
|
||||||
eo_data_unref(timer->obj, 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))
|
if (eo_destructed_is(timer->obj))
|
||||||
eo_manual_free(timer->obj);
|
eo_manual_free(timer->obj);
|
||||||
else
|
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));
|
timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer));
|
||||||
|
|
||||||
eo_data_unref(timer->obj, 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))
|
if (eo_destructed_is(timer->obj))
|
||||||
eo_manual_free(timer->obj);
|
eo_manual_free(timer->obj);
|
||||||
else
|
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));
|
suspended = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer));
|
||||||
|
|
||||||
eo_data_unref(timer->obj, 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))
|
if (eo_destructed_is(timer->obj))
|
||||||
eo_manual_free(timer->obj);
|
eo_manual_free(timer->obj);
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue