summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_callbacks.c
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-05-02 14:17:19 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-05-02 14:17:19 +0900
commitb64a2994b3b277cbe7fce17d7ee275fd0d78c925 (patch)
tree3fd83519240da48e2355dfc6caa2415a2a77e282 /src/lib/evas/canvas/evas_callbacks.c
parentaf401b408343b57ced7f98eaded1e4c59337d0aa (diff)
Revert "Efl: replace eo_data_get for objects data referencing."
This reverts commit 654a3f5f94c2464b8563d27da94a78398c112962.
Diffstat (limited to 'src/lib/evas/canvas/evas_callbacks.c')
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 34bceae0fd..4bda3357bf 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -140,7 +140,7 @@ _evas_post_event_callback_call(Evas *eo_e, Evas_Public_Data *e)
140void 140void
141_evas_post_event_callback_free(Evas *eo_e) 141_evas_post_event_callback_free(Evas *eo_e)
142{ 142{
143 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 143 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
144 Evas_Post_Callback *pc; 144 Evas_Post_Callback *pc;
145 145
146 EINA_LIST_FREE(e->post_events, pc) 146 EINA_LIST_FREE(e->post_events, pc)
@@ -203,7 +203,7 @@ void
203evas_object_event_callback_all_del(Evas_Object *eo_obj) 203evas_object_event_callback_all_del(Evas_Object *eo_obj)
204{ 204{
205 Evas_Func_Node *fn; 205 Evas_Func_Node *fn;
206 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 206 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
207 207
208 if (!obj) return; 208 if (!obj) return;
209 if (!obj->callbacks) return; 209 if (!obj->callbacks) return;
@@ -215,7 +215,7 @@ void
215evas_object_event_callback_cleanup(Evas_Object *eo_obj) 215evas_object_event_callback_cleanup(Evas_Object *eo_obj)
216{ 216{
217 /* MEM OK */ 217 /* MEM OK */
218 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 218 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
219 if (!obj) return; 219 if (!obj) return;
220 if (!obj->callbacks) return; 220 if (!obj->callbacks) return;
221 evas_event_callback_list_post_free(&obj->callbacks->callbacks); 221 evas_event_callback_list_post_free(&obj->callbacks->callbacks);
@@ -226,7 +226,7 @@ evas_object_event_callback_cleanup(Evas_Object *eo_obj)
226void 226void
227evas_event_callback_all_del(Evas *eo_e) 227evas_event_callback_all_del(Evas *eo_e)
228{ 228{
229 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 229 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
230 Evas_Func_Node *fn; 230 Evas_Func_Node *fn;
231 231
232 if (!e) return; 232 if (!e) return;
@@ -238,7 +238,7 @@ evas_event_callback_all_del(Evas *eo_e)
238void 238void
239evas_event_callback_cleanup(Evas *eo_e) 239evas_event_callback_cleanup(Evas *eo_e)
240{ 240{
241 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 241 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
242 /* MEM OK */ 242 /* MEM OK */
243 if (!e) return; 243 if (!e) return;
244 if (!e->callbacks) return; 244 if (!e->callbacks) return;
@@ -250,7 +250,7 @@ evas_event_callback_cleanup(Evas *eo_e)
250void 250void
251evas_event_callback_call(Evas *eo_e, Evas_Callback_Type type, void *event_info) 251evas_event_callback_call(Evas *eo_e, Evas_Callback_Type type, void *event_info)
252{ 252{
253 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 253 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
254 Eina_Inlist **l_mod = NULL, *l; 254 Eina_Inlist **l_mod = NULL, *l;
255 255
256 if (!e) return; 256 if (!e) return;
@@ -386,7 +386,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
386 if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) && 386 if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) &&
387 (type <= EVAS_CALLBACK_KEY_UP)) 387 (type <= EVAS_CALLBACK_KEY_UP))
388 { 388 {
389 Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); 389 Evas_Object_Protected_Data *smart_parent = eo_data_get(obj->smart.parent, EVAS_OBJ_CLASS);
390 evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id); 390 evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id);
391 } 391 }
392 } 392 }
@@ -416,7 +416,7 @@ evas_object_event_callback_add(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
416EAPI void 416EAPI void
417evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data) 417evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data)
418{ 418{
419 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 419 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
420 /* MEM OK */ 420 /* MEM OK */
421 Evas_Func_Node *fn; 421 Evas_Func_Node *fn;
422 422
@@ -458,7 +458,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
458 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 458 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
459 return NULL; 459 return NULL;
460 MAGIC_CHECK_END(); 460 MAGIC_CHECK_END();
461 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 461 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
462 462
463 if (!obj) return NULL; 463 if (!obj) return NULL;
464 if (!func) return NULL; 464 if (!func) return NULL;
@@ -491,7 +491,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type
491 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 491 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
492 return NULL; 492 return NULL;
493 MAGIC_CHECK_END(); 493 MAGIC_CHECK_END();
494 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 494 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
495 495
496 if (!obj) return NULL; 496 if (!obj) return NULL;
497 if (!func) return NULL; 497 if (!func) return NULL;
@@ -525,7 +525,7 @@ evas_event_callback_add(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func,
525EAPI void 525EAPI void
526evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data) 526evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data)
527{ 527{
528 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 528 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
529 /* MEM OK */ 529 /* MEM OK */
530 Evas_Func_Node *fn; 530 Evas_Func_Node *fn;
531 531
@@ -560,7 +560,7 @@ evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callb
560EAPI void * 560EAPI void *
561evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func) 561evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func)
562{ 562{
563 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 563 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
564 /* MEM OK */ 564 /* MEM OK */
565 Evas_Func_Node *fn; 565 Evas_Func_Node *fn;
566 566
@@ -599,7 +599,7 @@ evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb
599 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); 599 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
600 return NULL; 600 return NULL;
601 MAGIC_CHECK_END(); 601 MAGIC_CHECK_END();
602 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 602 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
603 603
604 if (!e) return NULL; 604 if (!e) return NULL;
605 if (!func) return NULL; 605 if (!func) return NULL;
@@ -632,7 +632,7 @@ evas_post_event_callback_push(Evas *eo_e, Evas_Object_Event_Post_Cb func, const
632 return; 632 return;
633 MAGIC_CHECK_END(); 633 MAGIC_CHECK_END();
634 634
635 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 635 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
636 if (!e) return; 636 if (!e) return;
637 EVAS_MEMPOOL_INIT(_mp_pc, "evas_post_callback", Evas_Post_Callback, 64, ); 637 EVAS_MEMPOOL_INIT(_mp_pc, "evas_post_callback", Evas_Post_Callback, 64, );
638 pc = EVAS_MEMPOOL_ALLOC(_mp_pc, Evas_Post_Callback); 638 pc = EVAS_MEMPOOL_ALLOC(_mp_pc, Evas_Post_Callback);
@@ -655,7 +655,7 @@ evas_post_event_callback_remove(Evas *eo_e, Evas_Object_Event_Post_Cb func)
655 return; 655 return;
656 MAGIC_CHECK_END(); 656 MAGIC_CHECK_END();
657 657
658 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 658 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
659 if (!e) return; 659 if (!e) return;
660 EINA_LIST_FOREACH(e->post_events, l, pc) 660 EINA_LIST_FOREACH(e->post_events, l, pc)
661 { 661 {
@@ -677,7 +677,7 @@ evas_post_event_callback_remove_full(Evas *eo_e, Evas_Object_Event_Post_Cb func,
677 return; 677 return;
678 MAGIC_CHECK_END(); 678 MAGIC_CHECK_END();
679 679
680 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 680 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
681 if (!e) return; 681 if (!e) return;
682 EINA_LIST_FOREACH(e->post_events, l, pc) 682 EINA_LIST_FOREACH(e->post_events, l, pc)
683 { 683 {