summaryrefslogtreecommitdiff
path: root/src/lib/elementary
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 /src/lib/elementary
parent72adab722226b664ce0b63be46650874cd8b0ef9 (diff)
eo: for consistency use object like all our API.
Diffstat (limited to 'src/lib/elementary')
-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
17 files changed, 63 insertions, 63 deletions
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 3c3c2a6a2b..ce25f17fb1 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 c347b1e1ae..d955fdc909 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 a2d49ae1b5..00ecfb1fcc 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 d0f6e86f41..df041f321a 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 2504f04998..c5865dc228 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 1f481cb1e9..52284aa5ff 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 a99b53e8f8..b42a109ac1 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 6f626ab16e..42fe7e8841 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 cb345e7794..12e8cda550 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 d18ece899b..95516a3f7b 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 d6b17b7c26..358d8006fa 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 582fed50b4..a2cfb4039d 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 bccb2d38ed..3e5133a2a2 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 49598dedb4..86ffd926c0 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 fda0298666..876d2f4b24 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 bf44223a8e..ab187a1f9c 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 ce97e8ecff..e9fc81cf98 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