summaryrefslogtreecommitdiff
path: root/src/lib/eo/eo_base_class.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/eo/eo_base_class.c')
-rw-r--r--src/lib/eo/eo_base_class.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index acf5883..5af26b3 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -66,7 +66,7 @@ _eo_base_key_data_set(Eo *obj, Eo_Base_Data *pd,
66 66
67 if (!key) return; 67 if (!key) return;
68 68
69 eo_do(obj, eo_key_data_del(key); ); 69 eo_key_data_del(obj, key);
70 70
71 node = malloc(sizeof(Eo_Generic_Data_Node)); 71 node = malloc(sizeof(Eo_Generic_Data_Node));
72 if (!node) return; 72 if (!node) return;
@@ -103,9 +103,9 @@ _eo_base_parent_set(Eo *obj, Eo_Base_Data *pd, Eo *parent_id)
103 if (pd->parent == parent_id) 103 if (pd->parent == parent_id)
104 return; 104 return;
105 105
106 if (eo_do_ret(obj, tmp, eo_composite_part_is()) && pd->parent) 106 if (eo_composite_part_is(obj) && pd->parent)
107 { 107 {
108 eo_do(pd->parent, eo_composite_detach(obj)); 108 eo_composite_detach(pd->parent, obj);
109 } 109 }
110 110
111 if (pd->parent) 111 if (pd->parent)
@@ -574,7 +574,7 @@ _eo_base_event_callback_priority_add(Eo *obj, Eo_Base_Data *pd,
574 cb->priority = priority; 574 cb->priority = priority;
575 _eo_callbacks_sorted_insert(pd, cb); 575 _eo_callbacks_sorted_insert(pd, cb);
576 576
577 eo_do(obj, eo_event_callback_call(EO_BASE_EVENT_CALLBACK_ADD, (void *)arr)); 577 eo_event_callback_call(obj, EO_BASE_EVENT_CALLBACK_ADD, (void *)arr);
578 578
579 return EINA_TRUE; 579 return EINA_TRUE;
580} 580}
@@ -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_BASE_EVENT_CALLBACK_DEL, (void *)arr); ); 600 eo_event_callback_call(obj, EO_BASE_EVENT_CALLBACK_DEL, (void *)arr);
601 return EINA_TRUE; 601 return EINA_TRUE;
602 } 602 }
603 } 603 }
@@ -627,7 +627,7 @@ _eo_base_event_callback_array_priority_add(Eo *obj, Eo_Base_Data *pd,
627 cb->func_array = EINA_TRUE; 627 cb->func_array = EINA_TRUE;
628 _eo_callbacks_sorted_insert(pd, cb); 628 _eo_callbacks_sorted_insert(pd, cb);
629 629
630 eo_do(obj, eo_event_callback_call(EO_BASE_EVENT_CALLBACK_ADD, (void *)array); ); 630 eo_event_callback_call(obj, EO_BASE_EVENT_CALLBACK_ADD, (void *)array);
631 631
632 return EINA_TRUE; 632 return EINA_TRUE;
633} 633}
@@ -648,7 +648,7 @@ _eo_base_event_callback_array_del(Eo *obj, Eo_Base_Data *pd,
648 pd->deletions_waiting = EINA_TRUE; 648 pd->deletions_waiting = EINA_TRUE;
649 _eo_callbacks_clear(pd); 649 _eo_callbacks_clear(pd);
650 650
651 eo_do(obj, eo_event_callback_call(EO_BASE_EVENT_CALLBACK_DEL, (void *)array); ); 651 eo_event_callback_call(obj, EO_BASE_EVENT_CALLBACK_DEL, (void *)array);
652 return EINA_TRUE; 652 return EINA_TRUE;
653 } 653 }
654 } 654 }
@@ -738,7 +738,7 @@ _eo_event_forwarder_callback(void *data, const Eo_Event *event)
738 Eo *new_obj = (Eo *) data; 738 Eo *new_obj = (Eo *) data;
739 Eina_Bool ret = EINA_FALSE; 739 Eina_Bool ret = EINA_FALSE;
740 740
741 eo_do(new_obj, ret = eo_event_callback_call(event->desc, event->event_info); ); 741 ret = eo_event_callback_call(new_obj, event->desc, event->event_info);
742 742
743 return ret; 743 return ret;
744} 744}
@@ -752,7 +752,7 @@ _eo_base_event_callback_forwarder_add(Eo *obj, Eo_Base_Data *pd EINA_UNUSED,
752 752
753 /* FIXME: Add it EO_MAGIC_RETURN(new_obj, EO_EINA_MAGIC); */ 753 /* FIXME: Add it EO_MAGIC_RETURN(new_obj, EO_EINA_MAGIC); */
754 754
755 eo_do(obj, eo_event_callback_add(desc, _eo_event_forwarder_callback, new_obj); ); 755 eo_event_callback_add(obj, desc, _eo_event_forwarder_callback, new_obj);
756} 756}
757 757
758EOLIAN static void 758EOLIAN static void
@@ -763,7 +763,7 @@ _eo_base_event_callback_forwarder_del(Eo *obj, Eo_Base_Data *pd EINA_UNUSED,
763 763
764 /* FIXME: Add it EO_MAGIC_RETURN(new_obj, EO_EINA_MAGIC); */ 764 /* FIXME: Add it EO_MAGIC_RETURN(new_obj, EO_EINA_MAGIC); */
765 765
766 eo_do(obj, eo_event_callback_del(desc, _eo_event_forwarder_callback, new_obj); ); 766 eo_event_callback_del(obj, desc, _eo_event_forwarder_callback, new_obj);
767} 767}
768 768
769EOLIAN static void 769EOLIAN static void
@@ -838,7 +838,7 @@ _eo_base_composite_attach(Eo *parent_id, Eo_Base_Data *pd EINA_UNUSED, Eo *comp_
838 comp_obj->composite = EINA_TRUE; 838 comp_obj->composite = EINA_TRUE;
839 parent->composite_objects = eina_list_prepend(parent->composite_objects, comp_obj_id); 839 parent->composite_objects = eina_list_prepend(parent->composite_objects, comp_obj_id);
840 840
841 eo_do(comp_obj_id, eo_parent_set(parent_id)); 841 eo_parent_set(comp_obj_id, parent_id);
842 842
843 return EINA_TRUE; 843 return EINA_TRUE;
844} 844}
@@ -854,7 +854,7 @@ _eo_base_composite_detach(Eo *parent_id, Eo_Base_Data *pd EINA_UNUSED, Eo *comp_
854 854
855 comp_obj->composite = EINA_FALSE; 855 comp_obj->composite = EINA_FALSE;
856 parent->composite_objects = eina_list_remove(parent->composite_objects, comp_obj_id); 856 parent->composite_objects = eina_list_remove(parent->composite_objects, comp_obj_id);
857 eo_do(comp_obj_id, eo_parent_set(NULL)); 857 eo_parent_set(comp_obj_id, NULL);
858 858
859 return EINA_TRUE; 859 return EINA_TRUE;
860} 860}
@@ -990,14 +990,14 @@ _eo_base_destructor(Eo *obj, Eo_Base_Data *pd)
990 while (pd->children) 990 while (pd->children)
991 { 991 {
992 child = eina_list_data_get(pd->children); 992 child = eina_list_data_get(pd->children);
993 eo_do(child, eo_parent_set(NULL)); 993 eo_parent_set(child, NULL);
994 } 994 }
995 995
996 if (pd->parent) 996 if (pd->parent)
997 { 997 {
998 ERR("Object '%p' still has a parent at the time of destruction.", obj); 998 ERR("Object '%p' still has a parent at the time of destruction.", obj);
999 eo_ref(obj); 999 eo_ref(obj);
1000 eo_do(obj, eo_parent_set(NULL)); 1000 eo_parent_set(obj, NULL);
1001 } 1001 }
1002 1002
1003 _eo_generic_data_del_all(pd); 1003 _eo_generic_data_del_all(pd);