summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2016-05-18 08:17:36 -0700
committerCedric Bail <cedric@osg.samsung.com>2016-05-18 08:18:04 -0700
commit75a53ece1007d927b8f0b6c5d3f269726afb9108 (patch)
tree034e6bcccf51916512c5e361666f9f46a1b97069
parent72adab722226b664ce0b63be46650874cd8b0ef9 (diff)
eo: for consistency use object like all our API.
-rw-r--r--src/bin/elementary/test_anim.c8
-rw-r--r--src/bin/elementary/test_application_server.c12
-rw-r--r--src/bin/elementary/test_entry.c6
-rw-r--r--src/bin/elementary/test_task_switcher.c8
-rw-r--r--src/bin/elementary/test_ui_box.c24
-rw-r--r--src/bin/elementary/test_ui_grid.c16
-rw-r--r--src/bin/elementary/test_win_plug.c2
-rw-r--r--src/bindings/eo_cxx/eo_event.hh2
-rw-r--r--src/bindings/js/eo_js/eo_js_event.hh2
-rw-r--r--src/examples/ecore/ecore_audio_playback.c8
-rw-r--r--src/examples/ecore/ecore_audio_to_ogg.c6
-rw-r--r--src/lib/ecore/ecore_timer.c2
-rw-r--r--src/lib/ecore/efl_loop_fd.c12
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c10
-rw-r--r--src/lib/ecore_con/ecore_con_url.c6
-rw-r--r--src/lib/edje/edje_callbacks.c22
-rw-r--r--src/lib/edje/edje_multisense.c4
-rw-r--r--src/lib/efl/interfaces/efl_vpath_manager.c4
-rw-r--r--src/lib/elementary/efl_ui_grid.c6
-rw-r--r--src/lib/elementary/elc_combobox.c6
-rw-r--r--src/lib/elementary/elc_fileselector.c8
-rw-r--r--src/lib/elementary/elc_hoversel.c2
-rw-r--r--src/lib/elementary/elc_naviframe.c2
-rw-r--r--src/lib/elementary/elm_app_server.c2
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c32
-rw-r--r--src/lib/elementary/elm_cnp.c2
-rw-r--r--src/lib/elementary/elm_colorselector.c20
-rw-r--r--src/lib/elementary/elm_conform.c6
-rw-r--r--src/lib/elementary/elm_entry.c4
-rw-r--r--src/lib/elementary/elm_glview.c4
-rw-r--r--src/lib/elementary/elm_interface_atspi_accessible.c4
-rw-r--r--src/lib/elementary/elm_menu.c2
-rw-r--r--src/lib/elementary/elm_photocam.c2
-rw-r--r--src/lib/elementary/elm_spinner.c2
-rw-r--r--src/lib/elementary/elm_widget.c22
-rw-r--r--src/lib/eo/eo_base.eo2
-rw-r--r--src/lib/eo/eo_base_class.c2
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c4
-rw-r--r--src/lib/evas/canvas/evas_clip.c2
-rw-r--r--src/lib/evas/canvas/evas_object_box.c2
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c2
-rw-r--r--src/lib/evas/canvas/evas_object_table.c2
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_root_node.c2
-rw-r--r--src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c12
-rw-r--r--src/modules/elementary/prefs/elm_button.c2
-rw-r--r--src/modules/elementary/prefs/elm_check.c2
-rw-r--r--src/modules/elementary/prefs/elm_datetime.c2
-rw-r--r--src/modules/elementary/prefs/elm_entry.c2
-rw-r--r--src/modules/elementary/prefs/elm_slider.c2
-rw-r--r--src/modules/elementary/prefs/elm_spinner.c2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_preload.c2
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c2
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c2
-rw-r--r--src/tests/elementary/elm_test_genlist.c2
-rw-r--r--src/tests/elementary/elm_test_image.c8
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c42
-rw-r--r--src/tests/eo/signals/signals_main.c6
-rw-r--r--src/tests/eo/signals/signals_simple.c8
-rw-r--r--src/tests/eolian_cxx/callback.c2
61 files changed, 200 insertions, 200 deletions
diff --git a/src/bin/elementary/test_anim.c b/src/bin/elementary/test_anim.c
index 346a3b6..e5d97c2 100644
--- a/src/bin/elementary/test_anim.c
+++ b/src/bin/elementary/test_anim.c
@@ -19,18 +19,18 @@ _anim_tick(void *data EINA_UNUSED, const Eo_Event *event)
19 double lx, ly; 19 double lx, ly;
20 unsigned int i; 20 unsigned int i;
21 21
22 evas_output_viewport_get(evas_object_evas_get(event->obj), 0, 0, &vw, &vh); 22 evas_output_viewport_get(evas_object_evas_get(event->object), 0, 0, &vw, &vh);
23 r = 48; 23 r = 48;
24 t = ecore_loop_time_get(); 24 t = ecore_loop_time_get();
25 fac = 2.0 / (double)((sizeof(names) / sizeof(char *) / 2)); 25 fac = 2.0 / (double)((sizeof(names) / sizeof(char *) / 2));
26 evas_pointer_canvas_xy_get(evas_object_evas_get(event->obj), &x, &y); 26 evas_pointer_canvas_xy_get(evas_object_evas_get(event->object), &x, &y);
27 lx = x; 27 lx = x;
28 ly = y; 28 ly = y;
29 29
30 for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++) 30 for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++)
31 { 31 {
32 bub = evas_object_data_get(event->obj, names[i * 2]); 32 bub = evas_object_data_get(event->object, names[i * 2]);
33 sh = evas_object_data_get(event->obj, names[(i * 2) + 1]); 33 sh = evas_object_data_get(event->object, names[(i * 2) + 1]);
34 zz = (((2 + sin(t * 6 + (M_PI * (i * fac)))) / 3) * 64) * 2; 34 zz = (((2 + sin(t * 6 + (M_PI * (i * fac)))) / 3) * 64) * 2;
35 xx = (cos(t * 4 + (M_PI * (i * fac))) * r) * 2; 35 xx = (cos(t * 4 + (M_PI * (i * fac))) * r) * 2;
36 yy = (sin(t * 6 + (M_PI * (i * fac))) * r) * 2; 36 yy = (sin(t * 6 + (M_PI * (i * fac))) * r) * 2;
diff --git a/src/bin/elementary/test_application_server.c b/src/bin/elementary/test_application_server.c
index f06fdba..e0c1f0a 100644
--- a/src/bin/elementary/test_application_server.c
+++ b/src/bin/elementary/test_application_server.c
@@ -45,7 +45,7 @@ _close_cb(void *data, const Eo_Event *event)
45 App_View_Context *ctx = data; 45 App_View_Context *ctx = data;
46 if (ctx->win) 46 if (ctx->win)
47 evas_object_del(ctx->win); 47 evas_object_del(ctx->win);
48 eo_unref(event->obj); 48 eo_unref(event->object);
49 return EINA_TRUE; 49 return EINA_TRUE;
50} 50}
51 51
@@ -66,7 +66,7 @@ _resume_cb(void *data, const Eo_Event *event)
66 if (!ctx->win) 66 if (!ctx->win)
67 { 67 {
68 _window_create(ctx); 68 _window_create(ctx);
69 elm_app_server_view_window_set(event->obj, ctx->win); 69 elm_app_server_view_window_set(event->object, ctx->win);
70 } 70 }
71 71
72 _text_update(ctx, "alive"); 72 _text_update(ctx, "alive");
@@ -80,7 +80,7 @@ _view_del_cb(void *data, const Eo_Event *event)
80 80
81 if (ctx->win) 81 if (ctx->win)
82 evas_object_del(ctx->win); 82 evas_object_del(ctx->win);
83 elm_app_server_view_window_set(event->obj, NULL); 83 elm_app_server_view_window_set(event->object, NULL);
84 eina_stringshare_del(ctx->view_name); 84 eina_stringshare_del(ctx->view_name);
85 free(ctx); 85 free(ctx);
86 return EINA_TRUE; 86 return EINA_TRUE;
@@ -126,11 +126,11 @@ _terminate_cb(void *data EINA_UNUSED, const Eo_Event *event)
126 const char *title = NULL; 126 const char *title = NULL;
127 127
128 printf("terminate cb\n"); 128 printf("terminate cb\n");
129 elm_app_server_save(event->obj); 129 elm_app_server_save(event->object);
130 title = elm_app_server_title_get(event->obj); 130 title = elm_app_server_title_get(event->object);
131 131
132 printf("Closing: %s\n", title); 132 printf("Closing: %s\n", title);
133 eo_unref(event->obj); 133 eo_unref(event->object);
134 return EINA_TRUE; 134 return EINA_TRUE;
135} 135}
136 136
diff --git a/src/bin/elementary/test_entry.c b/src/bin/elementary/test_entry.c
index 0ca4e66..c295cc3 100644
--- a/src/bin/elementary/test_entry.c
+++ b/src/bin/elementary/test_entry.c
@@ -361,9 +361,9 @@ _end_hide_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
361static Eina_Bool 361static Eina_Bool
362_context_menu_show_cb(void *data EINA_UNUSED, const Eo_Event *event) 362_context_menu_show_cb(void *data EINA_UNUSED, const Eo_Event *event)
363{ 363{
364 elm_entry_context_menu_clear(event->obj); 364 elm_entry_context_menu_clear(event->object);
365 elm_entry_context_menu_item_add(event->obj, "MenuD1", NULL, ELM_ICON_NONE, _item_cb, NULL); 365 elm_entry_context_menu_item_add(event->object, "MenuD1", NULL, ELM_ICON_NONE, _item_cb, NULL);
366 elm_entry_context_menu_item_add(event->obj, "MenuD2", NULL, ELM_ICON_NONE, _item_cb, NULL); 366 elm_entry_context_menu_item_add(event->object, "MenuD2", NULL, ELM_ICON_NONE, _item_cb, NULL);
367 return EO_CALLBACK_CONTINUE; 367 return EO_CALLBACK_CONTINUE;
368} 368}
369 369
diff --git a/src/bin/elementary/test_task_switcher.c b/src/bin/elementary/test_task_switcher.c
index 0440a74..803ced8 100644
--- a/src/bin/elementary/test_task_switcher.c
+++ b/src/bin/elementary/test_task_switcher.c
@@ -38,7 +38,7 @@ _app_view_prop_changed_cb(void *data EINA_UNUSED, const Eo_Event *event)
38{ 38{
39 Elm_App_View_State state = ELM_APP_VIEW_STATE_UNKNOWN; 39 Elm_App_View_State state = ELM_APP_VIEW_STATE_UNKNOWN;
40 40
41 state = elm_app_client_view_state_get(event->obj); 41 state = elm_app_client_view_state_get(event->object);
42 42
43 if (state == ELM_APP_VIEW_STATE_CLOSED) 43 if (state == ELM_APP_VIEW_STATE_CLOSED)
44 { 44 {
@@ -47,7 +47,7 @@ _app_view_prop_changed_cb(void *data EINA_UNUSED, const Eo_Event *event)
47 evas_object_del(props); 47 evas_object_del(props);
48 } 48 }
49 else 49 else
50 _app_view_clicked(event->obj, NULL, NULL); 50 _app_view_clicked(event->object, NULL, NULL);
51 51
52 return EINA_TRUE; 52 return EINA_TRUE;
53} 53}
@@ -273,8 +273,8 @@ _app_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
273static Eina_Bool 273static Eina_Bool
274_view_list_update_cb(void *data EINA_UNUSED, const Eo_Event *event) 274_view_list_update_cb(void *data EINA_UNUSED, const Eo_Event *event)
275{ 275{
276 if (app_selected == event->obj) 276 if (app_selected == event->object)
277 _app_clicked(event->obj, NULL, NULL); 277 _app_clicked(event->object, NULL, NULL);
278 return EINA_TRUE; 278 return EINA_TRUE;
279} 279}
280 280
diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c
index 6948a5c..be7f3b1 100644
--- a/src/bin/elementary/test_ui_box.c
+++ b/src/bin/elementary/test_ui_box.c
@@ -21,7 +21,7 @@ typedef enum {
21static Eina_Bool 21static Eina_Bool
22weights_cb(void *data, const Eo_Event *event) 22weights_cb(void *data, const Eo_Event *event)
23{ 23{
24 Weight_Mode mode = elm_radio_state_value_get(event->obj); 24 Weight_Mode mode = elm_radio_state_value_get(event->object);
25 25
26 switch (mode) 26 switch (mode)
27 { 27 {
@@ -65,7 +65,7 @@ weights_cb(void *data, const Eo_Event *event)
65static Eina_Bool 65static Eina_Bool
66request_slider_cb(void *data EINA_UNUSED, const Eo_Event *event) 66request_slider_cb(void *data EINA_UNUSED, const Eo_Event *event)
67{ 67{
68 int val = elm_slider_value_get(event->obj); 68 int val = elm_slider_value_get(event->object);
69 evas_object_size_hint_request_set(objects[3], val, val); 69 evas_object_size_hint_request_set(objects[3], val, val);
70 return EO_CALLBACK_CONTINUE; 70 return EO_CALLBACK_CONTINUE;
71} 71}
@@ -73,7 +73,7 @@ request_slider_cb(void *data EINA_UNUSED, const Eo_Event *event)
73static Eina_Bool 73static Eina_Bool
74padding_slider_cb(void *data, const Eo_Event *event) 74padding_slider_cb(void *data, const Eo_Event *event)
75{ 75{
76 int val = elm_slider_value_get(event->obj); 76 int val = elm_slider_value_get(event->object);
77 efl_pack_padding_set(data, val, val, EINA_TRUE); 77 efl_pack_padding_set(data, val, val, EINA_TRUE);
78 return EO_CALLBACK_CONTINUE; 78 return EO_CALLBACK_CONTINUE;
79} 79}
@@ -81,7 +81,7 @@ padding_slider_cb(void *data, const Eo_Event *event)
81static Eina_Bool 81static Eina_Bool
82margin_slider_cb(void *data, const Eo_Event *event) 82margin_slider_cb(void *data, const Eo_Event *event)
83{ 83{
84 int val = elm_slider_value_get(event->obj); 84 int val = elm_slider_value_get(event->object);
85 evas_object_size_hint_padding_set(data, val, val, val, val); 85 evas_object_size_hint_padding_set(data, val, val, val, val);
86 return EO_CALLBACK_CONTINUE; 86 return EO_CALLBACK_CONTINUE;
87} 87}
@@ -90,7 +90,7 @@ static Eina_Bool
90alignh_slider_cb(void *data, const Eo_Event *event) 90alignh_slider_cb(void *data, const Eo_Event *event)
91{ 91{
92 double av, val; 92 double av, val;
93 val = elm_slider_value_get(event->obj); 93 val = elm_slider_value_get(event->object);
94 efl_pack_align_get(data, NULL, &av); 94 efl_pack_align_get(data, NULL, &av);
95 efl_pack_align_set(data, val, av); 95 efl_pack_align_set(data, val, av);
96 return EO_CALLBACK_CONTINUE; 96 return EO_CALLBACK_CONTINUE;
@@ -100,7 +100,7 @@ static Eina_Bool
100alignv_slider_cb(void *data, const Eo_Event *event) 100alignv_slider_cb(void *data, const Eo_Event *event)
101{ 101{
102 double ah, val; 102 double ah, val;
103 val = elm_slider_value_get(event->obj); 103 val = elm_slider_value_get(event->object);
104 efl_pack_align_get(data, &ah, NULL); 104 efl_pack_align_get(data, &ah, NULL);
105 efl_pack_align_set(data, ah, val); 105 efl_pack_align_set(data, ah, val);
106 return EO_CALLBACK_CONTINUE; 106 return EO_CALLBACK_CONTINUE;
@@ -112,7 +112,7 @@ static Eina_Bool flow = EINA_FALSE;
112static Eina_Bool 112static Eina_Bool
113flow_check_cb(void *data, const Eo_Event *event) 113flow_check_cb(void *data, const Eo_Event *event)
114{ 114{
115 flow = elm_check_selected_get(event->obj); 115 flow = elm_check_selected_get(event->object);
116 efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params); 116 efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params);
117 return EO_CALLBACK_CONTINUE; 117 return EO_CALLBACK_CONTINUE;
118} 118}
@@ -120,7 +120,7 @@ flow_check_cb(void *data, const Eo_Event *event)
120static Eina_Bool 120static Eina_Bool
121horiz_check_cb(void *data, const Eo_Event *event) 121horiz_check_cb(void *data, const Eo_Event *event)
122{ 122{
123 Eina_Bool chk = elm_check_selected_get(event->obj); 123 Eina_Bool chk = elm_check_selected_get(event->object);
124 efl_pack_direction_set(data, chk ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL); 124 efl_pack_direction_set(data, chk ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL);
125 return EO_CALLBACK_CONTINUE; 125 return EO_CALLBACK_CONTINUE;
126} 126}
@@ -128,7 +128,7 @@ horiz_check_cb(void *data, const Eo_Event *event)
128static Eina_Bool 128static Eina_Bool
129homo_check_cb(void *data, const Eo_Event *event) 129homo_check_cb(void *data, const Eo_Event *event)
130{ 130{
131 Eina_Bool chk = elm_check_selected_get(event->obj); 131 Eina_Bool chk = elm_check_selected_get(event->object);
132 s_flow_params.homogenous = chk; 132 s_flow_params.homogenous = chk;
133 efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params); 133 efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params);
134 return EO_CALLBACK_CONTINUE; 134 return EO_CALLBACK_CONTINUE;
@@ -137,7 +137,7 @@ homo_check_cb(void *data, const Eo_Event *event)
137static Eina_Bool 137static Eina_Bool
138max_size_check_cb(void *data, const Eo_Event *event) 138max_size_check_cb(void *data, const Eo_Event *event)
139{ 139{
140 Eina_Bool chk = elm_check_selected_get(event->obj); 140 Eina_Bool chk = elm_check_selected_get(event->object);
141 s_flow_params.max_size = chk; 141 s_flow_params.max_size = chk;
142 efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params); 142 efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params);
143 return EO_CALLBACK_CONTINUE; 143 return EO_CALLBACK_CONTINUE;
@@ -146,7 +146,7 @@ max_size_check_cb(void *data, const Eo_Event *event)
146static Eina_Bool 146static Eina_Bool
147left_check_cb(void *data, const Eo_Event *event) 147left_check_cb(void *data, const Eo_Event *event)
148{ 148{
149 Eina_Bool chk = elm_check_selected_get(event->obj); 149 Eina_Bool chk = elm_check_selected_get(event->object);
150 if (chk) 150 if (chk)
151 { 151 {
152 efl_pack_align_set(data, 0, 0.5); 152 efl_pack_align_set(data, 0, 0.5);
@@ -200,7 +200,7 @@ EO_DEFINE_CLASS(_test_ui_box_custom_engine_class_get, &custom_engine_class_desc,
200static Eina_Bool 200static Eina_Bool
201custom_check_cb(void *data, const Eo_Event *event) 201custom_check_cb(void *data, const Eo_Event *event)
202{ 202{
203 Eina_Bool chk = elm_check_selected_get(event->obj); 203 Eina_Bool chk = elm_check_selected_get(event->object);
204 efl_pack_layout_engine_set(data, chk ? _test_ui_box_custom_engine_class_get() : NULL, NULL); 204 efl_pack_layout_engine_set(data, chk ? _test_ui_box_custom_engine_class_get() : NULL, NULL);
205 return EO_CALLBACK_CONTINUE; 205 return EO_CALLBACK_CONTINUE;
206} 206}
diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index 95359d0..5b5166c 100644
--- a/src/bin/elementary/test_ui_grid.c
+++ b/src/bin/elementary/test_ui_grid.c
@@ -35,7 +35,7 @@ EO_DEFINE_CLASS(_test_ui_grid_custom_engine_class_get, &custom_engine_class_desc
35static Eina_Bool 35static Eina_Bool
36weights_cb(void *data, const Eo_Event *event) 36weights_cb(void *data, const Eo_Event *event)
37{ 37{
38 Weight_Mode mode = elm_radio_state_value_get(event->obj); 38 Weight_Mode mode = elm_radio_state_value_get(event->object);
39 Eo *grid = data; 39 Eo *grid = data;
40 40
41 if (mode != CUSTOM) 41 if (mode != CUSTOM)
@@ -82,7 +82,7 @@ weights_cb(void *data, const Eo_Event *event)
82static Eina_Bool 82static Eina_Bool
83request_slider_cb(void *data EINA_UNUSED, const Eo_Event *event) 83request_slider_cb(void *data EINA_UNUSED, const Eo_Event *event)
84{ 84{
85 int val = elm_slider_value_get(event->obj); 85 int val = elm_slider_value_get(event->object);
86 for (int i = 0; i < 6; i++) 86 for (int i = 0; i < 6; i++)
87 evas_object_size_hint_request_set(objects[i], val, 0); 87 evas_object_size_hint_request_set(objects[i], val, 0);
88 return EO_CALLBACK_CONTINUE; 88 return EO_CALLBACK_CONTINUE;
@@ -91,7 +91,7 @@ request_slider_cb(void *data EINA_UNUSED, const Eo_Event *event)
91static Eina_Bool 91static Eina_Bool
92padding_slider_cb(void *data, const Eo_Event *event) 92padding_slider_cb(void *data, const Eo_Event *event)
93{ 93{
94 int val = elm_slider_value_get(event->obj); 94 int val = elm_slider_value_get(event->object);
95 efl_pack_padding_set(data, val, val, EINA_TRUE); 95 efl_pack_padding_set(data, val, val, EINA_TRUE);
96 return EO_CALLBACK_CONTINUE; 96 return EO_CALLBACK_CONTINUE;
97} 97}
@@ -99,7 +99,7 @@ padding_slider_cb(void *data, const Eo_Event *event)
99static Eina_Bool 99static Eina_Bool
100margin_slider_cb(void *data, const Eo_Event *event) 100margin_slider_cb(void *data, const Eo_Event *event)
101{ 101{
102 int val = elm_slider_value_get(event->obj); 102 int val = elm_slider_value_get(event->object);
103 evas_object_size_hint_padding_set(data, val, val, val, val); 103 evas_object_size_hint_padding_set(data, val, val, val, val);
104 return EO_CALLBACK_CONTINUE; 104 return EO_CALLBACK_CONTINUE;
105} 105}
@@ -107,7 +107,7 @@ margin_slider_cb(void *data, const Eo_Event *event)
107static Eina_Bool 107static Eina_Bool
108btnmargins_slider_cb(void *data, const Eo_Event *event) 108btnmargins_slider_cb(void *data, const Eo_Event *event)
109{ 109{
110 int val = elm_slider_value_get(event->obj); 110 int val = elm_slider_value_get(event->object);
111 for (int i = 1; i < 7; i++) 111 for (int i = 1; i < 7; i++)
112 evas_object_size_hint_padding_set(data, val, val, val, val); 112 evas_object_size_hint_padding_set(data, val, val, val, val);
113 return EO_CALLBACK_CONTINUE; 113 return EO_CALLBACK_CONTINUE;
@@ -120,8 +120,8 @@ layout_updated_cb(void *data, const Eo_Event *event)
120 char buf[64]; 120 char buf[64];
121 int rows, cols, count; 121 int rows, cols, count;
122 122
123 efl_pack_grid_size_get(event->obj, &cols, &rows); 123 efl_pack_grid_size_get(event->object, &cols, &rows);
124 count = efl_content_count(event->obj); 124 count = efl_content_count(event->object);
125 sprintf(buf, "%d items (%dx%d)", count, cols, rows); 125 sprintf(buf, "%d items (%dx%d)", count, cols, rows);
126 elm_object_text_set(o, buf); 126 elm_object_text_set(o, buf);
127 127
@@ -136,7 +136,7 @@ child_evt_cb(void *data, const Eo_Event *event)
136 int col, row, colspan, rowspan; 136 int col, row, colspan, rowspan;
137 char buf[64]; 137 char buf[64];
138 138
139 efl_pack_grid_position_get(event->obj, it, &col, &row, &colspan, &rowspan); 139 efl_pack_grid_position_get(event->object, it, &col, &row, &colspan, &rowspan);
140 if (event->desc == EFL_CONTAINER_EVENT_CONTENT_ADDED) 140 if (event->desc == EFL_CONTAINER_EVENT_CONTENT_ADDED)
141 sprintf(buf, "pack %d,%d %dx%d", col, row, colspan, rowspan); 141 sprintf(buf, "pack %d,%d %dx%d", col, row, colspan, rowspan);
142 else 142 else
diff --git a/src/bin/elementary/test_win_plug.c b/src/bin/elementary/test_win_plug.c
index 5c62707..23052a7 100644
--- a/src/bin/elementary/test_win_plug.c
+++ b/src/bin/elementary/test_win_plug.c
@@ -146,7 +146,7 @@ create_handles(Evas_Object *obj)
146static Eina_Bool 146static Eina_Bool
147_notify_end(void *data EINA_UNUSED, const Eo_Event *event) 147_notify_end(void *data EINA_UNUSED, const Eo_Event *event)
148{ 148{
149 eo_unref(event->obj); 149 eo_unref(event->object);
150 return EINA_FALSE; 150 return EINA_FALSE;
151} 151}
152 152
diff --git a/src/bindings/eo_cxx/eo_event.hh b/src/bindings/eo_cxx/eo_event.hh
index 5633e89..320bfc9 100644
--- a/src/bindings/eo_cxx/eo_event.hh
+++ b/src/bindings/eo_cxx/eo_event.hh
@@ -139,7 +139,7 @@ template <typename T, typename F>
139Eina_Bool 139Eina_Bool
140event_callback(void *data, ::Eo_Event const* event) 140event_callback(void *data, ::Eo_Event const* event)
141{ 141{
142 T wrapper(::eo_ref(event->obj)); 142 T wrapper(::eo_ref(event->object));
143 F *f = static_cast<F*>(data); 143 F *f = static_cast<F*>(data);
144 return _detail::really_call_event(wrapper, *f, *event->desc, event->info 144 return _detail::really_call_event(wrapper, *f, *event->desc, event->info
145 , std::is_void<decltype((*f)(wrapper, *event->desc, event->info))>()); 145 , std::is_void<decltype((*f)(wrapper, *event->desc, event->info))>());
diff --git a/src/bindings/js/eo_js/eo_js_event.hh b/src/bindings/js/eo_js/eo_js_event.hh
index 3e1ff63..9d9219d 100644
--- a/src/bindings/js/eo_js/eo_js_event.hh
+++ b/src/bindings/js/eo_js/eo_js_event.hh
@@ -59,7 +59,7 @@ inline Eina_Bool event_callback(void* data, Eo_Event const* eo_event)
59 v8::Isolate* isolate = v8::Isolate::GetCurrent(); 59 v8::Isolate* isolate = v8::Isolate::GetCurrent();
60 v8::HandleScope handle_scope(isolate); 60 v8::HandleScope handle_scope(isolate);
61 event_callback_information* event = static_cast<event_callback_information*>(data); 61 event_callback_information* event = static_cast<event_callback_information*>(data);
62 v8::Handle<v8::Value> a[] = {eina::js::compatibility_new<v8::External>(isolate, eo_event->obj)}; 62 v8::Handle<v8::Value> a[] = {eina::js::compatibility_new<v8::External>(isolate, eo_event->object)};
63 v8::Local<v8::Object> self = (event->info->constructor->handle())->NewInstance(1, a); 63 v8::Local<v8::Object> self = (event->info->constructor->handle())->NewInstance(1, a);
64 64
65 v8::Local<v8::Value> call_args[] = { 65 v8::Local<v8::Value> call_args[] = {
diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c
index 9beb4e3..1453dc2 100644
--- a/src/examples/ecore/ecore_audio_playback.c
+++ b/src/examples/ecore/ecore_audio_playback.c
@@ -196,12 +196,12 @@ static Eina_Bool _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
196 const char *name; 196 const char *name;
197 Eina_Bool ret; 197 Eina_Bool ret;
198 198
199 ecore_audio_obj_name_get(event->obj, &name); 199 ecore_audio_obj_name_get(event->object, &name);
200 printf("Done: %s\n", name); 200 printf("Done: %s\n", name);
201 201
202 inputs = eina_list_remove(inputs, event->obj); 202 inputs = eina_list_remove(inputs, event->object);
203 ret = ecore_audio_obj_out_input_detach(out, event->obj); 203 ret = ecore_audio_obj_out_input_detach(out, event->object);
204 eo_unref(event->obj); 204 eo_unref(event->object);
205 205
206 if (!ret) 206 if (!ret)
207 printf("Could not detach input %s\n", name); 207 printf("Could not detach input %s\n", name);
diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c
index 2296be2..7041451 100644
--- a/src/examples/ecore/ecore_audio_to_ogg.c
+++ b/src/examples/ecore/ecore_audio_to_ogg.c
@@ -20,11 +20,11 @@ static Eina_Bool _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
20 const char *name; 20 const char *name;
21 Eo *out; 21 Eo *out;
22 22
23 ecore_audio_obj_name_get(event->obj, &name); 23 ecore_audio_obj_name_get(event->object, &name);
24 printf("Done: %s\n", name); 24 printf("Done: %s\n", name);
25 25
26 ecore_audio_obj_in_output_get(event->obj, &out); 26 ecore_audio_obj_in_output_get(event->object, &out);
27 eo_unref(event->obj); 27 eo_unref(event->object);
28 eo_unref(out); 28 eo_unref(out);
29 29
30 ecore_main_loop_quit(); 30 ecore_main_loop_quit();
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index a1226eb..041fafe 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -172,7 +172,7 @@ _ecore_timer_legacy_tick(void *data, const Eo_Event *event)
172 legacy->inside_call = 1; 172 legacy->inside_call = 1;
173 if (!_ecore_call_task_cb(legacy->func, (void*)legacy->data) || 173 if (!_ecore_call_task_cb(legacy->func, (void*)legacy->data) ||
174 legacy->delete_me) 174 legacy->delete_me)
175 eo_unref(event->obj); 175 eo_unref(event->object);
176 176
177 return EO_CALLBACK_CONTINUE; 177 return EO_CALLBACK_CONTINUE;
178} 178}
diff --git a/src/lib/ecore/efl_loop_fd.c b/src/lib/ecore/efl_loop_fd.c
index 4e105ef..50bd4c2 100644
--- a/src/lib/ecore/efl_loop_fd.c
+++ b/src/lib/ecore/efl_loop_fd.c
@@ -104,17 +104,17 @@ _check_fd_event_catcher_add(void *data, const Eo_Event *event)
104 if (array[i].desc == EFL_LOOP_FD_EVENT_READ) 104 if (array[i].desc == EFL_LOOP_FD_EVENT_READ)
105 { 105 {
106 if (fd->references.read++ > 0) continue; 106 if (fd->references.read++ > 0) continue;
107 _efl_loop_fd_reset(event->obj, fd); 107 _efl_loop_fd_reset(event->object, fd);
108 } 108 }
109 else if (array[i].desc == EFL_LOOP_FD_EVENT_WRITE) 109 else if (array[i].desc == EFL_LOOP_FD_EVENT_WRITE)
110 { 110 {
111 if (fd->references.write++ > 0) continue; 111 if (fd->references.write++ > 0) continue;
112 _efl_loop_fd_reset(event->obj, fd); 112 _efl_loop_fd_reset(event->object, fd);
113 } 113 }
114 if (array[i].desc == EFL_LOOP_FD_EVENT_ERROR) 114 if (array[i].desc == EFL_LOOP_FD_EVENT_ERROR)
115 { 115 {
116 if (fd->references.error++ > 0) continue; 116 if (fd->references.error++ > 0) continue;
117 _efl_loop_fd_reset(event->obj, fd); 117 _efl_loop_fd_reset(event->object, fd);
118 } 118 }
119 } 119 }
120 120
@@ -133,17 +133,17 @@ _check_fd_event_catcher_del(void *data, const Eo_Event *event)
133 if (array[i].desc == EFL_LOOP_FD_EVENT_READ) 133 if (array[i].desc == EFL_LOOP_FD_EVENT_READ)
134 { 134 {
135 if (fd->references.read++ > 0) continue; 135 if (fd->references.read++ > 0) continue;
136 _efl_loop_fd_reset(event->obj, fd); 136 _efl_loop_fd_reset(event->object, fd);
137 } 137 }
138 else if (array[i].desc == EFL_LOOP_FD_EVENT_WRITE) 138 else if (array[i].desc == EFL_LOOP_FD_EVENT_WRITE)
139 { 139 {
140 if (fd->references.write++ > 0) continue; 140 if (fd->references.write++ > 0) continue;
141 _efl_loop_fd_reset(event->obj, fd); 141 _efl_loop_fd_reset(event->object, fd);
142 } 142 }
143 if (array[i].desc == EFL_LOOP_FD_EVENT_ERROR) 143 if (array[i].desc == EFL_LOOP_FD_EVENT_ERROR)
144 { 144 {
145 if (fd->references.error++ > 0) continue; 145 if (fd->references.error++ > 0) continue;
146 _efl_loop_fd_reset(event->obj, fd); 146 _efl_loop_fd_reset(event->object, fd);
147 } 147 }
148 } 148 }
149 149
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
index 5a97d44..9f2961e 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -96,10 +96,10 @@ static Eina_Bool _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *e
96 int samplerate = 0; 96 int samplerate = 0;
97 double speed = 0; 97 double speed = 0;
98 98
99 samplerate = ecore_audio_obj_in_samplerate_get(event->obj); 99 samplerate = ecore_audio_obj_in_samplerate_get(event->object);
100 speed = ecore_audio_obj_in_speed_get(event->obj); 100 speed = ecore_audio_obj_in_speed_get(event->object);
101 101
102 stream = eo_key_data_get(event->obj, "pulse_data"); 102 stream = eo_key_data_get(event->object, "pulse_data");
103 103
104 pa_operation_unref(pa_stream_update_sample_rate(stream, samplerate * speed, NULL, NULL)); 104 pa_operation_unref(pa_stream_update_sample_rate(stream, samplerate * speed, NULL, NULL));
105 105
@@ -151,9 +151,9 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
151static Eina_Bool _delayed_attach_cb(void *data, const Eo_Event *event) 151static Eina_Bool _delayed_attach_cb(void *data, const Eo_Event *event)
152{ 152{
153 Eo *in = data; 153 Eo *in = data;
154 eo_event_callback_del(event->obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in); 154 eo_event_callback_del(event->object, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
155 155
156 _input_attach_internal(event->obj, in); 156 _input_attach_internal(event->object, in);
157 157
158 return EINA_TRUE; 158 return EINA_TRUE;
159} 159}
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index c6cb069..72870af 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -172,7 +172,7 @@ _efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event
172 e->status = f->status; 172 e->status = f->status;
173 e->url_con = f->url_con; 173 e->url_con = f->url_con;
174 ecore_event_add(ECORE_CON_EVENT_URL_COMPLETE, e, 174 ecore_event_add(ECORE_CON_EVENT_URL_COMPLETE, e,
175 (Ecore_End_Cb)_ecore_con_event_url_free, event->obj); 175 (Ecore_End_Cb)_ecore_con_event_url_free, event->object);
176 176
177 return EO_CALLBACK_STOP; 177 return EO_CALLBACK_STOP;
178} 178}
@@ -191,7 +191,7 @@ _efl_network_url_event_data_cb(void *data EINA_UNUSED, const Eo_Event *event)
191 e->size = f->size; 191 e->size = f->size;
192 memcpy(e->data, f->data, f->size); 192 memcpy(e->data, f->data, f->size);
193 ecore_event_add(ECORE_CON_EVENT_URL_DATA, e, 193 ecore_event_add(ECORE_CON_EVENT_URL_DATA, e,
194 (Ecore_End_Cb)_ecore_con_event_url_free, event->obj); 194 (Ecore_End_Cb)_ecore_con_event_url_free, event->object);
195 195
196 return EO_CALLBACK_CONTINUE; 196 return EO_CALLBACK_CONTINUE;
197} 197}
@@ -210,7 +210,7 @@ _efl_network_url_event_progress_cb(void *data EINA_UNUSED, const Eo_Event *event
210 e->up.total = f->up.total; 210 e->up.total = f->up.total;
211 e->up.now = f->up.now; 211 e->up.now = f->up.now;
212 ecore_event_add(ECORE_CON_EVENT_URL_PROGRESS, e, 212 ecore_event_add(ECORE_CON_EVENT_URL_PROGRESS, e,
213 (Ecore_End_Cb)_ecore_con_event_url_free, event->obj); 213 (Ecore_End_Cb)_ecore_con_event_url_free, event->object);
214 214
215 return EO_CALLBACK_CONTINUE; 215 return EO_CALLBACK_CONTINUE;
216} 216}
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index 1d24377..bbb6e71 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -9,7 +9,7 @@ _edje_hold_signal_cb(void *data, const Eo_Event *event)
9 9
10 ev = event->info; 10 ev = event->info;
11 ed = data; 11 ed = data;
12 rp = evas_object_data_get(event->obj, "real_part"); 12 rp = evas_object_data_get(event->object, "real_part");
13 if (!rp) return EO_CALLBACK_CONTINUE; 13 if (!rp) return EO_CALLBACK_CONTINUE;
14 if (ev->hold) 14 if (ev->hold)
15 _edje_emit(ed, "hold,on", rp->part->name); 15 _edje_emit(ed, "hold,on", rp->part->name);
@@ -26,7 +26,7 @@ _edje_focus_in_signal_cb(void *data, const Eo_Event *event)
26 Edje_Real_Part *rp; 26 Edje_Real_Part *rp;
27 27
28 ed = data; 28 ed = data;
29 rp = evas_object_data_get(event->obj, "real_part"); 29 rp = evas_object_data_get(event->object, "real_part");
30 if ((!rp) || (!ed)) 30 if ((!rp) || (!ed))
31 return EO_CALLBACK_CONTINUE; 31 return EO_CALLBACK_CONTINUE;
32 32
@@ -42,7 +42,7 @@ _edje_focus_out_signal_cb(void *data, const Eo_Event *event)
42 Edje_Real_Part *rp; 42 Edje_Real_Part *rp;
43 43
44 ed = data; 44 ed = data;
45 rp = evas_object_data_get(event->obj, "real_part"); 45 rp = evas_object_data_get(event->object, "real_part");
46 if ((!rp) || (!ed)) 46 if ((!rp) || (!ed))
47 return EO_CALLBACK_CONTINUE; 47 return EO_CALLBACK_CONTINUE;
48 48
@@ -60,7 +60,7 @@ _edje_mouse_in_signal_cb(void *data, const Eo_Event *event)
60 60
61 ev = event->info; 61 ev = event->info;
62 ed = data; 62 ed = data;
63 rp = evas_object_data_get(event->obj, "real_part"); 63 rp = evas_object_data_get(event->object, "real_part");
64 if (rp) 64 if (rp)
65 { 65 {
66 if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags)) 66 if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags))
@@ -81,7 +81,7 @@ _edje_mouse_out_signal_cb(void *data, const Eo_Event *event)
81 81
82 ev = event->info; 82 ev = event->info;
83 ed = data; 83 ed = data;
84 rp = evas_object_data_get(event->obj, "real_part"); 84 rp = evas_object_data_get(event->object, "real_part");
85 if (rp) 85 if (rp)
86 { 86 {
87 if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags)) 87 if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags))
@@ -104,7 +104,7 @@ _edje_mouse_down_signal_cb(void *data, const Eo_Event *event)
104 104
105 ev = event->info; 105 ev = event->info;
106 ed = data; 106 ed = data;
107 rp = evas_object_data_get(event->obj, "real_part"); 107 rp = evas_object_data_get(event->object, "real_part");
108 if (!rp) return EO_CALLBACK_CONTINUE; 108 if (!rp) return EO_CALLBACK_CONTINUE;
109 109
110 ignored = rp->part->ignore_flags & ev->event_flags; 110 ignored = rp->part->ignore_flags & ev->event_flags;
@@ -175,7 +175,7 @@ _edje_mouse_up_signal_cb(void *data, const Eo_Event *event)
175 175
176 ev = event->info; 176 ev = event->info;
177 ed = data; 177 ed = data;
178 rp = evas_object_data_get(event->obj, "real_part"); 178 rp = evas_object_data_get(event->object, "real_part");
179 if (!rp) return EO_CALLBACK_CONTINUE; 179 if (!rp) return EO_CALLBACK_CONTINUE;
180 180
181 ignored = rp->part->ignore_flags & ev->event_flags; 181 ignored = rp->part->ignore_flags & ev->event_flags;
@@ -249,7 +249,7 @@ _edje_mouse_move_signal_cb(void *data, const Eo_Event *event)
249 249
250 ev = event->info; 250 ev = event->info;
251 ed = data; 251 ed = data;
252 rp = evas_object_data_get(event->obj, "real_part"); 252 rp = evas_object_data_get(event->object, "real_part");
253 if (!rp) return EO_CALLBACK_CONTINUE; 253 if (!rp) return EO_CALLBACK_CONTINUE;
254 if (rp->part->dragable.event_id >= 0) 254 if (rp->part->dragable.event_id >= 0)
255 { 255 {
@@ -270,7 +270,7 @@ _edje_mouse_move_signal_cb(void *data, const Eo_Event *event)
270 { 270 {
271 Evas_Coord x, y, w, h; 271 Evas_Coord x, y, w, h;
272 272
273 evas_object_geometry_get(event->obj, &x, &y, &w, &h); 273 evas_object_geometry_get(event->object, &x, &y, &w, &h);
274 if ((ev->cur.canvas.x < x) || (ev->cur.canvas.y < y) || 274 if ((ev->cur.canvas.x < x) || (ev->cur.canvas.y < y) ||
275 (ev->cur.canvas.x >= (x + w)) || (ev->cur.canvas.y >= (y + h))) 275 (ev->cur.canvas.x >= (x + w)) || (ev->cur.canvas.y >= (y + h)))
276 { 276 {
@@ -287,7 +287,7 @@ _edje_mouse_move_signal_cb(void *data, const Eo_Event *event)
287 { 287 {
288 Evas_Coord x, y, w, h; 288 Evas_Coord x, y, w, h;
289 289
290 evas_object_geometry_get(event->obj, &x, &y, &w, &h); 290 evas_object_geometry_get(event->object, &x, &y, &w, &h);
291 if ((ev->cur.canvas.x >= x) && (ev->cur.canvas.y >= y) && 291 if ((ev->cur.canvas.x >= x) && (ev->cur.canvas.y >= y) &&
292 (ev->cur.canvas.x < (x + w)) && (ev->cur.canvas.y < (y + h))) 292 (ev->cur.canvas.x < (x + w)) && (ev->cur.canvas.y < (y + h)))
293 { 293 {
@@ -358,7 +358,7 @@ _edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event)
358 358
359 ev = event->info; 359 ev = event->info;
360 ed = data; 360 ed = data;
361 rp = evas_object_data_get(event->obj, "real_part"); 361 rp = evas_object_data_get(event->object, "real_part");
362 if (rp) 362 if (rp)
363 { 363 {
364 if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags)) 364 if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags))
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index d4d9090..8020cd6 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -10,7 +10,7 @@ static Eina_Bool outfail = EINA_FALSE;
10static Eina_Bool 10static Eina_Bool
11_play_finished(void *data EINA_UNUSED, const Eo_Event *event) 11_play_finished(void *data EINA_UNUSED, const Eo_Event *event)
12{ 12{
13 eo_unref(event->obj); 13 eo_unref(event->object);
14 14
15 return EINA_TRUE; 15 return EINA_TRUE;
16} 16}
@@ -19,7 +19,7 @@ static Eina_Bool
19_out_fail(void *data EINA_UNUSED, const Eo_Event *event) 19_out_fail(void *data EINA_UNUSED, const Eo_Event *event)
20{ 20{
21 outfail = EINA_TRUE; 21 outfail = EINA_TRUE;
22 eo_unref(event->obj); 22 eo_unref(event->object);
23 out = NULL; 23 out = NULL;
24 return EINA_TRUE; 24 return EINA_TRUE;
25} 25}
diff --git a/src/lib/efl/interfaces/efl_vpath_manager.c b/src/lib/efl/interfaces/efl_vpath_manager.c
index 8a4d752..bde316d 100644
--- a/src/lib/efl/interfaces/efl_vpath_manager.c
+++ b/src/lib/efl/interfaces/efl_vpath_manager.c
@@ -53,8 +53,8 @@ _register_sort_cb(Efl_Vpath_Manager_Entry *e1, Efl_Vpath_Manager_Entry *e2)
53static Eina_Bool 53static Eina_Bool
54_cb_vpath_del(void *data, const Eo_Event *event) 54_cb_vpath_del(void *data, const Eo_Event *event)
55{ 55{
56 efl_vpath_manager_unregister(EFL_VPATH_MANAGER_CLASS, event->obj); 56 efl_vpath_manager_unregister(EFL_VPATH_MANAGER_CLASS, event->object);
57 eo_event_callback_del(event->obj, EO_EVENT_DEL, _cb_vpath_del, data); 57 eo_event_callback_del(event->object, EO_EVENT_DEL, _cb_vpath_del, data);
58 return EINA_TRUE; 58 return EINA_TRUE;
59} 59}
60 60
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 3c3c2a6..ce25f17 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -398,10 +398,10 @@ _subobj_del_cb(void *data, const Eo_Event *event)
398 Efl_Ui_Grid *obj = data; 398 Efl_Ui_Grid *obj = data;
399 Efl_Ui_Grid_Data *pd = eo_data_scope_get(obj, EFL_UI_GRID_CLASS); 399 Efl_Ui_Grid_Data *pd = eo_data_scope_get(obj, EFL_UI_GRID_CLASS);
400 400
401 eo_event_callback_array_del(event->obj, subobj_callbacks(), data); 401 eo_event_callback_array_del(event->object, subobj_callbacks(), data);
402 _item_remove(obj, pd, event->obj); 402 _item_remove(obj, pd, event->object);
403 403
404 if (!elm_widget_sub_object_del(obj, event->obj)) 404 if (!elm_widget_sub_object_del(obj, event->object))
405 WRN("failed to remove child from its parent"); 405 WRN("failed to remove child from its parent");
406 406
407 return EO_CALLBACK_CONTINUE; 407 return EO_CALLBACK_CONTINUE;
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index c347b1e..d955fdc 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -96,7 +96,7 @@ _on_hover_clicked(void *data, const Eo_Event *event)
96{ 96{
97 const char *dismissstr; 97 const char *dismissstr;
98 98
99 dismissstr = elm_layout_data_get(event->obj, "dismiss"); 99 dismissstr = elm_layout_data_get(event->object, "dismiss");
100 100
101 if (!dismissstr || strcmp(dismissstr, "on")) 101 if (!dismissstr || strcmp(dismissstr, "on"))
102 elm_combobox_hover_end(data); // for backward compatibility 102 elm_combobox_hover_end(data); // for backward compatibility
@@ -322,7 +322,7 @@ static Eina_Bool
322_mbe_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event) 322_mbe_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event)
323{ 323{
324 //Unset the multibuttonentry to contracted mode of single line 324 //Unset the multibuttonentry to contracted mode of single line
325 elm_multibuttonentry_expanded_set(event->obj, EINA_TRUE); 325 elm_multibuttonentry_expanded_set(event->object, EINA_TRUE);
326 return EINA_TRUE; 326 return EINA_TRUE;
327} 327}
328 328
@@ -336,7 +336,7 @@ static Eina_Bool
336_mbe_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event) 336_mbe_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event)
337{ 337{
338 //Set the multibuttonentry to contracted mode of single line 338 //Set the multibuttonentry to contracted mode of single line
339 elm_multibuttonentry_expanded_set(event->obj, EINA_FALSE); 339 elm_multibuttonentry_expanded_set(event->object, EINA_FALSE);
340 return EINA_TRUE; 340 return EINA_TRUE;
341} 341}
342 342
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index a2d49ae..00ecfb1 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1058,7 +1058,7 @@ _on_text_activated(void *data, const Eo_Event *event)
1058 1058
1059 ELM_FILESELECTOR_DATA_GET(fs, sd); 1059 ELM_FILESELECTOR_DATA_GET(fs, sd);
1060 1060
1061 path = elm_widget_part_text_get(event->obj, NULL); 1061 path = elm_widget_part_text_get(event->object, NULL);
1062 1062
1063 if (!ecore_file_exists(path)) 1063 if (!ecore_file_exists(path))
1064 { 1064 {
@@ -1134,7 +1134,7 @@ _on_text_activated(void *data, const Eo_Event *event)
1134 free(dir); 1134 free(dir);
1135 1135
1136end: 1136end:
1137 elm_object_focus_set(event->obj, EINA_FALSE); 1137 elm_object_focus_set(event->object, EINA_FALSE);
1138 1138
1139 return EINA_TRUE; 1139 return EINA_TRUE;
1140} 1140}
@@ -1187,7 +1187,7 @@ _anchor_clicked(void *data, const Eo_Event *event)
1187 eina_stringshare_del(p); 1187 eina_stringshare_del(p);
1188 /* After anchor was clicked, entry will be focused, and will be editable. 1188 /* After anchor was clicked, entry will be focused, and will be editable.
1189 * It's wrong. So remove focus. */ 1189 * It's wrong. So remove focus. */
1190 elm_object_focus_set(event->obj, EINA_FALSE); 1190 elm_object_focus_set(event->object, EINA_FALSE);
1191 1191
1192 if (sd->path_entry_idler) { 1192 if (sd->path_entry_idler) {
1193 ecore_idler_del(sd->path_entry_idler); 1193 ecore_idler_del(sd->path_entry_idler);
@@ -1429,7 +1429,7 @@ _preedit_cb(void *data, const Eo_Event *event)
1429{ 1429{
1430 ELM_FILESELECTOR_DATA_GET(data, sd); 1430 ELM_FILESELECTOR_DATA_GET(data, sd);
1431 1431
1432 sd->search_string = elm_entry_entry_get(event->obj); 1432 sd->search_string = elm_entry_entry_get(event->object);
1433 1433
1434 if (sd->search_string && sd->path) 1434 if (sd->search_string && sd->path)
1435 _populate(data, sd->path, NULL, NULL); 1435 _populate(data, sd->path, NULL, NULL);
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index d0f6e86..df041f3 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -114,7 +114,7 @@ _on_hover_clicked(void *data, const Eo_Event *event)
114{ 114{
115 const char *dismissstr; 115 const char *dismissstr;
116 116
117 dismissstr = elm_layout_data_get(event->obj, "dismiss"); 117 dismissstr = elm_layout_data_get(event->object, "dismiss");
118 118
119 if (!dismissstr || strcmp(dismissstr, "on")) 119 if (!dismissstr || strcmp(dismissstr, "on"))
120 elm_hoversel_hover_end(data); // for backward compatibility 120 elm_hoversel_hover_end(data); // for backward compatibility
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 2504f04..c5865dc 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -956,7 +956,7 @@ _on_item_back_btn_clicked(void *data, const Eo_Event *event)
956 multiple times on some heavy environment. This callback del will 956 multiple times on some heavy environment. This callback del will
957 prevent those scenario and guarantee only one clicked for it's own 957 prevent those scenario and guarantee only one clicked for it's own
958 page. */ 958 page. */
959 eo_event_callback_del(event->obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, data); 959 eo_event_callback_del(event->object, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, data);
960 elm_naviframe_item_pop(data); 960 elm_naviframe_item_pop(data);
961 961
962 return EINA_TRUE; 962 return EINA_TRUE;
diff --git a/src/lib/elementary/elm_app_server.c b/src/lib/elementary/elm_app_server.c
index 1f481cb..52284aa 100644
--- a/src/lib/elementary/elm_app_server.c
+++ b/src/lib/elementary/elm_app_server.c
@@ -32,7 +32,7 @@ static Eina_Bool
32_view_del_cb(void *data, const Eo_Event *event) 32_view_del_cb(void *data, const Eo_Event *event)
33{ 33{
34 Elm_App_Server_Data *cdata = data; 34 Elm_App_Server_Data *cdata = data;
35 eina_hash_del(cdata->views, NULL, event->obj); 35 eina_hash_del(cdata->views, NULL, event->object);
36 return EINA_TRUE; 36 return EINA_TRUE;
37} 37}
38 38
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index a99b53e..b42a109 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -3815,7 +3815,7 @@ _state_changed_signal_send(void *data, const Eo_Event *event)
3815 3815
3816 type_desc = elm_states_to_atspi_state[state_data->type].name; 3816 type_desc = elm_states_to_atspi_state[state_data->type].name;
3817 3817
3818 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3818 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3819 &_event_obj_signals[ATSPI_OBJECT_EVENT_STATE_CHANGED], type_desc, state_data->new_value, 0, NULL); 3819 &_event_obj_signals[ATSPI_OBJECT_EVENT_STATE_CHANGED], type_desc, state_data->new_value, 0, NULL);
3820 return EINA_TRUE; 3820 return EINA_TRUE;
3821} 3821}
@@ -3865,7 +3865,7 @@ _property_changed_signal_send(void *data, const Eo_Event *event)
3865 return EINA_FALSE; 3865 return EINA_FALSE;
3866 } 3866 }
3867 3867
3868 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3868 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3869 &_event_obj_signals[ATSPI_OBJECT_EVENT_PROPERTY_CHANGED], atspi_desc, 0, 0, NULL, NULL); 3869 &_event_obj_signals[ATSPI_OBJECT_EVENT_PROPERTY_CHANGED], atspi_desc, 0, 0, NULL, NULL);
3870 return EINA_TRUE; 3870 return EINA_TRUE;
3871} 3871}
@@ -3878,7 +3878,7 @@ _visible_data_changed_signal_send(void *data, const Eo_Event *event)
3878 if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED)) 3878 if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED))
3879 return EINA_FALSE; 3879 return EINA_FALSE;
3880 3880
3881 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3881 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3882 &_event_obj_signals[ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED], "", 3882 &_event_obj_signals[ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED], "",
3883 0, 0, NULL, NULL); 3883 0, 0, NULL, NULL);
3884 3884
@@ -3898,7 +3898,7 @@ _active_descendant_changed_signal_send(void *data, const Eo_Event *event)
3898 3898
3899 idx = elm_interface_atspi_accessible_index_in_parent_get(child); 3899 idx = elm_interface_atspi_accessible_index_in_parent_get(child);
3900 3900
3901 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3901 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3902 &_event_obj_signals[ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED], "", 3902 &_event_obj_signals[ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED], "",
3903 idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), child); 3903 idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), child);
3904 return EINA_TRUE; 3904 return EINA_TRUE;
@@ -3933,7 +3933,7 @@ _children_changed_signal_send(void *data, const Eo_Event *event)
3933 3933
3934 if (!atspi_desc) return EINA_FALSE; 3934 if (!atspi_desc) return EINA_FALSE;
3935 3935
3936 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3936 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3937 &_event_obj_signals[ATSPI_OBJECT_EVENT_CHILDREN_CHANGED], atspi_desc, 3937 &_event_obj_signals[ATSPI_OBJECT_EVENT_CHILDREN_CHANGED], atspi_desc,
3938 idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), ev_data->child); 3938 idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), ev_data->child);
3939 3939
@@ -3973,7 +3973,7 @@ _window_signal_send(void *data, const Eo_Event *event)
3973 return EINA_FALSE; 3973 return EINA_FALSE;
3974 } 3974 }
3975 3975
3976 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_WINDOW, 3976 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_WINDOW,
3977 &_window_obj_signals[type], "", 0, 0, "i", 0); 3977 &_window_obj_signals[type], "", 0, 0, "i", 0);
3978 return EINA_TRUE; 3978 return EINA_TRUE;
3979} 3979}
@@ -3986,7 +3986,7 @@ _selection_signal_send(void *data, const Eo_Event *event)
3986 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_SELECTION_CHANGED)) 3986 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_SELECTION_CHANGED))
3987 return EINA_FALSE; 3987 return EINA_FALSE;
3988 3988
3989 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3989 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3990 &_event_obj_signals[ATSPI_OBJECT_EVENT_SELECTION_CHANGED], "", 0, 0, "i", 0); 3990 &_event_obj_signals[ATSPI_OBJECT_EVENT_SELECTION_CHANGED], "", 0, 0, "i", 0);
3991 return EINA_TRUE; 3991 return EINA_TRUE;
3992} 3992}
@@ -4084,9 +4084,9 @@ _text_caret_moved_send(void *data, const Eo_Event *event)
4084 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED)) 4084 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED))
4085 return EINA_TRUE; 4085 return EINA_TRUE;
4086 4086
4087 cursor_pos = elm_interface_atspi_text_caret_offset_get(event->obj); 4087 cursor_pos = elm_interface_atspi_text_caret_offset_get(event->object);
4088 4088
4089 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4089 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
4090 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED], "", cursor_pos, 0, NULL, NULL); 4090 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED], "", cursor_pos, 0, NULL, NULL);
4091 4091
4092 return EINA_TRUE; 4092 return EINA_TRUE;
@@ -4102,7 +4102,7 @@ _text_text_inserted_send(void *data, const Eo_Event *event)
4102 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED)) 4102 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED))
4103 return EINA_TRUE; 4103 return EINA_TRUE;
4104 4104
4105 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4105 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
4106 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "insert", info->pos, info->len, "s", info->content); 4106 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "insert", info->pos, info->len, "s", info->content);
4107 4107
4108 return EINA_TRUE; 4108 return EINA_TRUE;
@@ -4118,7 +4118,7 @@ _text_text_removed_send(void *data, const Eo_Event *event)
4118 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED)) 4118 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED))
4119 return EINA_TRUE; 4119 return EINA_TRUE;
4120 4120
4121 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4121 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
4122 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "delete", info->pos, info->len, "s", info->content); 4122 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "delete", info->pos, info->len, "s", info->content);
4123 4123
4124 return EINA_TRUE; 4124 return EINA_TRUE;
@@ -4132,7 +4132,7 @@ _text_selection_changed_send(void *data, const Eo_Event *event)
4132 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED)) 4132 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED))
4133 return EINA_TRUE; 4133 return EINA_TRUE;
4134 4134
4135 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4135 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
4136 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED], "", 0, 0, NULL, NULL); 4136 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED], "", 0, 0, NULL, NULL);
4137 4137
4138 return EINA_TRUE; 4138 return EINA_TRUE;
@@ -4170,7 +4170,7 @@ _on_object_add(void *data, const Eo_Event *event)
4170 4170
4171 sig = eldbus_service_signal_new(pd->cache_interface, ATSPI_OBJECT_CHILD_ADDED); 4171 sig = eldbus_service_signal_new(pd->cache_interface, ATSPI_OBJECT_CHILD_ADDED);
4172 iter = eldbus_message_iter_get(sig); 4172 iter = eldbus_message_iter_get(sig);
4173 _cache_item_reference_append_cb(data, event->obj, iter); 4173 _cache_item_reference_append_cb(data, event->object, iter);
4174 4174
4175 eldbus_service_signal_send(pd->cache_interface, sig); 4175 eldbus_service_signal_send(pd->cache_interface, sig);
4176 4176
@@ -4184,11 +4184,11 @@ _on_object_del(void *data, const Eo_Event *event)
4184 4184
4185 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4185 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
4186 4186
4187 _bridge_object_unregister(data, event->obj); 4187 _bridge_object_unregister(data, event->object);
4188 4188
4189 sig = eldbus_service_signal_new(pd->cache_interface, ATSPI_OBJECT_CHILD_REMOVED); 4189 sig = eldbus_service_signal_new(pd->cache_interface, ATSPI_OBJECT_CHILD_REMOVED);
4190 Eldbus_Message_Iter *iter = eldbus_message_iter_get(sig); 4190 Eldbus_Message_Iter *iter = eldbus_message_iter_get(sig);
4191 _bridge_iter_object_reference_append(data, iter, event->obj); 4191 _bridge_iter_object_reference_append(data, iter, event->object);
4192 eldbus_service_signal_send(pd->cache_interface, sig); 4192 eldbus_service_signal_send(pd->cache_interface, sig);
4193 4193
4194 return EINA_TRUE; 4194 return EINA_TRUE;
@@ -4320,7 +4320,7 @@ _bridge_accessible_event_dispatch(void *data, const Eo_Event *event)
4320{ 4320{
4321 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4321 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
4322 4322
4323 _bridge_object_register(data, event->obj); 4323 _bridge_object_register(data, event->object);
4324 4324
4325 Eo_Event_Cb cb = eina_hash_find(pd->event_hash, &event->desc); 4325 Eo_Event_Cb cb = eina_hash_find(pd->event_hash, &event->desc);
4326 return cb ? cb(data, event) : EINA_TRUE; 4326 return cb ? cb(data, event) : EINA_TRUE;
diff --git a/src/lib/elementary/elm_cnp.c b/src/lib/elementary/elm_cnp.c
index 6f626ab..42fe7e8 100644
--- a/src/lib/elementary/elm_cnp.c
+++ b/src/lib/elementary/elm_cnp.c
@@ -1775,7 +1775,7 @@ static Eina_Bool
1775_x11_win_rotation_changed_cb(void *data, const Eo_Event *event) 1775_x11_win_rotation_changed_cb(void *data, const Eo_Event *event)
1776{ 1776{
1777 Evas_Object *win = data; 1777 Evas_Object *win = data;
1778 int rot = elm_win_rotation_get(event->obj); 1778 int rot = elm_win_rotation_get(event->object);
1779 elm_win_rotation_set(win, rot); 1779 elm_win_rotation_set(win, rot);
1780 return EINA_TRUE; 1780 return EINA_TRUE;
1781} 1781}
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index cb345e7..12e8cda 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -641,11 +641,11 @@ _spinner_changed_cb(void *data, const Eo_Event *event)
641 Evas_Object *parent; 641 Evas_Object *parent;
642 int i, v; 642 int i, v;
643 643
644 for (i = 0; i < 4 && sd->spinners[i] != event->obj; i++); 644 for (i = 0; i < 4 && sd->spinners[i] != event->object; i++);
645 645
646 parent = evas_object_data_get(event->obj, "parent"); 646 parent = evas_object_data_get(event->object, "parent");
647 v = elm_spinner_value_get(event->obj); 647 v = elm_spinner_value_get(event->object);
648 evas_object_data_set(event->obj, "_changed", event->obj); 648 evas_object_data_set(event->object, "_changed", event->object);
649 649
650 switch (i) 650 switch (i)
651 { 651 {
@@ -662,7 +662,7 @@ _spinner_changed_cb(void *data, const Eo_Event *event)
662 _colors_set(parent, sd->r, sd->g, sd->b, v); 662 _colors_set(parent, sd->r, sd->g, sd->b, v);
663 break; 663 break;
664 } 664 }
665 evas_object_data_del(event->obj, "_changed"); 665 evas_object_data_del(event->object, "_changed");
666 eo_event_callback_call(parent, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL); 666 eo_event_callback_call(parent, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
667 667
668 return EINA_TRUE; 668 return EINA_TRUE;
@@ -701,7 +701,7 @@ _start_grab_pick_cb(void *data, const Eo_Event *event)
701 701
702 ELM_COLORSELECTOR_DATA_GET(o, sd); 702 ELM_COLORSELECTOR_DATA_GET(o, sd);
703 703
704 elm_object_disabled_set(event->obj, EINA_TRUE); 704 elm_object_disabled_set(event->object, EINA_TRUE);
705 705
706 sd->grab.mouse_motion = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _mouse_grab_pixels, o); 706 sd->grab.mouse_motion = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _mouse_grab_pixels, o);
707 sd->grab.key_up = ecore_event_handler_add(ECORE_EVENT_KEY_UP, _key_up_cb, o); 707 sd->grab.key_up = ecore_event_handler_add(ECORE_EVENT_KEY_UP, _key_up_cb, o);
@@ -1018,7 +1018,7 @@ _button_clicked_cb(void *data, const Eo_Event *event)
1018 double x, y, step; 1018 double x, y, step;
1019 ELM_COLORSELECTOR_DATA_GET(cb_data->parent, sd); 1019 ELM_COLORSELECTOR_DATA_GET(cb_data->parent, sd);
1020 1020
1021 if (event->obj == cb_data->rbt) step = 1.0; 1021 if (event->object == cb_data->rbt) step = 1.0;
1022 else step = -1.0; 1022 else step = -1.0;
1023 1023
1024 edje_object_part_drag_value_get(cb_data->colorbar, "elm.arrow", &x, &y); 1024 edje_object_part_drag_value_get(cb_data->colorbar, "elm.arrow", &x, &y);
@@ -1062,7 +1062,7 @@ _button_repeat_cb(void *data, const Eo_Event *event EINA_UNUSED)
1062 Color_Bar_Data *cb_data = data; 1062 Color_Bar_Data *cb_data = data;
1063 double x, y, step; 1063 double x, y, step;
1064 1064
1065 if (event->obj == cb_data->rbt) step = 1.0 / BASE_STEP; 1065 if (event->object == cb_data->rbt) step = 1.0 / BASE_STEP;
1066 else step = -1.0 / BASE_STEP; 1066 else step = -1.0 / BASE_STEP;
1067 1067
1068 edje_object_part_drag_value_get(cb_data->colorbar, "elm.arrow", &x, &y); 1068 edje_object_part_drag_value_get(cb_data->colorbar, "elm.arrow", &x, &y);
@@ -2007,7 +2007,7 @@ _key_action_move(Evas_Object *obj, const char *params)
2007 else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS) 2007 else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS)
2008 { 2008 {
2009 Eo_Event event = {}; 2009 Eo_Event event = {};
2010 event.obj = sd->cb_data[sd->sel_color_type]->lbt; 2010 event.object = sd->cb_data[sd->sel_color_type]->lbt;
2011 _button_clicked_cb(sd->cb_data[sd->sel_color_type], &event); 2011 _button_clicked_cb(sd->cb_data[sd->sel_color_type], &event);
2012 } 2012 }
2013 else return EINA_FALSE; 2013 else return EINA_FALSE;
@@ -2021,7 +2021,7 @@ _key_action_move(Evas_Object *obj, const char *params)
2021 else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS) 2021 else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS)
2022 { 2022 {
2023 Eo_Event event = {}; 2023 Eo_Event event = {};
2024 event.obj = sd->cb_data[sd->sel_color_type]->rbt; 2024 event.object = sd->cb_data[sd->sel_color_type]->rbt;
2025 _button_clicked_cb(sd->cb_data[sd->sel_color_type], &event); 2025 _button_clicked_cb(sd->cb_data[sd->sel_color_type], &event);
2026 } 2026 }
2027 else return EINA_FALSE; 2027 else return EINA_FALSE;
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index d18ece8..95516a3 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -514,7 +514,7 @@ static Eina_Bool
514_on_indicator_mode_changed(void *data, const Eo_Event *event) 514_on_indicator_mode_changed(void *data, const Eo_Event *event)
515{ 515{
516 Evas_Object *conformant = data; 516 Evas_Object *conformant = data;
517 Evas_Object *win = event->obj; 517 Evas_Object *win = event->object;
518 518
519 Elm_Win_Indicator_Mode indmode; 519 Elm_Win_Indicator_Mode indmode;
520 Elm_Win_Indicator_Opacity_Mode ind_o_mode; 520 Elm_Win_Indicator_Opacity_Mode ind_o_mode;
@@ -534,7 +534,7 @@ static Eina_Bool
534_on_rotation_changed(void *data, const Eo_Event *event EINA_UNUSED) 534_on_rotation_changed(void *data, const Eo_Event *event EINA_UNUSED)
535{ 535{
536 int rot = 0; 536 int rot = 0;
537 Evas_Object *win = event->obj; 537 Evas_Object *win = event->object;
538 Evas_Object *conformant = data; 538 Evas_Object *conformant = data;
539 Evas_Object *old_indi = NULL; 539 Evas_Object *old_indi = NULL;
540 540
@@ -1004,7 +1004,7 @@ _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
1004 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 1004 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
1005 1005
1006 Eo_Event event = {}; 1006 Eo_Event event = {};
1007 event.obj = sd->win; 1007 event.object = sd->win;
1008 sd->win = elm_widget_top_get(obj); 1008 sd->win = elm_widget_top_get(obj);
1009 _on_indicator_mode_changed(obj, &event); 1009 _on_indicator_mode_changed(obj, &event);
1010 _on_rotation_changed(obj, &event); 1010 _on_rotation_changed(obj, &event);
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index d6b17b7..358d800 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3920,7 +3920,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
3920{ 3920{
3921 const Eo_Callback_Array_Item *event = ev->info; 3921 const Eo_Callback_Array_Item *event = ev->info;
3922 3922
3923 ELM_ENTRY_DATA_GET(ev->obj, sd); 3923 ELM_ENTRY_DATA_GET(ev->object, sd);
3924 if (event->desc == ELM_ENTRY_EVENT_VALIDATE) 3924 if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
3925 sd->validators++; 3925 sd->validators++;
3926 return EO_CALLBACK_CONTINUE; 3926 return EO_CALLBACK_CONTINUE;
@@ -3931,7 +3931,7 @@ _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
3931{ 3931{
3932 const Eo_Callback_Array_Item *event = ev->info; 3932 const Eo_Callback_Array_Item *event = ev->info;
3933 3933
3934 ELM_ENTRY_DATA_GET(ev->obj, sd); 3934 ELM_ENTRY_DATA_GET(ev->object, sd);
3935 if (event->desc == ELM_ENTRY_EVENT_VALIDATE) 3935 if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
3936 sd->validators--; 3936 sd->validators--;
3937 return EO_CALLBACK_CONTINUE; 3937 return EO_CALLBACK_CONTINUE;
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index 582fed5..a2cfb40 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -323,7 +323,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
323{ 323{
324 const Eo_Callback_Array_Item *event = ev->info; 324 const Eo_Callback_Array_Item *event = ev->info;
325 325
326 ELM_GLVIEW_DATA_GET(ev->obj, sd); 326 ELM_GLVIEW_DATA_GET(ev->object, sd);
327 327
328 if (event->desc == ELM_GLVIEW_EVENT_CREATED) 328 if (event->desc == ELM_GLVIEW_EVENT_CREATED)
329 { 329 {
@@ -331,7 +331,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
331 } 331 }
332 else if (event->desc == ELM_GLVIEW_EVENT_RENDER) 332 else if (event->desc == ELM_GLVIEW_EVENT_RENDER)
333 { 333 {
334 _set_render_policy_callback(ev->obj); 334 _set_render_policy_callback(ev->object);
335 } 335 }
336 336
337 return EO_CALLBACK_CONTINUE; 337 return EO_CALLBACK_CONTINUE;
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c
index bccb2d3..3e5133a 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.c
+++ b/src/lib/elementary/elm_interface_atspi_accessible.c
@@ -344,7 +344,7 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
344 } 344 }
345 345
346 Eo_Event ev; 346 Eo_Event ev;
347 ev.obj = accessible; 347 ev.object = accessible;
348 ev.desc = event; 348 ev.desc = event;
349 ev.info = event_info; 349 ev.info = event_info;
350 EINA_LIST_FOREACH(global_callbacks, l, hdl) 350 EINA_LIST_FOREACH(global_callbacks, l, hdl)
@@ -426,7 +426,7 @@ _on_rel_obj_del(void *data, const Eo_Event *event)
426 { 426 {
427 EINA_LIST_FOREACH_SAFE(rel->objects, p, p2, rel_obj) 427 EINA_LIST_FOREACH_SAFE(rel->objects, p, p2, rel_obj)
428 { 428 {
429 if (rel_obj == event->obj) 429 if (rel_obj == event->object)
430 rel->objects = eina_list_remove_list(rel->objects, p); 430 rel->objects = eina_list_remove_list(rel->objects, p);
431 } 431 }
432 if (!rel->objects) 432 if (!rel->objects)
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 49598de..86ffd92 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -426,7 +426,7 @@ _menu_hide(void *data,
426static Eina_Bool 426static Eina_Bool
427_hover_dismissed_cb(void *data, const Eo_Event *event) 427_hover_dismissed_cb(void *data, const Eo_Event *event)
428{ 428{
429 _menu_hide(data, event->obj, event->info); 429 _menu_hide(data, event->object, event->info);
430 eo_event_callback_call 430 eo_event_callback_call
431 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 431 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
432 eo_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL); 432 eo_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL);
diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c
index fda0298..876d2f4 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/elm_photocam.c
@@ -1953,7 +1953,7 @@ done:
1953 { 1953 {
1954 // FIXME: If one day we do support partial animator in photocam, this would require change 1954 // FIXME: If one day we do support partial animator in photocam, this would require change
1955 Eo_Event event = {}; 1955 Eo_Event event = {};
1956 event.obj = evas_object_evas_get(obj); 1956 event.object = evas_object_evas_get(obj);
1957 if (!_zoom_anim_cb(obj, &event)) 1957 if (!_zoom_anim_cb(obj, &event))
1958 { 1958 {
1959 _elm_photocam_bounce_reset(obj, sd); 1959 _elm_photocam_bounce_reset(obj, sd);
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index bf44223..ab187a1 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -853,7 +853,7 @@ _inc_dec_button_pressed_cb(void *data, const Eo_Event *event)
853{ 853{
854 ELM_SPINNER_DATA_GET(data, sd); 854 ELM_SPINNER_DATA_GET(data, sd);
855 855
856 sd->inc_clicked = sd->inc_button == event->obj ? EINA_TRUE : EINA_FALSE; 856 sd->inc_clicked = sd->inc_button == event->object ? EINA_TRUE : EINA_FALSE;
857 857
858 if (sd->longpress_timer) ecore_timer_del(sd->longpress_timer); 858 if (sd->longpress_timer) ecore_timer_del(sd->longpress_timer);
859 859
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index ce97e8e..e9fc81c 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -243,7 +243,7 @@ _parents_unfocus(Evas_Object *obj)
243static Eina_Bool 243static Eina_Bool
244_on_sub_obj_hide(void *data EINA_UNUSED, const Eo_Event *event) 244_on_sub_obj_hide(void *data EINA_UNUSED, const Eo_Event *event)
245{ 245{
246 elm_widget_focus_hide_handle(event->obj); 246 elm_widget_focus_hide_handle(event->object);
247 return EO_CALLBACK_CONTINUE; 247 return EO_CALLBACK_CONTINUE;
248} 248}
249 249
@@ -252,23 +252,23 @@ _on_sub_obj_del(void *data, const Eo_Event *event)
252{ 252{
253 ELM_WIDGET_DATA_GET(data, sd); 253 ELM_WIDGET_DATA_GET(data, sd);
254 254
255 if (_elm_widget_is(event->obj)) 255 if (_elm_widget_is(event->object))
256 { 256 {
257 if (_is_focused(event->obj)) _parents_unfocus(sd->obj); 257 if (_is_focused(event->object)) _parents_unfocus(sd->obj);
258 } 258 }
259 if (event->obj == sd->resize_obj) 259 if (event->object == sd->resize_obj)
260 { 260 {
261 /* already dels sub object */ 261 /* already dels sub object */
262 elm_widget_resize_object_set(sd->obj, NULL, EINA_TRUE); 262 elm_widget_resize_object_set(sd->obj, NULL, EINA_TRUE);
263 } 263 }
264 else if (event->obj == sd->hover_obj) 264 else if (event->object == sd->hover_obj)
265 { 265 {
266 sd->hover_obj = NULL; 266 sd->hover_obj = NULL;
267 } 267 }
268 else 268 else
269 { 269 {
270 if (!elm_widget_sub_object_del(sd->obj, event->obj)) 270 if (!elm_widget_sub_object_del(sd->obj, event->object))
271 ERR("failed to remove sub object %p from %p\n", event->obj, sd->obj); 271 ERR("failed to remove sub object %p from %p\n", event->object, sd->obj);
272 } 272 }
273 273
274 return EO_CALLBACK_CONTINUE; 274 return EO_CALLBACK_CONTINUE;
@@ -707,7 +707,7 @@ _propagate_y_drag_lock(Evas_Object *obj,
707static Eina_Bool 707static Eina_Bool
708_propagate_event(void *data EINA_UNUSED, const Eo_Event *event) 708_propagate_event(void *data EINA_UNUSED, const Eo_Event *event)
709{ 709{
710 Eo *obj = event->obj; 710 Eo *obj = event->object;
711 INTERNAL_ENTRY EO_CALLBACK_CONTINUE; 711 INTERNAL_ENTRY EO_CALLBACK_CONTINUE;
712 Evas_Callback_Type type; 712 Evas_Callback_Type type;
713 Evas_Event_Flags *event_flags = NULL; 713 Evas_Event_Flags *event_flags = NULL;
@@ -4377,7 +4377,7 @@ static Eina_Bool
4377_track_obj_view_update(void *data, const Eo_Event *event) 4377_track_obj_view_update(void *data, const Eo_Event *event)
4378{ 4378{
4379 Elm_Widget_Item_Data *item = data; 4379 Elm_Widget_Item_Data *item = data;
4380 _track_obj_update(item->track_obj, event->obj); 4380 _track_obj_update(item->track_obj, event->object);
4381 return EO_CALLBACK_CONTINUE; 4381 return EO_CALLBACK_CONTINUE;
4382} 4382}
4383 4383
@@ -4457,10 +4457,10 @@ _elm_widget_item_signal_callback_list_get(Elm_Widget_Item_Data *item, Eina_List
4457static Eina_Bool 4457static Eina_Bool
4458_eo_del_cb(void *data EINA_UNUSED, const Eo_Event *event) 4458_eo_del_cb(void *data EINA_UNUSED, const Eo_Event *event)
4459{ 4459{
4460 Elm_Widget_Item_Data *item = eo_data_scope_get(event->obj, ELM_WIDGET_ITEM_CLASS); 4460 Elm_Widget_Item_Data *item = eo_data_scope_get(event->object, ELM_WIDGET_ITEM_CLASS);
4461 ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, EINA_TRUE); 4461 ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, EINA_TRUE);
4462 if (item->del_func) 4462 if (item->del_func)
4463 item->del_func((void *) WIDGET_ITEM_DATA_GET(event->obj), item->widget, item->eo_obj); 4463 item->del_func((void *) WIDGET_ITEM_DATA_GET(event->object), item->widget, item->eo_obj);
4464 return EINA_TRUE; 4464 return EINA_TRUE;
4465} 4465}
4466 4466
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index c728186..1b0d905 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -10,7 +10,7 @@ struct Eo.Event.Description {
10 10
11struct Eo.Event { 11struct Eo.Event {
12 [[Parameter passed in event callbacks holding extra event parameters]] 12 [[Parameter passed in event callbacks holding extra event parameters]]
13 obj: Eo.Base *; [[The object the event was called on.]] 13 object: Eo.Base *; [[The object the event was called on.]]
14 desc: const(Eo.Event.Description) *; [[The event description.]] 14 desc: const(Eo.Event.Description) *; [[The event description.]]
15 info: void *; [[Extra event information passed by the event caller.]] 15 info: void *; [[Extra event information passed by the event caller.]]
16} 16}
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index fe60cc0..47dade6 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -1036,7 +1036,7 @@ _eo_base_event_callback_call(Eo *obj_id, Eo_Base_Data *pd,
1036 Eo_Current_Callback_Description saved; 1036 Eo_Current_Callback_Description saved;
1037 Eo_Event ev; 1037 Eo_Event ev;
1038 1038
1039 ev.obj = obj_id; 1039 ev.object = obj_id;
1040 ev.desc = desc; 1040 ev.desc = desc;
1041 ev.info = event_info; 1041 ev.info = event_info;
1042 1042
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index e334d1f..8764319 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -62,7 +62,7 @@ static Eina_Bool
62_eo_evas_object_cb(void *data, const Eo_Event *event) 62_eo_evas_object_cb(void *data, const Eo_Event *event)
63{ 63{
64 _eo_evas_object_cb_info *info = data; 64 _eo_evas_object_cb_info *info = data;
65 if (info->func) info->func(info->data, evas_object_evas_get(event->obj), event->obj, event->info); 65 if (info->func) info->func(info->data, evas_object_evas_get(event->object), event->object, event->info);
66 return EINA_TRUE; 66 return EINA_TRUE;
67} 67}
68 68
@@ -78,7 +78,7 @@ static Eina_Bool
78_eo_evas_cb(void *data, const Eo_Event *event) 78_eo_evas_cb(void *data, const Eo_Event *event)
79{ 79{
80 _eo_evas_cb_info *info = data; 80 _eo_evas_cb_info *info = data;
81 if (info->func) info->func(info->data, event->obj, event->info); 81 if (info->func) info->func(info->data, event->object, event->info);
82 return EINA_TRUE; 82 return EINA_TRUE;
83} 83}
84 84
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index aae5f4d..4374d0b 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -486,7 +486,7 @@ _clipper_del_cb(void *data, const Eo_Event *event)
486 if (!obj) return EO_CALLBACK_CONTINUE; 486 if (!obj) return EO_CALLBACK_CONTINUE;
487 487
488 _evas_object_clip_unset(eo_obj, obj); 488 _evas_object_clip_unset(eo_obj, obj);
489 if (obj->prev->clipper && (obj->prev->clipper->object == event->obj)) 489 if (obj->prev->clipper && (obj->prev->clipper->object == event->object))
490 { 490 {
491 // not removing cb since it's the del cb... it can't be called again! 491 // not removing cb since it's the del cb... it can't be called again!
492 EINA_COW_STATE_WRITE_BEGIN(obj, state_write, prev) 492 EINA_COW_STATE_WRITE_BEGIN(obj, state_write, prev)
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index 38216a7..10bd95f 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -125,7 +125,7 @@ _on_child_del(void *data, const Eo_Event *event)
125 Evas_Object *box = data; 125 Evas_Object *box = data;
126 126
127 Evas_Object *ret = NULL; 127 Evas_Object *ret = NULL;
128 ret = evas_obj_box_internal_remove(box, event->obj); 128 ret = evas_obj_box_internal_remove(box, event->object);
129 if (!ret) 129 if (!ret)
130 ERR("child removal failed"); 130 ERR("child removal failed");
131 evas_object_smart_changed(box); 131 evas_object_smart_changed(box);
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index d8e9574..bc446f7 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -64,7 +64,7 @@ static Eina_Bool
64_eo_evas_smart_cb(void *data, const Eo_Event *event) 64_eo_evas_smart_cb(void *data, const Eo_Event *event)
65{ 65{
66 _eo_evas_smart_cb_info *info = data; 66 _eo_evas_smart_cb_info *info = data;
67 if (info->func) info->func(info->data, event->obj, event->info); 67 if (info->func) info->func(info->data, event->object, event->info);
68 return EINA_TRUE; 68 return EINA_TRUE;
69} 69}
70 70
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 6966e22..8f78f57 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -247,7 +247,7 @@ static Eina_Bool
247_on_child_del(void *data, const Eo_Event *event) 247_on_child_del(void *data, const Eo_Event *event)
248{ 248{
249 Evas_Object *table = data; 249 Evas_Object *table = data;
250 evas_object_table_unpack(table, event->obj); 250 evas_object_table_unpack(table, event->object);
251 251
252 return EO_CALLBACK_CONTINUE; 252 return EO_CALLBACK_CONTINUE;
253} 253}
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 82bf141..51ef647 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -7402,7 +7402,7 @@ _obstacle_del_cb(void *data, const Eo_Event *event)
7402 7402
7403 EINA_LIST_FOREACH(obj->obstacles, i, obs) 7403 EINA_LIST_FOREACH(obj->obstacles, i, obs)
7404 { 7404 {
7405 if (event->obj == obs->eo_obs) 7405 if (event->object == obs->eo_obs)
7406 break; 7406 break;
7407 } 7407 }
7408 obj->obstacles = eina_list_remove_list(obj->obstacles, i); 7408 obj->obstacles = eina_list_remove_list(obj->obstacles, i);
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index 5b843b0..edc5f51 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -26,7 +26,7 @@ _efl_vg_property_changed(void *data, const Eo_Event *event)
26 if (pd->changed) return EINA_TRUE; 26 if (pd->changed) return EINA_TRUE;
27 pd->changed = EINA_TRUE; 27 pd->changed = EINA_TRUE;
28 28
29 parent = eo_parent_get(event->obj); 29 parent = eo_parent_get(event->object);
30 eo_event_callback_call(parent, event->desc, event->info); 30 eo_event_callback_call(parent, event->desc, event->info);
31 return EINA_TRUE; 31 return EINA_TRUE;
32} 32}
diff --git a/src/lib/evas/canvas/evas_vg_root_node.c b/src/lib/evas/canvas/evas_vg_root_node.c
index 9dc38d8..4e163b7 100644
--- a/src/lib/evas/canvas/evas_vg_root_node.c
+++ b/src/lib/evas/canvas/evas_vg_root_node.c
@@ -36,7 +36,7 @@ static Eina_Bool
36_evas_vg_root_node_changed(void *data, const Eo_Event *event) 36_evas_vg_root_node_changed(void *data, const Eo_Event *event)
37{ 37{
38 Efl_VG_Root_Node_Data *pd = data; 38 Efl_VG_Root_Node_Data *pd = data;
39 Efl_VG_Data *bd = eo_data_scope_get(event->obj, EFL_VG_CLASS); 39 Efl_VG_Data *bd = eo_data_scope_get(event->object, EFL_VG_CLASS);
40 40
41 if (bd->changed) return EINA_TRUE; 41 if (bd->changed) return EINA_TRUE;
42 bd->changed = EINA_TRUE; 42 bd->changed = EINA_TRUE;
diff --git a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index b8fef85..caff642 100644
--- a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -38,7 +38,7 @@ _ctxpopup_dismissed_cb(void *data, const Eo_Event *event)
38{ 38{
39 Ctxpopup_Module_Data *ctx_mod; 39 Ctxpopup_Module_Data *ctx_mod;
40 ctx_mod = (Ctxpopup_Module_Data *)data; 40 ctx_mod = (Ctxpopup_Module_Data *)data;
41 evas_object_del(event->obj); 41 evas_object_del(event->object);
42 ctx_mod->ctxpopup = NULL; 42 ctx_mod->ctxpopup = NULL;
43 43
44 return EINA_TRUE; 44 return EINA_TRUE;
@@ -143,11 +143,11 @@ _field_clicked_cb(void *data, const Eo_Event *event)
143 ctx_mod = (Ctxpopup_Module_Data *)data; 143 ctx_mod = (Ctxpopup_Module_Data *)data;
144 if (!ctx_mod) return EINA_FALSE; 144 if (!ctx_mod) return EINA_FALSE;
145 145
146 snprintf(buf, sizeof(buf), "datetime/%s", elm_object_style_get(event->obj)); 146 snprintf(buf, sizeof(buf), "datetime/%s", elm_object_style_get(event->object));
147 147
148 if (ctx_mod->ctxpopup) 148 if (ctx_mod->ctxpopup)
149 evas_object_del(ctx_mod->ctxpopup); 149 evas_object_del(ctx_mod->ctxpopup);
150 ctx_mod->ctxpopup = elm_ctxpopup_add(event->obj); 150 ctx_mod->ctxpopup = elm_ctxpopup_add(event->object);
151 elm_object_style_set(ctx_mod->ctxpopup, buf); 151 elm_object_style_set(ctx_mod->ctxpopup, buf);
152 elm_ctxpopup_horizontal_set(ctx_mod->ctxpopup, EINA_TRUE); 152 elm_ctxpopup_horizontal_set(ctx_mod->ctxpopup, EINA_TRUE);
153 evas_object_size_hint_weight_set(ctx_mod->ctxpopup, EVAS_HINT_EXPAND, 153 evas_object_size_hint_weight_set(ctx_mod->ctxpopup, EVAS_HINT_EXPAND,
@@ -155,7 +155,7 @@ _field_clicked_cb(void *data, const Eo_Event *event)
155 evas_object_size_hint_align_set(ctx_mod->ctxpopup, EVAS_HINT_FILL, 0.5); 155 evas_object_size_hint_align_set(ctx_mod->ctxpopup, EVAS_HINT_FILL, 0.5);
156 eo_event_callback_add 156 eo_event_callback_add
157 (ctx_mod->ctxpopup, ELM_CTXPOPUP_EVENT_DISMISSED, _ctxpopup_dismissed_cb, ctx_mod); 157 (ctx_mod->ctxpopup, ELM_CTXPOPUP_EVENT_DISMISSED, _ctxpopup_dismissed_cb, ctx_mod);
158 elm_ctxpopup_hover_parent_set(ctx_mod->ctxpopup, elm_widget_top_get(event->obj)); 158 elm_ctxpopup_hover_parent_set(ctx_mod->ctxpopup, elm_widget_top_get(event->object));
159 159
160 diskselector = elm_diskselector_add(elm_widget_top_get(ctx_mod->mod_data.base)); 160 diskselector = elm_diskselector_add(elm_widget_top_get(ctx_mod->mod_data.base));
161 eo_event_callback_add 161 eo_event_callback_add
@@ -166,7 +166,7 @@ _field_clicked_cb(void *data, const Eo_Event *event)
166 t = time(NULL); 166 t = time(NULL);
167 localtime_r(&t, &time1); 167 localtime_r(&t, &time1);
168 168
169 field_type = (Elm_Datetime_Field_Type )evas_object_data_get(event->obj, "_field_type"); 169 field_type = (Elm_Datetime_Field_Type )evas_object_data_get(event->object, "_field_type");
170 fmt = ctx_mod->mod_data.field_format_get(ctx_mod->mod_data.base, field_type); 170 fmt = ctx_mod->mod_data.field_format_get(ctx_mod->mod_data.base, field_type);
171 elm_datetime_value_get(ctx_mod->mod_data.base, &time1); 171 elm_datetime_value_get(ctx_mod->mod_data.base, &time1);
172 val = _field_value_get(&time1, field_type); 172 val = _field_value_get(&time1, field_type);
@@ -203,7 +203,7 @@ _field_clicked_cb(void *data, const Eo_Event *event)
203 } 203 }
204 elm_diskselector_side_text_max_length_set(diskselector, text_len); 204 elm_diskselector_side_text_max_length_set(diskselector, text_len);
205 205
206 evas_object_geometry_get(event->obj, &x, &y, &w, &h); 206 evas_object_geometry_get(event->object, &x, &y, &w, &h);
207 evas_object_geometry_get(elm_widget_top_get(ctx_mod->mod_data.base), NULL, NULL, &width, NULL); 207 evas_object_geometry_get(elm_widget_top_get(ctx_mod->mod_data.base), NULL, NULL, &width, NULL);
208 evas_object_size_hint_min_set(ctx_mod->ctxpopup, width, -1); 208 evas_object_size_hint_min_set(ctx_mod->ctxpopup, width, -1);
209 display_item_num = width / (w + elm_config_finger_size_get()); 209 display_item_num = width / (w + elm_config_finger_size_get());
diff --git a/src/modules/elementary/prefs/elm_button.c b/src/modules/elementary/prefs/elm_button.c
index 4cccfb1..8922c57 100644
--- a/src/modules/elementary/prefs/elm_button.c
+++ b/src/modules/elementary/prefs/elm_button.c
@@ -13,7 +13,7 @@ _item_changed_cb(void *data, const Eo_Event *event)
13{ 13{
14 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; 14 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
15 15
16 prefs_it_changed_cb(event->obj); 16 prefs_it_changed_cb(event->object);
17 return EINA_TRUE; 17 return EINA_TRUE;
18} 18}
19 19
diff --git a/src/modules/elementary/prefs/elm_check.c b/src/modules/elementary/prefs/elm_check.c
index 37c4291..7d1b2cb 100644
--- a/src/modules/elementary/prefs/elm_check.c
+++ b/src/modules/elementary/prefs/elm_check.c
@@ -11,7 +11,7 @@ _item_changed_cb(void *data, const Eo_Event *event)
11{ 11{
12 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; 12 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
13 13
14 prefs_it_changed_cb(event->obj); 14 prefs_it_changed_cb(event->object);
15 return EINA_TRUE; 15 return EINA_TRUE;
16} 16}
17 17
diff --git a/src/modules/elementary/prefs/elm_datetime.c b/src/modules/elementary/prefs/elm_datetime.c
index 86b4729..6b0f532 100644
--- a/src/modules/elementary/prefs/elm_datetime.c
+++ b/src/modules/elementary/prefs/elm_datetime.c
@@ -11,7 +11,7 @@ _item_changed_cb(void *data, const Eo_Event *event)
11{ 11{
12 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; 12 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
13 13
14 prefs_it_changed_cb(event->obj); 14 prefs_it_changed_cb(event->object);
15 return EINA_TRUE; 15 return EINA_TRUE;
16} 16}
17 17
diff --git a/src/modules/elementary/prefs/elm_entry.c b/src/modules/elementary/prefs/elm_entry.c
index 9bd0dcc..b956609 100644
--- a/src/modules/elementary/prefs/elm_entry.c
+++ b/src/modules/elementary/prefs/elm_entry.c
@@ -100,7 +100,7 @@ _item_changed_cb(void *data, const Eo_Event *event)
100{ 100{
101 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; 101 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
102 102
103 prefs_it_changed_cb(event->obj); 103 prefs_it_changed_cb(event->object);
104 return EINA_TRUE; 104 return EINA_TRUE;
105} 105}
106 106
diff --git a/src/modules/elementary/prefs/elm_slider.c b/src/modules/elementary/prefs/elm_slider.c
index e03a1e1..635eb24 100644
--- a/src/modules/elementary/prefs/elm_slider.c
+++ b/src/modules/elementary/prefs/elm_slider.c
@@ -12,7 +12,7 @@ _item_changed_cb(void *data, const Eo_Event *event)
12{ 12{
13 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; 13 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
14 14
15 prefs_it_changed_cb(event->obj); 15 prefs_it_changed_cb(event->object);
16 return EINA_TRUE; 16 return EINA_TRUE;
17} 17}
18 18
diff --git a/src/modules/elementary/prefs/elm_spinner.c b/src/modules/elementary/prefs/elm_spinner.c
index 51903fe..063b998 100644
--- a/src/modules/elementary/prefs/elm_spinner.c
+++ b/src/modules/elementary/prefs/elm_spinner.c
@@ -12,7 +12,7 @@ _item_changed_cb(void *data, const Eo_Event *event)
12{ 12{
13 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; 13 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
14 14
15 prefs_it_changed_cb(event->obj); 15 prefs_it_changed_cb(event->object);
16 return EINA_TRUE; 16 return EINA_TRUE;
17} 17}
18 18
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 96b2232..927ba95 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_preload.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c
@@ -304,7 +304,7 @@ _evas_gl_preload_target_die(void *data, const Eo_Event *event)
304{ 304{
305 Evas_GL_Texture *tex = data; 305 Evas_GL_Texture *tex = data;
306 306
307 evas_gl_preload_target_unregister(tex, event->obj); 307 evas_gl_preload_target_unregister(tex, event->object);
308 308
309 return EO_CALLBACK_CONTINUE; 309 return EO_CALLBACK_CONTINUE;
310} 310}
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 9112b89..2174f9a 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -34,7 +34,7 @@ static Eina_Bool _finished_cb(void *data EINA_UNUSED, const Eo_Event *event EINA
34 34
35static Eina_Bool _looped_cb(void *data EINA_UNUSED, const Eo_Event *event) 35static Eina_Bool _looped_cb(void *data EINA_UNUSED, const Eo_Event *event)
36{ 36{
37 ecore_audio_obj_in_looped_set(event->obj, EINA_FALSE); 37 ecore_audio_obj_in_looped_set(event->object, EINA_FALSE);
38 38
39 return EINA_TRUE; 39 return EINA_TRUE;
40} 40}
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index 09c0f13..5ddec2b 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -56,7 +56,7 @@ _children_added_cb(void *data EINA_UNUSED, const Eo_Event* event)
56 if(temp_filename && strcmp(temp_filename, filename) == 0) 56 if(temp_filename && strcmp(temp_filename, filename) == 0)
57 { 57 {
58 children_deleted = EINA_TRUE; 58 children_deleted = EINA_TRUE;
59 efl_model_child_del(event->obj, evt->child); 59 efl_model_child_del(event->object, evt->child);
60 } 60 }
61 free(filename); 61 free(filename);
62 62
diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c
index c56ee46..aeab090 100644
--- a/src/tests/elementary/elm_test_genlist.c
+++ b/src/tests/elementary/elm_test_genlist.c
@@ -87,7 +87,7 @@ _children_changed_cb(void *data EINA_UNUSED, const Eo_Event *event)
87 return EINA_TRUE; 87 return EINA_TRUE;
88 88
89 ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->info; 89 ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->info;
90 current = event->obj; 90 current = event->object;
91 counter++; 91 counter++;
92 92
93 return EINA_TRUE; 93 return EINA_TRUE;
diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c
index ef631c7..755f5be 100644
--- a/src/tests/elementary/elm_test_image.c
+++ b/src/tests/elementary/elm_test_image.c
@@ -40,7 +40,7 @@ _async_error_cb(void *data, const Eo_Event *event)
40 Test_Data *td = data; 40 Test_Data *td = data;
41 char path[PATH_MAX]; 41 char path[PATH_MAX];
42 sprintf(path, pathfmt, td->image_id); 42 sprintf(path, pathfmt, td->image_id);
43 efl_file_set(event->obj, path, NULL); 43 efl_file_set(event->object, path, NULL);
44 return EO_CALLBACK_CONTINUE; 44 return EO_CALLBACK_CONTINUE;
45} 45}
46 46
@@ -52,7 +52,7 @@ _async_opened_cb(void *data, const Eo_Event *event)
52 char path[PATH_MAX]; 52 char path[PATH_MAX];
53 53
54 sprintf(path, pathfmt, td->image_id); 54 sprintf(path, pathfmt, td->image_id);
55 efl_file_get(event->obj, &ff, &kk); 55 efl_file_get(event->object, &ff, &kk);
56 r1 = strrchr(ff, '/'); 56 r1 = strrchr(ff, '/');
57 r2 = strrchr(path, '/'); 57 r2 = strrchr(path, '/');
58 ck_assert(!strcmp(r1, r2)); 58 ck_assert(!strcmp(r1, r2));
@@ -62,7 +62,7 @@ _async_opened_cb(void *data, const Eo_Event *event)
62 { 62 {
63 td->image_id++; 63 td->image_id++;
64 sprintf(path, pathfmt, td->image_id); 64 sprintf(path, pathfmt, td->image_id);
65 efl_file_set(event->obj, path, NULL); 65 efl_file_set(event->object, path, NULL);
66 return EO_CALLBACK_CONTINUE; 66 return EO_CALLBACK_CONTINUE;
67 } 67 }
68 else if (td->image_id < MAX_IMAGE_ID) 68 else if (td->image_id < MAX_IMAGE_ID)
@@ -71,7 +71,7 @@ _async_opened_cb(void *data, const Eo_Event *event)
71 for (; td->image_id < MAX_IMAGE_ID;) 71 for (; td->image_id < MAX_IMAGE_ID;)
72 { 72 {
73 sprintf(path, pathfmt, ++td->image_id); 73 sprintf(path, pathfmt, ++td->image_id);
74 efl_file_set(event->obj, path, NULL); 74 efl_file_set(event->object, path, NULL);
75 } 75 }
76 return EO_CALLBACK_CONTINUE; 76 return EO_CALLBACK_CONTINUE;
77 } 77 }
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index e372e2c..8393742 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -326,7 +326,7 @@ video_obj_time_changed(Evas_Object *obj, Evas_Object *edje)
326static Eina_Bool 326static Eina_Bool
327video_obj_frame_decode_cb(void *data, const Eo_Event *event) 327video_obj_frame_decode_cb(void *data, const Eo_Event *event)
328{ 328{
329 video_obj_time_changed(event->obj, data); 329 video_obj_time_changed(event->object, data);
330 330
331 if (0) 331 if (0)
332 { 332 {
@@ -348,16 +348,16 @@ video_obj_frame_resize_cb(void *data, const Eo_Event *event)
348 double ratio; 348 double ratio;
349 349
350 oe = data; 350 oe = data;
351 emotion_object_size_get(event->obj, &iw, &ih); 351 emotion_object_size_get(event->object, &iw, &ih);
352 ratio = emotion_object_ratio_get(event->obj); 352 ratio = emotion_object_ratio_get(event->object);
353 printf("HANDLE %ix%i @ %3.3f\n", iw, ih, ratio); 353 printf("HANDLE %ix%i @ %3.3f\n", iw, ih, ratio);
354 if (ratio > 0.0) iw = (ih * ratio) + 0.5; 354 if (ratio > 0.0) iw = (ih * ratio) + 0.5;
355 evas_object_size_hint_min_set(event->obj, iw, ih); 355 evas_object_size_hint_min_set(event->object, iw, ih);
356 edje_object_part_swallow(oe, "video_swallow", event->obj); 356 edje_object_part_swallow(oe, "video_swallow", event->object);
357 edje_obj_size_min_calc(oe, &w, &h); 357 edje_obj_size_min_calc(oe, &w, &h);
358 efl_gfx_size_set(oe, w, h); 358 efl_gfx_size_set(oe, w, h);
359 evas_object_size_hint_min_set(event->obj, 0, 0); 359 evas_object_size_hint_min_set(event->object, 0, 0);
360 edje_object_part_swallow(oe, "video_swallow", event->obj); 360 edje_object_part_swallow(oe, "video_swallow", event->object);
361 361
362 return EINA_TRUE; 362 return EINA_TRUE;
363} 363}
@@ -366,7 +366,7 @@ static Eina_Bool
366video_obj_length_change_cb(void *data, const Eo_Event *event) 366video_obj_length_change_cb(void *data, const Eo_Event *event)
367{ 367{
368 printf("len change!\n"); 368 printf("len change!\n");
369 video_obj_time_changed(event->obj, data); 369 video_obj_time_changed(event->object, data);
370 370
371 return EINA_TRUE; 371 return EINA_TRUE;
372} 372}
@@ -375,7 +375,7 @@ static Eina_Bool
375video_obj_position_update_cb(void *data, const Eo_Event *event) 375video_obj_position_update_cb(void *data, const Eo_Event *event)
376{ 376{
377 printf("pos up!\n"); 377 printf("pos up!\n");
378 video_obj_time_changed(event->obj, data); 378 video_obj_time_changed(event->object, data);
379 379
380 return EINA_TRUE; 380 return EINA_TRUE;
381} 381}
@@ -386,8 +386,8 @@ video_obj_stopped_cb(void *data EINA_UNUSED, const Eo_Event *event)
386 printf("video stopped!!!\n"); 386 printf("video stopped!!!\n");
387 if (loop) 387 if (loop)
388 { 388 {
389 emotion_object_position_set(event->obj, 0.0); 389 emotion_object_position_set(event->object, 0.0);
390 emotion_object_play_set(event->obj, EINA_TRUE); 390 emotion_object_play_set(event->object, EINA_TRUE);
391 } 391 }
392 392
393 return EINA_TRUE; 393 return EINA_TRUE;
@@ -397,9 +397,9 @@ static Eina_Bool
397video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event) 397video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event)
398{ 398{
399 printf("channels changed: [AUD %i][VID %i][SPU %i]\n", 399 printf("channels changed: [AUD %i][VID %i][SPU %i]\n",
400 emotion_object_audio_channel_count(event->obj), 400 emotion_object_audio_channel_count(event->object),
401 emotion_object_video_channel_count(event->obj), 401 emotion_object_video_channel_count(event->object),
402 emotion_object_spu_channel_count(event->obj)); 402 emotion_object_spu_channel_count(event->object));
403 403
404 return EINA_TRUE; 404 return EINA_TRUE;
405} 405}
@@ -407,7 +407,7 @@ video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event)
407static Eina_Bool 407static Eina_Bool
408 video_obj_title_cb(void *data EINA_UNUSED, const Eo_Event *event) 408 video_obj_title_cb(void *data EINA_UNUSED, const Eo_Event *event)
409{ 409{
410 printf("video title to: \"%s\"\n", emotion_object_title_get(event->obj)); 410 printf("video title to: \"%s\"\n", emotion_object_title_get(event->object));
411 411
412 return EINA_TRUE; 412 return EINA_TRUE;
413} 413}
@@ -416,8 +416,8 @@ static Eina_Bool
416video_obj_progress_cb(void *data EINA_UNUSED, const Eo_Event *event) 416video_obj_progress_cb(void *data EINA_UNUSED, const Eo_Event *event)
417{ 417{
418 printf("progress: \"%s\" %3.3f\n", 418 printf("progress: \"%s\" %3.3f\n",
419 emotion_object_progress_info_get(event->obj), 419 emotion_object_progress_info_get(event->object),
420 emotion_object_progress_status_get(event->obj)); 420 emotion_object_progress_status_get(event->object));
421 421
422 return EINA_TRUE; 422 return EINA_TRUE;
423} 423}
@@ -426,8 +426,8 @@ static Eina_Bool
426video_obj_ref_cb(void *data EINA_UNUSED, const Eo_Event *event) 426video_obj_ref_cb(void *data EINA_UNUSED, const Eo_Event *event)
427{ 427{
428 printf("video ref to: \"%s\" %i\n", 428 printf("video ref to: \"%s\" %i\n",
429 emotion_object_ref_file_get(event->obj), 429 emotion_object_ref_file_get(event->object),
430 emotion_object_ref_num_get(event->obj)); 430 emotion_object_ref_num_get(event->object));
431 431
432 return EINA_TRUE; 432 return EINA_TRUE;
433} 433}
@@ -436,7 +436,7 @@ static Eina_Bool
436video_obj_button_num_cb(void *data EINA_UNUSED, const Eo_Event *event) 436video_obj_button_num_cb(void *data EINA_UNUSED, const Eo_Event *event)
437{ 437{
438 printf("video spu buttons to: %i\n", 438 printf("video spu buttons to: %i\n",
439 emotion_object_spu_button_count_get(event->obj)); 439 emotion_object_spu_button_count_get(event->object));
440 440
441 return EINA_TRUE; 441 return EINA_TRUE;
442} 442}
@@ -445,7 +445,7 @@ static Eina_Bool
445video_obj_button_cb(void *data EINA_UNUSED, const Eo_Event *event) 445video_obj_button_cb(void *data EINA_UNUSED, const Eo_Event *event)
446{ 446{
447 printf("video selected spu button: %i\n", 447 printf("video selected spu button: %i\n",
448 emotion_object_spu_button_get(event->obj)); 448 emotion_object_spu_button_get(event->object));
449 449
450 return EINA_TRUE; 450 return EINA_TRUE;
451} 451}
diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index 496e107..5c33bc5 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -23,8 +23,8 @@ _a_changed_cb(void *data, const Eo_Event *event)
23 23
24 cb_count++; 24 cb_count++;
25 25
26 eo_event_callback_priority_add(event->obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423); 26 eo_event_callback_priority_add(event->object, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423);
27 eo_event_callback_del(event->obj, EV_A_CHANGED, _null_cb, (void *) 23423); 27 eo_event_callback_del(event->object, EV_A_CHANGED, _null_cb, (void *) 23423);
28 28
29 /* Stop as we reached the 3rd one. */ 29 /* Stop as we reached the 3rd one. */
30 return (cb_count != 3); 30 return (cb_count != 3);
@@ -49,7 +49,7 @@ _restart_2_cb(void *data, const Eo_Event *event)
49 fail_if(inside); 49 fail_if(inside);
50 50
51 inside = EINA_TRUE; 51 inside = EINA_TRUE;
52 eo_event_callback_call(event->obj, event->desc, data); 52 eo_event_callback_call(event->object, event->desc, data);
53 inside = EINA_FALSE; 53 inside = EINA_FALSE;
54 54
55 called++; 55 called++;
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 01eec45..f7cad68 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -31,7 +31,7 @@ _a_set(Eo *obj, void *class_data, int a)
31Eina_Bool 31Eina_Bool
32_cb_added(void *data EINA_UNUSED, const Eo_Event *event) 32_cb_added(void *data EINA_UNUSED, const Eo_Event *event)
33{ 33{
34 Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS); 34 Simple_Public_Data *pd = eo_data_scope_get(event->object, MY_CLASS);
35 const Eo_Callback_Array_Item *callback_array = event->info; 35 const Eo_Callback_Array_Item *callback_array = event->info;
36 36
37 if (callback_array->desc != EV_A_CHANGED) 37 if (callback_array->desc != EV_A_CHANGED)
@@ -39,14 +39,14 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *event)
39 39
40 pd->cb_count++; 40 pd->cb_count++;
41 41
42 printf("Added EV_A_CHANGED callback to %p. Count: %d\n", event->obj, pd->cb_count); 42 printf("Added EV_A_CHANGED callback to %p. Count: %d\n", event->object, pd->cb_count);
43 return EO_CALLBACK_CONTINUE; 43 return EO_CALLBACK_CONTINUE;
44} 44}
45 45
46Eina_Bool 46Eina_Bool
47_cb_deled(void *data EINA_UNUSED, const Eo_Event *event) 47_cb_deled(void *data EINA_UNUSED, const Eo_Event *event)
48{ 48{
49 Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS); 49 Simple_Public_Data *pd = eo_data_scope_get(event->object, MY_CLASS);
50 const Eo_Callback_Array_Item *callback_array = event->info; 50 const Eo_Callback_Array_Item *callback_array = event->info;
51 51
52 if (callback_array->desc != EV_A_CHANGED) 52 if (callback_array->desc != EV_A_CHANGED)
@@ -54,7 +54,7 @@ _cb_deled(void *data EINA_UNUSED, const Eo_Event *event)
54 54
55 pd->cb_count--; 55 pd->cb_count--;
56 56
57 printf("Removed EV_A_CHANGED callback from %p. Count: %d\n", event->obj, pd->cb_count); 57 printf("Removed EV_A_CHANGED callback from %p. Count: %d\n", event->object, pd->cb_count);
58 return EO_CALLBACK_CONTINUE; 58 return EO_CALLBACK_CONTINUE;
59} 59}
60 60
diff --git a/src/tests/eolian_cxx/callback.c b/src/tests/eolian_cxx/callback.c
index 28e20ce..aee3237 100644
--- a/src/tests/eolian_cxx/callback.c
+++ b/src/tests/eolian_cxx/callback.c
@@ -21,7 +21,7 @@ static Eina_Bool _callback_callback_added(void* data EINA_UNUSED, Eo_Event const
21{ 21{
22 Callback_Data* pd = event->info; 22 Callback_Data* pd = event->info;
23 ++pd->callbacks; 23 ++pd->callbacks;
24 eo_event_callback_call(event->obj, CALLBACK_EVENT_CALL_ON_ADD, &pd->callbacks); 24 eo_event_callback_call(event->object, CALLBACK_EVENT_CALL_ON_ADD, &pd->callbacks);
25 return EINA_TRUE; 25 return EINA_TRUE;
26} 26}
27 27