summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-01-21 13:10:05 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-01-21 13:10:05 +0900
commit9d76a44b7837a93329e70f6f493f274ffb5acbf0 (patch)
tree807275fae7347445cdd183eb7585f9dddf337dbe /src
parent4caad3f4eafa9ae5c80bb55e82985b0f1dccba5e (diff)
Eo: Replace deprecated EO_EV_ by EO_BASE_EVENT_
Diffstat (limited to '')
-rw-r--r--src/lib/eo/eo_base_class.c8
-rw-r--r--src/lib/eo/eo_private.h2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_preload.c4
-rw-r--r--src/tests/eo/signals/signals_simple.c4
-rw-r--r--src/tests/eo/suite/eo_test_general.c6
5 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 246bcc2d60..d27e256916 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -575,7 +575,7 @@ _eo_base_event_callback_priority_add(Eo *obj, Eo_Base_Data *pd,
575 575
576 { 576 {
577 const Eo_Callback_Array_Item arr[] = { {desc, func}, {NULL, NULL}}; 577 const Eo_Callback_Array_Item arr[] = { {desc, func}, {NULL, NULL}};
578 eo_do(obj, eo_event_callback_call(EO_EV_CALLBACK_ADD, (void *)arr)); 578 eo_do(obj, eo_event_callback_call(EO_BASE_EVENT_CALLBACK_ADD, (void *)arr));
579 } 579 }
580} 580}
581 581
@@ -597,7 +597,7 @@ _eo_base_event_callback_del(Eo *obj, Eo_Base_Data *pd,
597 cb->delete_me = EINA_TRUE; 597 cb->delete_me = EINA_TRUE;
598 pd->deletions_waiting = EINA_TRUE; 598 pd->deletions_waiting = EINA_TRUE;
599 _eo_callbacks_clear(pd); 599 _eo_callbacks_clear(pd);
600 eo_do(obj, eo_event_callback_call(EO_EV_CALLBACK_DEL, (void *)arr); ); 600 eo_do(obj, eo_event_callback_call(EO_BASE_EVENT_CALLBACK_DEL, (void *)arr); );
601 return; 601 return;
602 } 602 }
603 } 603 }
@@ -622,7 +622,7 @@ _eo_base_event_callback_array_priority_add(Eo *obj, Eo_Base_Data *pd,
622 _eo_callbacks_sorted_insert(pd, cb); 622 _eo_callbacks_sorted_insert(pd, cb);
623 623
624 { 624 {
625 eo_do(obj, eo_event_callback_call(EO_EV_CALLBACK_ADD, (void *)array); ); 625 eo_do(obj, eo_event_callback_call(EO_BASE_EVENT_CALLBACK_ADD, (void *)array); );
626 } 626 }
627} 627}
628 628
@@ -642,7 +642,7 @@ _eo_base_event_callback_array_del(Eo *obj, Eo_Base_Data *pd,
642 pd->deletions_waiting = EINA_TRUE; 642 pd->deletions_waiting = EINA_TRUE;
643 _eo_callbacks_clear(pd); 643 _eo_callbacks_clear(pd);
644 644
645 eo_do(obj, eo_event_callback_call(EO_EV_CALLBACK_DEL, (void *)array); ); 645 eo_do(obj, eo_event_callback_call(EO_BASE_EVENT_CALLBACK_DEL, (void *)array); );
646 return; 646 return;
647 } 647 }
648 } 648 }
diff --git a/src/lib/eo/eo_private.h b/src/lib/eo/eo_private.h
index 135966daf6..869745c364 100644
--- a/src/lib/eo/eo_private.h
+++ b/src/lib/eo/eo_private.h
@@ -214,7 +214,7 @@ _eo_del_internal(const char *file, int line, _Eo_Object *obj)
214 214
215 const _Eo_Class *klass = obj->klass; 215 const _Eo_Class *klass = obj->klass;
216 216
217 eo_do(_eo_id_get(obj), eo_event_callback_call(EO_EV_DEL, NULL)); 217 eo_do(_eo_id_get(obj), eo_event_callback_call(EO_BASE_EVENT_DEL, NULL));
218 218
219 _eo_condtor_reset(obj); 219 _eo_condtor_reset(obj);
220 220
diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c b/src/modules/evas/engines/gl_common/evas_gl_preload.c
index 5344473c1d..9c3b1357ea 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_preload.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c
@@ -316,7 +316,7 @@ evas_gl_preload_target_register(Evas_GL_Texture *tex, Eo *target)
316 EINA_SAFETY_ON_NULL_RETURN(tex); 316 EINA_SAFETY_ON_NULL_RETURN(tex);
317 317
318 eo_do(target, 318 eo_do(target,
319 eo_event_callback_add(EO_EV_DEL, _evas_gl_preload_target_die, tex)); 319 eo_event_callback_add(EO_BASE_EVENT_DEL, _evas_gl_preload_target_die, tex));
320 tex->targets = eina_list_append(tex->targets, target); 320 tex->targets = eina_list_append(tex->targets, target);
321 tex->references++; 321 tex->references++;
322} 322}
@@ -330,7 +330,7 @@ evas_gl_preload_target_unregister(Evas_GL_Texture *tex, Eo *target)
330 EINA_SAFETY_ON_NULL_RETURN(tex); 330 EINA_SAFETY_ON_NULL_RETURN(tex);
331 331
332 eo_do(target, 332 eo_do(target,
333 eo_event_callback_del(EO_EV_DEL, _evas_gl_preload_target_die, tex)); 333 eo_event_callback_del(EO_BASE_EVENT_DEL, _evas_gl_preload_target_die, tex));
334 334
335 EINA_LIST_FOREACH(tex->targets, l, o) 335 EINA_LIST_FOREACH(tex->targets, l, o)
336 if (o == target) 336 if (o == target)
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 7b55cf8d5b..fd3138d44d 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -65,8 +65,8 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
65{ 65{
66 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 66 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
67 67
68 eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, NULL)); 68 eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_ADD, _cb_added, NULL));
69 eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, NULL)); 69 eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_DEL, _cb_deled, NULL));
70 70
71 eo_do(obj, eo_key_data_set("cb_count", NULL)); 71 eo_do(obj, eo_key_data_set("cb_count", NULL));
72 72
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 394e9c0935..f3050270b2 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -96,13 +96,13 @@ START_TEST(eo_signals)
96 { EV_A_CHANGED, _eo_signals_a_changed_cb }, 96 { EV_A_CHANGED, _eo_signals_a_changed_cb },
97 { EV_A_CHANGED, _eo_signals_a_changed_cb2 }, 97 { EV_A_CHANGED, _eo_signals_a_changed_cb2 },
98 { EV_A_CHANGED, _eo_signals_a_changed_never }, 98 { EV_A_CHANGED, _eo_signals_a_changed_never },
99 { EO_EV_DEL, _eo_signals_eo_del_cb }, 99 { EO_BASE_EVENT_DEL, _eo_signals_eo_del_cb },
100 { NULL, NULL } 100 { NULL, NULL }
101 }; 101 };
102 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 102 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
103 103
104 eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_ADD, _eo_signals_cb_added_deled, callbacks)); 104 eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_ADD, _eo_signals_cb_added_deled, callbacks));
105 eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_DEL, _eo_signals_cb_added_deled, callbacks)); 105 eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_DEL, _eo_signals_cb_added_deled, callbacks));
106 eo_do(obj, eo_event_callback_array_priority_add(callbacks, -100, (void *) 1)); 106 eo_do(obj, eo_event_callback_array_priority_add(callbacks, -100, (void *) 1));
107 eo_do(obj, eo_event_callback_array_add(callbacks, (void *) 3)); 107 eo_do(obj, eo_event_callback_array_add(callbacks, (void *) 3));
108 eo_do(obj, eo_event_callback_array_priority_add(callbacks, -50, (void *) 2)); 108 eo_do(obj, eo_event_callback_array_priority_add(callbacks, -50, (void *) 2));