kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm: Replace EO_EV_ by EO_BASE_EVENT_ 

EO_EV_ stuff is deprecated
This commit is contained in:
Jean-Philippe Andre 2016-01-21 14:45:05 +09:00
parent 43f646f642
commit 48b561b8e0
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/elementary/src/bin/test_application_server.c
View File

@ -116,7 +116,7 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED,
eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx),
eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx),
eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx),
eo_event_callback_add(EO_EV_DEL, _view_del_cb, ctx));
eo_event_callback_add(EO_BASE_EVENT_DEL, _view_del_cb, ctx));
return view;
}
@ -163,7 +163,7 @@ test_application_server_common(const char *pkg)
eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx),
eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx),
eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx),
eo_event_callback_add(EO_EV_DEL, _view_del_cb, ctx));
eo_event_callback_add(EO_BASE_EVENT_DEL, _view_del_cb, ctx));
}
eina_iterator_free(views_iter);
@ -190,7 +190,7 @@ test_application_server_phone(void *data EINA_UNUSED,
}
printf("Starting phone\n");
phone_server = test_application_server_common("org.enlightenment.phone");
eo_do(phone_server, eo_event_callback_add(EO_EV_DEL, _server_del_cb, &phone_server));
eo_do(phone_server, eo_event_callback_add(EO_BASE_EVENT_DEL, _server_del_cb, &phone_server));
}
void
@ -205,5 +205,5 @@ test_application_server_message(void *data EINA_UNUSED,
}
printf("Starting message\n");
msg_server = test_application_server_common( "org.enlightenment.message");
eo_do(msg_server, eo_event_callback_add(EO_EV_DEL, _server_del_cb, &msg_server));
eo_do(msg_server, eo_event_callback_add(EO_BASE_EVENT_DEL, _server_del_cb, &msg_server));
}

6
legacy/elementary/src/lib/elm_app_server.c
View File

@ -51,7 +51,7 @@ _view_append(Elm_App_Server_Data *data, Elm_App_Server_View *view)
}
eina_hash_add(data->views, view_id, view);
eo_do(view, eo_event_callback_add(EO_EV_DEL, _view_del_cb, data));
eo_do(view, eo_event_callback_add(EO_BASE_EVENT_DEL, _view_del_cb, data));
return EINA_TRUE;
}
@ -264,7 +264,7 @@ _elm_app_server_constructor(Eo *obj, Elm_App_Server_Data *data, const char *pkg,
elm_app_server_view_icon_set(icon_name),
elm_app_server_view_progress_set(progress),
elm_app_server_view_new_events_set(new_events),
eo_event_callback_add(EO_EV_DEL, _view_del_cb, data),
eo_event_callback_add(EO_BASE_EVENT_DEL, _view_del_cb, data),
elm_app_server_view_shallow());
eina_hash_add(data->views, view_id, view);
@ -434,7 +434,7 @@ _elm_app_server_eo_base_destructor(Eo *obj, Elm_App_Server_Data *data)
EINA_ITERATOR_FOREACH(iter, view)
{
//do not modify hash when iterating
eo_do(view, eo_event_callback_del(EO_EV_DEL, _view_del_cb, data));
eo_do(view, eo_event_callback_del(EO_BASE_EVENT_DEL, _view_del_cb, data));
eo_del(view);
}
eina_iterator_free(iter);

4
legacy/elementary/src/lib/elm_entry.c
View File

@ -3851,8 +3851,8 @@ _elm_entry_eo_base_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
evas_obj_type_set(MY_CLASS_NAME_LEGACY),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ENTRY),
eo_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, NULL),
eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deleted, NULL));
eo_event_callback_add(EO_BASE_EVENT_CALLBACK_ADD, _cb_added, NULL),
eo_event_callback_add(EO_BASE_EVENT_CALLBACK_DEL, _cb_deleted, NULL));
return obj;
}

4
legacy/elementary/src/lib/elm_win.c
View File

@ -3985,8 +3985,8 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
evas_object_show(sd->edje);
eo_do(obj, eo_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, sd),
eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, sd));
eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_ADD, _cb_added, sd),
eo_event_callback_add(EO_BASE_EVENT_CALLBACK_DEL, _cb_deled, sd));
if (type == ELM_WIN_FAKE)
{
_elm_win_resize_job(obj);