summaryrefslogtreecommitdiff
path: root/src/lib/ecore
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@samsung.com>2013-09-25 13:32:41 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-09-25 13:34:18 +0900
commit5166bab6753f4294d82599407926415a315fcedc (patch)
tree5a4d3448850138cf989a389b79393991f20b3f72 /src/lib/ecore
parent936a8072f2103ddfbc71a0a6a85ed4882054969c (diff)
ecore: update to new eo_parent_get/set API.
Diffstat (limited to 'src/lib/ecore')
-rw-r--r--src/lib/ecore/ecore_anim.c4
-rw-r--r--src/lib/ecore/ecore_idle_enterer.c4
-rw-r--r--src/lib/ecore/ecore_idle_exiter.c4
-rw-r--r--src/lib/ecore/ecore_idler.c4
-rw-r--r--src/lib/ecore/ecore_job.c4
-rw-r--r--src/lib/ecore/ecore_poll.c6
-rw-r--r--src/lib/ecore/ecore_timer.c10
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)
143 eina_inlist_remove(EINA_INLIST_GET(animators), 143 eina_inlist_remove(EINA_INLIST_GET(animators),
144 EINA_INLIST_GET(animator)); 144 EINA_INLIST_GET(animator));
145 145
146 eo_parent_set(animator->obj, NULL); 146 eo_do(animator->obj, eo_parent_set(NULL));
147 if (eo_destructed_is(animator->obj)) 147 if (eo_destructed_is(animator->obj))
148 eo_manual_free(animator->obj); 148 eo_manual_free(animator->obj);
149 else 149 else
@@ -559,7 +559,7 @@ _ecore_animator_shutdown(void)
559 animator = animators; 559 animator = animators;
560 animators = (Ecore_Animator_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(animators), EINA_INLIST_GET(animators)); 560 animators = (Ecore_Animator_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(animators), EINA_INLIST_GET(animators));
561 561
562 eo_parent_set(animator->obj, NULL); 562 eo_do(animator->obj, eo_parent_set(NULL));
563 if (eo_destructed_is(animator->obj)) 563 if (eo_destructed_is(animator->obj))
564 eo_manual_free(animator->obj); 564 eo_manual_free(animator->obj);
565 else 565 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)
202 { 202 {
203 idle_enterers = (Ecore_Idle_Enterer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(idle_enterers)); 203 idle_enterers = (Ecore_Idle_Enterer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(idle_enterers));
204 204
205 eo_parent_set(ie->obj, NULL); 205 eo_do(ie->obj, eo_parent_set(NULL));
206 if (eo_destructed_is(ie->obj)) 206 if (eo_destructed_is(ie->obj))
207 eo_manual_free(ie->obj); 207 eo_manual_free(ie->obj);
208 else 208 else
@@ -262,7 +262,7 @@ _ecore_idle_enterer_call(void)
262 262
263 idle_enterers = (Ecore_Idle_Enterer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie)); 263 idle_enterers = (Ecore_Idle_Enterer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie));
264 264
265 eo_parent_set(ie->obj, NULL); 265 eo_do(ie->obj, eo_parent_set(NULL));
266 if (eo_destructed_is(ie->obj)) 266 if (eo_destructed_is(ie->obj))
267 eo_manual_free(ie->obj); 267 eo_manual_free(ie->obj);
268 else 268 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)
152 { 152 {
153 idle_exiters = (Ecore_Idle_Exiter_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(idle_exiters)); 153 idle_exiters = (Ecore_Idle_Exiter_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(idle_exiters));
154 154
155 eo_parent_set(ie->obj, NULL); 155 eo_do(ie->obj, eo_parent_set(NULL));
156 if (eo_destructed_is(ie->obj)) 156 if (eo_destructed_is(ie->obj))
157 eo_manual_free(ie->obj); 157 eo_manual_free(ie->obj);
158 else 158 else
@@ -213,7 +213,7 @@ _ecore_idle_exiter_call(void)
213 213
214 idle_exiters = (Ecore_Idle_Exiter_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(ie)); 214 idle_exiters = (Ecore_Idle_Exiter_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(ie));
215 215
216 eo_parent_set(ie->obj, NULL); 216 eo_do(ie->obj, eo_parent_set(NULL));
217 if (eo_destructed_is(ie->obj)) 217 if (eo_destructed_is(ie->obj))
218 eo_manual_free(ie->obj); 218 eo_manual_free(ie->obj);
219 else 219 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)
137 { 137 {
138 idlers = (Ecore_Idler_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(idlers)); 138 idlers = (Ecore_Idler_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(idlers));
139 139
140 eo_parent_set(ie->obj, NULL); 140 eo_do(ie->obj, eo_parent_set(NULL));
141 if (eo_destructed_is(ie->obj)) 141 if (eo_destructed_is(ie->obj))
142 eo_manual_free(ie->obj); 142 eo_manual_free(ie->obj);
143 else 143 else
@@ -194,7 +194,7 @@ _ecore_idler_all_call(void)
194 194
195 idlers = (Ecore_Idler_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(ie)); 195 idlers = (Ecore_Idler_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(ie));
196 196
197 eo_parent_set(ie->obj, NULL); 197 eo_do(ie->obj, eo_parent_set(NULL));
198 if (eo_destructed_is(ie->obj)) 198 if (eo_destructed_is(ie->obj))
199 eo_manual_free(ie->obj); 199 eo_manual_free(ie->obj);
200 else 200 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)
127 Ecore_Job_Private_Data *job = eo_data_scope_get(obj, MY_CLASS); 127 Ecore_Job_Private_Data *job = eo_data_scope_get(obj, MY_CLASS);
128 data = job->data; 128 data = job->data;
129 ecore_event_del(job->event); 129 ecore_event_del(job->event);
130 eo_parent_set(obj, NULL); 130 eo_do(obj, eo_parent_set(NULL));
131 return data; 131 return data;
132} 132}
133 133
@@ -158,7 +158,7 @@ static void
158_ecore_job_event_free(void *data, 158_ecore_job_event_free(void *data,
159 void *job EINA_UNUSED) 159 void *job EINA_UNUSED)
160{ 160{
161 eo_parent_set(data, NULL); 161 eo_do(data, eo_parent_set(NULL));
162 162
163 Ecore_Job *obj = data; 163 Ecore_Job *obj = data;
164 164
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)
175 { 175 {
176 pollers[i] = (Ecore_Poller_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(poller)); 176 pollers[i] = (Ecore_Poller_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(poller));
177 177
178 eo_parent_set(poller->obj, NULL); 178 eo_do(poller->obj, eo_parent_set(NULL));
179 if (eo_destructed_is(poller->obj)) 179 if (eo_destructed_is(poller->obj))
180 eo_manual_free(poller->obj); 180 eo_manual_free(poller->obj);
181 else 181 else
@@ -408,7 +408,7 @@ ecore_poller_del(Ecore_Poller *obj)
408 data = poller->data; 408 data = poller->data;
409 pollers[poller->ibit] = (Ecore_Poller_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller)); 409 pollers[poller->ibit] = (Ecore_Poller_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
410 410
411 eo_parent_set(poller->obj, NULL); 411 eo_do(poller->obj, eo_parent_set(NULL));
412 if (eo_destructed_is(poller->obj)) 412 if (eo_destructed_is(poller->obj))
413 eo_manual_free(obj); 413 eo_manual_free(obj);
414 else 414 else
@@ -447,7 +447,7 @@ _ecore_poller_shutdown(void)
447 while ((poller = pollers[i])) 447 while ((poller = pollers[i]))
448 { 448 {
449 pollers[i] = (Ecore_Poller_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(pollers[i])); 449 pollers[i] = (Ecore_Poller_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(pollers[i]));
450 eo_parent_set(poller->obj, NULL); 450 eo_do(poller->obj, eo_parent_set(NULL));
451 if (eo_destructed_is(poller->obj)) 451 if (eo_destructed_is(poller->obj))
452 eo_manual_free(poller->obj); 452 eo_manual_free(poller->obj);
453 else 453 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)
632 if (timer->delete_me) 632 if (timer->delete_me)
633 timers_delete_me--; 633 timers_delete_me--;
634 634
635 eo_parent_set(obj, NULL); 635 eo_do(obj, eo_parent_set(NULL));
636 636
637 if (eo_destructed_is(obj)) 637 if (eo_destructed_is(obj))
638 eo_manual_free(obj); 638 eo_manual_free(obj);
@@ -671,7 +671,7 @@ _ecore_timer_shutdown(void)
671 timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timers)); 671 timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timers));
672 672
673 eo_data_unref(timer->obj, timer); 673 eo_data_unref(timer->obj, timer);
674 eo_parent_set(timer->obj, NULL); 674 eo_do(timer->obj, eo_parent_set(NULL));
675 if (eo_destructed_is(timer->obj)) 675 if (eo_destructed_is(timer->obj))
676 eo_manual_free(timer->obj); 676 eo_manual_free(timer->obj);
677 else 677 else
@@ -683,7 +683,7 @@ _ecore_timer_shutdown(void)
683 suspended = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(suspended)); 683 suspended = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(suspended));
684 684
685 eo_data_unref(timer->obj, timer); 685 eo_data_unref(timer->obj, timer);
686 eo_parent_set(timer->obj, NULL); 686 eo_do(timer->obj, eo_parent_set(NULL));
687 if (eo_destructed_is(timer->obj)) 687 if (eo_destructed_is(timer->obj))
688 eo_manual_free(timer->obj); 688 eo_manual_free(timer->obj);
689 else 689 else
@@ -715,7 +715,7 @@ _ecore_timer_cleanup(void)
715 timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer)); 715 timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer));
716 716
717 eo_data_unref(timer->obj, timer); 717 eo_data_unref(timer->obj, timer);
718 eo_parent_set(timer->obj, NULL); 718 eo_do(timer->obj, eo_parent_set(NULL));
719 if (eo_destructed_is(timer->obj)) 719 if (eo_destructed_is(timer->obj))
720 eo_manual_free(timer->obj); 720 eo_manual_free(timer->obj);
721 else 721 else
@@ -740,7 +740,7 @@ _ecore_timer_cleanup(void)
740 suspended = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer)); 740 suspended = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer));
741 741
742 eo_data_unref(timer->obj, timer); 742 eo_data_unref(timer->obj, timer);
743 eo_parent_set(timer->obj, NULL); 743 eo_do(timer->obj, eo_parent_set(NULL));
744 if (eo_destructed_is(timer->obj)) 744 if (eo_destructed_is(timer->obj))
745 eo_manual_free(timer->obj); 745 eo_manual_free(timer->obj);
746 else 746 else