enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Change the EFL to follow the new Eo rename.

This commit is contained in:
Tom Hacohen 2016-08-10 15:23:04 +01:00
parent e64e120a51
commit c662934be8
644 changed files with 3718 additions and 3718 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/benchmarks/eo/class_simple.c
View File

@ -7,8 +7,8 @@
#define MY_CLASS SIMPLE_CLASS
EOAPI const Eo_Event_Description _SIMPLE_FOO = EO_EVENT_DESCRIPTION("foo");
EOAPI const Eo_Event_Description _SIMPLE_BAR = EO_EVENT_DESCRIPTION("bar");
EOAPI const Efl_Event_Description _SIMPLE_FOO = EFL_EVENT_DESCRIPTION("foo");
EOAPI const Efl_Event_Description _SIMPLE_BAR = EFL_EVENT_DESCRIPTION("bar");
static void
_other_call(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, Eo *other, int times)
@ -30,12 +30,12 @@ _a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
static Eo_Op_Description op_desc[] = {
static Efl_Op_Description op_desc[] = {
EO_OP_FUNC(simple_a_set, _a_set),
EO_OP_FUNC(simple_other_call, _other_call),
};
static const Eo_Class_Description class_desc = {
static const Efl_Class_Description class_desc = {
EO_VERSION,
"Simple",
EO_CLASS_TYPE_REGULAR,

6
src/benchmarks/eo/class_simple.h
View File

@ -12,10 +12,10 @@ EAPI void simple_a_set(Eo *self, int a);
EAPI void simple_other_call(Eo*self, Eo *other, int times);
#define SIMPLE_CLASS simple_class_get()
const Eo_Class *simple_class_get(void);
const Efl_Class *simple_class_get(void);
EOAPI extern const Eo_Event_Description _SIMPLE_FOO;
EOAPI extern const Eo_Event_Description _SIMPLE_BAR;
EOAPI extern const Efl_Event_Description _SIMPLE_FOO;
EOAPI extern const Efl_Event_Description _SIMPLE_BAR;
#define SIMPLE_FOO (&(_SIMPLE_FOO))
#define SIMPLE_BAR (&(_SIMPLE_BAR))

6
src/benchmarks/eo/eo_bench_callbacks.c
View File

@ -20,7 +20,7 @@ bench_eo_callbacks_add(int request)
for (i = 0 ; i < request ; i++)
{
eo_event_callback_priority_add(obj, SIMPLE_FOO, (short) i, _cb, NULL);
efl_event_callback_priority_add(obj, SIMPLE_FOO, (short) i, _cb, NULL);
}
eo_unref(obj);
@ -56,7 +56,7 @@ bench_eo_callbacks_call(int request)
for (j = 0 ; j < i ; j++)
{
eo_event_callback_priority_add(obj[i], SIMPLE_FOO, (short) j, _cb, NULL);
efl_event_callback_priority_add(obj[i], SIMPLE_FOO, (short) j, _cb, NULL);
}
}
@ -65,7 +65,7 @@ bench_eo_callbacks_call(int request)
for (j = 0 ; j < (int) (distribution[i] * request) ; j++)
{
/* Miss finding the callbacks on purpose, so we measure worst case scenario. */
eo_event_callback_call(obj[i], SIMPLE_BAR, NULL);
efl_event_callback_call(obj[i], SIMPLE_BAR, NULL);
}
}

6
src/benchmarks/eo/eo_bench_eo_do.c
View File

@ -50,7 +50,7 @@ bench_eo_do_two_objs_growing_stack(int request)
eo_unref(obj2);
}
static const Eo_Class *cur_klass;
static const Efl_Class *cur_klass;
static void
_a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
@ -58,14 +58,14 @@ _a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
simple_a_set(eo_super(obj, cur_klass), a);
}
static Eo_Op_Description op_desc[] = {
static Efl_Op_Description op_desc[] = {
EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
};
static void
bench_eo_do_super(int request)
{
static Eo_Class_Description class_desc = {
static Efl_Class_Description class_desc = {
EO_VERSION,
"Simple2",
EO_CLASS_TYPE_REGULAR,

2
src/bin/elementary/test.c
View File

@ -1078,7 +1078,7 @@ efl_main(void *data EINA_UNUSED,
{
_log_domain = eina_log_domain_register("elementary_test", NULL);
eo_event_callback_add(ev->object, EO_EVENT_DEL, _main_loop_death, NULL);
efl_event_callback_add(ev->object, EFL_EVENT_DEL, _main_loop_death, NULL);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);

2
src/bin/elementary/test_anim.c
View File

@ -92,5 +92,5 @@ test_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info
evas_object_resize(win, 480, 800);
evas_object_show(win);
eo_event_callback_add(win, EFL_EVENT_ANIMATOR_TICK, _anim_tick, NULL);
efl_event_callback_add(win, EFL_EVENT_ANIMATOR_TICK, _anim_tick, NULL);
}

24
src/bin/elementary/test_application_server.c
View File

@ -45,7 +45,7 @@ _close_cb(void *data, const Eo_Event *event)
App_View_Context *ctx = data;
if (ctx->win)
evas_object_del(ctx->win);
eo_del(event->object);
efl_del(event->object);
}
static void
@ -108,10 +108,10 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED,
elm_app_server_view_new_events_set(view, 5);
elm_app_server_view_window_set(view, ctx->win);
elm_app_server_view_resume(view);
eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx);
eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx);
eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx);
eo_event_callback_add(view, EO_EVENT_DEL, _view_del_cb, ctx);
efl_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx);
efl_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx);
efl_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx);
efl_event_callback_add(view, EFL_EVENT_DEL, _view_del_cb, ctx);
return view;
}
@ -139,7 +139,7 @@ test_application_server_common(const char *pkg)
server = eo_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(eo_self, pkg, _create_view_cb));
elm_app_server_title_set(server, pkg);
views_iter = elm_app_server_views_get(server);
eo_event_callback_add(server, ELM_APP_SERVER_EVENT_TERMINATE, _terminate_cb, NULL);
efl_event_callback_add(server, ELM_APP_SERVER_EVENT_TERMINATE, _terminate_cb, NULL);
//views create in shallow state
EINA_ITERATOR_FOREACH(views_iter, view)
@ -152,10 +152,10 @@ test_application_server_common(const char *pkg)
id = elm_app_server_view_id_get(view);
ctx->view_name = eina_stringshare_printf("%s %s", pkg, id);
eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx);
eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx);
eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx);
eo_event_callback_add(view, EO_EVENT_DEL, _view_del_cb, ctx);
efl_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx);
efl_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx);
efl_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx);
efl_event_callback_add(view, EFL_EVENT_DEL, _view_del_cb, ctx);
}
eina_iterator_free(views_iter);
@ -181,7 +181,7 @@ test_application_server_phone(void *data EINA_UNUSED,
}
printf("Starting phone\n");
phone_server = test_application_server_common("org.enlightenment.phone");
eo_event_callback_add(phone_server, EO_EVENT_DEL, _server_del_cb, &phone_server);
efl_event_callback_add(phone_server, EFL_EVENT_DEL, _server_del_cb, &phone_server);
}
void
@ -196,5 +196,5 @@ test_application_server_message(void *data EINA_UNUSED,
}
printf("Starting message\n");
msg_server = test_application_server_common( "org.enlightenment.message");
eo_event_callback_add(msg_server, EO_EVENT_DEL, _server_del_cb, &msg_server);
efl_event_callback_add(msg_server, EFL_EVENT_DEL, _server_del_cb, &msg_server);
}

6
src/bin/elementary/test_code.c
View File

@ -45,7 +45,7 @@ _elm_code_test_line_done_cb(void *data EINA_UNUSED, const Eo_Event *event)
else if (line->number == 4)
line->status = ELM_CODE_STATUS_TYPE_ERROR;
eo_event_callback_stop(event->object);
efl_event_callback_stop(event->object);
}
static Evas_Object *
@ -57,8 +57,8 @@ _elm_code_test_welcome_setup(Evas_Object *parent)
code = elm_code_create();
widget = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code));
elm_obj_code_widget_font_set(widget, NULL, 12);
eo_event_callback_add(widget, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_test_line_done_cb, NULL);
eo_event_callback_add(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, _elm_code_test_line_clicked_cb, code);
efl_event_callback_add(widget, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_test_line_done_cb, NULL);
efl_event_callback_add(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, _elm_code_test_line_clicked_cb, code);
_append_line(code->file, "❤ Hello World, Elm Code! ❤");
_append_line(code->file, "");

26
src/bin/elementary/test_entry.c
View File

@ -608,7 +608,7 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
evas_object_smart_callback_add(en, "anchor,clicked", scrolled_anchor_test, en);
evas_object_show(en);
elm_box_pack_end(bx, en);
eo_event_callback_add(en, ELM_ENTRY_EVENT_CONTEXT_OPEN, _context_menu_show_cb, NULL);
efl_event_callback_add(en, ELM_ENTRY_EVENT_CONTEXT_OPEN, _context_menu_show_cb, NULL);
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
@ -697,7 +697,7 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
static void
my_pop_dismissed(void *data EINA_UNUSED, const Eo_Event *ev)
{
eo_del(ev->object);
efl_del(ev->object);
}
static void
@ -705,7 +705,7 @@ my_pop_close_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
{
Evas_Object *pop, *en;
pop = data;
en = eo_parent_get(pop);
en = efl_parent_get(pop);
elm_object_text_set(en, "This is very long text,"
" it is longer than width of this page."
" So if scroller is moved to next page,"
@ -713,7 +713,7 @@ my_pop_close_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
" and then click this entry text");
elm_entry_cursor_end_set(en);
eo_event_callback_add(pop, ELM_POPUP_EVENT_DISMISSED, my_pop_dismissed, NULL);
efl_event_callback_add(pop, ELM_POPUP_EVENT_DISMISSED, my_pop_dismissed, NULL);
elm_popup_dismiss(pop);
}
@ -724,8 +724,8 @@ my_pop_bt_clr(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UN
elm_object_text_set(en, "");
elm_entry_cursor_end_set(en);
pop = elm_popup_add(eo_key_data_get(en, "win"));
eo_parent_set(pop, en);
pop = elm_popup_add(efl_key_data_get(en, "win"));
efl_parent_set(pop, en);
elm_object_text_set(pop, "If you click confirm, "
"set long text to entry "
"and delete popup obj");
@ -785,7 +785,7 @@ test_entry_on_page_scroll(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
elm_object_part_content_set(ly, "element1", en);
elm_entry_scrollable_set(en, EINA_TRUE);
elm_entry_single_line_set(en, EINA_TRUE);
eo_key_data_set(en, "win", win); // no ref
efl_key_data_set(en, "win", win); // no ref
evas_object_show(en);
btn = elm_button_add(ly);
@ -2606,8 +2606,8 @@ _test_regex_bt_cb(void *data,
if (test_data->re)
{
eo_event_callback_del(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
eo_event_callback_del(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
efl_event_callback_del(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
efl_event_callback_del(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
elm_validator_regexp_free(test_data->re);
}
test_data->re = elm_validator_regexp_new(elm_entry_entry_get(test_data->en_regex), NULL);
@ -2631,8 +2631,8 @@ _test_regex_bt_cb(void *data,
}
if (!status)
{
eo_event_callback_add(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
eo_event_callback_add(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
efl_event_callback_add(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
efl_event_callback_add(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
}
elm_object_text_set(test_data->lb_regex, eina_strbuf_string_get(tmp));
@ -2731,8 +2731,8 @@ test_entry_regex(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
test_data->re = elm_validator_regexp_new(REGEX, NULL);
elm_entry_entry_set(test_data->en_regex, REGEX);
eo_event_callback_add(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
eo_event_callback_add(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
efl_event_callback_add(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
efl_event_callback_add(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
evas_object_resize(win, 400, 400);
evas_object_show(win);

36
src/bin/elementary/test_events.c
View File

@ -22,7 +22,7 @@ _pointer_down(void *data, const Eo_Event *ev)
{
testdata *td = data;
td->down = 1;
eo_del(td->evdown);
efl_del(td->evdown);
td->evdown = efl_event_dup(ev->info);
}
@ -30,7 +30,7 @@ static void
_pointer_move(void *data, const Eo_Event *ev)
{
testdata *td = data;
eo_del(td->evmove);
efl_del(td->evmove);
td->evmove = efl_event_dup(ev->info);
}
@ -39,7 +39,7 @@ _pointer_up(void *data, const Eo_Event *ev)
{
testdata *td = data;
td->down = 0;
eo_del(td->evup);
efl_del(td->evup);
td->evup = efl_event_dup(ev->info);
}
@ -64,7 +64,7 @@ _key_down(void *data, const Eo_Event *ev)
if (!efl_event_fake_get(ev->info))
{
eo_del(td->evkeydown);
efl_del(td->evkeydown);
td->evkeydown = efl_event_dup(ev->info);
}
}
@ -98,7 +98,7 @@ _key_up(void *data, const Eo_Event *ev)
if (!efl_event_fake_get(ev->info))
{
eo_del(td->evkeyup);
efl_del(td->evkeyup);
td->evkeyup = efl_event_dup(ev->info);
}
@ -108,7 +108,7 @@ _key_up(void *data, const Eo_Event *ev)
// 2bis I need to pass the loop object itself rather than a provider
// 3. All calls to eina_promise crash if the promise is null
if (td->timer) eo_del(td->timer);
if (td->timer) efl_del(td->timer);
td->timer = ecore_timer_add(0.5, _ecore_timeout_cb, td);
}
@ -144,16 +144,16 @@ _clicked_button2(void *data, const Eo_Event *ev EINA_UNUSED)
efl_event_pointer_position_set(td->evdown, x, y);
efl_event_pointer_position_set(td->evup, x, y);
eo_event_callback_call(td->win, EFL_EVENT_POINTER_MOVE, td->evmove);
eo_event_callback_call(td->win, EFL_EVENT_POINTER_DOWN, td->evdown);
eo_event_callback_call(td->win, EFL_EVENT_POINTER_UP, td->evup);
efl_event_callback_call(td->win, EFL_EVENT_POINTER_MOVE, td->evmove);
efl_event_callback_call(td->win, EFL_EVENT_POINTER_DOWN, td->evdown);
efl_event_callback_call(td->win, EFL_EVENT_POINTER_UP, td->evup);
}
else
{
eo_event_callback_call(td->win, EFL_EVENT_KEY_DOWN, td->evkeydown);
eo_event_callback_call(td->win, EFL_EVENT_KEY_UP, td->evkeyup);
eo_del(td->evkeydown);
eo_del(td->evkeyup);
efl_event_callback_call(td->win, EFL_EVENT_KEY_DOWN, td->evkeydown);
efl_event_callback_call(td->win, EFL_EVENT_KEY_UP, td->evkeyup);
efl_del(td->evkeydown);
efl_del(td->evkeyup);
td->evkeydown = NULL;
td->evkeyup = NULL;
}
@ -222,11 +222,11 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_pack(bx, o);
evas_object_show(o);
eo_event_callback_add(td->button, EFL_UI_EVENT_CLICKED, _clicked_button1, td);
eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _clicked_button2, td);
eo_event_callback_add(win, EO_EVENT_DEL, _win_del, td);
eo_event_callback_array_add(o, rect_pointer_callbacks(), td);
eo_event_callback_array_add(win, win_key_callbacks(), td);
efl_event_callback_add(td->button, EFL_UI_EVENT_CLICKED, _clicked_button1, td);
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _clicked_button2, td);
efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, td);
efl_event_callback_array_add(o, rect_pointer_callbacks(), td);
efl_event_callback_array_add(win, win_key_callbacks(), td);
evas_object_resize(td->win, 200, 100);
evas_object_show(td->win);

8
src/bin/elementary/test_grid_static.c
View File

@ -42,7 +42,7 @@ set_api_state(api_data *api)
case GRID_UNPACK: /* 1 */
efl_pack_unpack(dt->grid, dt->child);
eo_del(dt->child);
efl_del(dt->child);
break;
case GRID_SIZE: /* 2 */
@ -108,7 +108,7 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_ui_win_name_set(eo_self, "grid"),
efl_text_set(eo_self, "Grid"),
efl_ui_win_autodel_set(eo_self, EINA_TRUE),
eo_event_callback_add(eo_self, EO_EVENT_DEL, _win_del, api));
efl_event_callback_add(eo_self, EFL_EVENT_DEL, _win_del, api));
static int run_count = 0;
if (((run_count++) % 2) == 0)
@ -144,7 +144,7 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
bt = elm_button_add(win);
elm_object_text_set(bt, "Next API function");
eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _api_bt_clicked, api);
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _api_bt_clicked, api);
efl_pack_grid(gd, bt, 30, 0, 40, 10);
elm_object_disabled_set(bt, api->state == API_STATE_LAST);
efl_gfx_visible_set(bt, 1);
@ -173,7 +173,7 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
bt = elm_button_add(win);
elm_object_text_set(bt, "Change");
efl_pack_grid(gd, bt, 40, 40, 20, 20);
eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_grid, gd);
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_grid, gd);
efl_gfx_visible_set(bt, 1);
rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win);

12
src/bin/elementary/test_task_switcher.c
View File

@ -67,7 +67,7 @@ _app_view_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EIN
Elm_App_Client_View *old_view;
old_view = evas_object_data_del(view_props, "view");
eo_event_callback_del(old_view, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, _app_view_prop_changed_cb, table);
efl_event_callback_del(old_view, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, _app_view_prop_changed_cb, table);
elm_list_clear(view_props);
}
else
@ -86,7 +86,7 @@ _app_view_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EIN
progress = elm_app_client_view_progress_get(view);
new_events = elm_app_client_view_new_events_get(view);
window = elm_app_client_view_window_get(view);
eo_event_callback_add(view, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, _app_view_prop_changed_cb, table);
efl_event_callback_add(view, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, _app_view_prop_changed_cb, table);
snprintf(buffer, sizeof(buffer), "Title=%s", title);
elm_list_item_append(view_props, buffer, NULL, NULL, NULL, NULL);
@ -280,7 +280,7 @@ _win_del(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_
{
Elm_App_Client *app;
EINA_LIST_FREE(apps_list, app)
eo_del(app);
efl_del(app);
}
static void
@ -301,9 +301,9 @@ _app_open(const char *package)
}
app = eo_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(eo_self, package));
eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, _view_list_update_cb, table);
eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_CREATED, _view_list_update_cb, table);
eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_DELETED, _view_list_update_cb, table);
efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, _view_list_update_cb, table);
efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_CREATED, _view_list_update_cb, table);
efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_DELETED, _view_list_update_cb, table);
apps_list = eina_list_append(apps_list, app);
}

32
src/bin/elementary/test_ui_box.c
View File

@ -240,7 +240,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
chk = o = elm_radio_add(win);
elm_object_text_set(o, "No weight");
eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox);
efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox);
efl_gfx_size_hint_align_set(o, 0, 0.5);
elm_radio_state_value_set(o, NONE);
efl_pack(bx, o);
@ -248,7 +248,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_radio_add(win);
elm_object_text_set(o, "No weight + box fill");
eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox);
efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox);
efl_gfx_size_hint_align_set(o, 0, 0.5);
elm_radio_state_value_set(o, NONE_BUT_FILL);
elm_radio_group_add(o, chk);
@ -257,7 +257,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_radio_add(win);
elm_object_text_set(o, "Equal weights");
eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox);
efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox);
efl_gfx_size_hint_align_set(o, 0, 0.5);
elm_radio_state_value_set(o, EQUAL);
elm_radio_group_add(o, chk);
@ -266,7 +266,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_radio_add(win);
elm_object_text_set(o, "One weight only");
eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox);
efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox);
efl_gfx_size_hint_align_set(o, 0, 0.5);
elm_radio_state_value_set(o, ONE);
elm_radio_group_add(o, chk);
@ -275,7 +275,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_radio_add(win);
elm_object_text_set(o, "Two weights");
eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox);
efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, bottombox);
efl_gfx_size_hint_align_set(o, 0, 0.5);
elm_radio_state_value_set(o, TWO);
elm_radio_group_add(o, chk);
@ -301,7 +301,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_check_add(win);
elm_check_selected_set(o, 0);
elm_object_text_set(o, "Flow");
eo_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, flow_check_cb, bottombox);
efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, flow_check_cb, bottombox);
efl_gfx_size_hint_align_set(o, 0, 0);
efl_pack(bx, o);
efl_gfx_visible_set(o, 1);
@ -309,7 +309,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_check_add(win);
elm_check_selected_set(o, 1);
elm_object_text_set(o, "Horizontal");
eo_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, horiz_check_cb, bottombox);
efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, horiz_check_cb, bottombox);
efl_gfx_size_hint_align_set(o, 0, 0);
efl_pack(bx, o);
efl_gfx_visible_set(o, 1);
@ -317,7 +317,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_check_add(win);
elm_check_selected_set(o, 0);
elm_object_text_set(o, "Homogenous");
eo_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, homo_check_cb, bottombox);
efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, homo_check_cb, bottombox);
efl_gfx_size_hint_align_set(o, 0, 0);
efl_pack(bx, o);
efl_gfx_visible_set(o, 1);
@ -325,7 +325,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_check_add(win);
elm_check_selected_set(o, 0);
elm_object_text_set(o, "Homogenous + Max");
eo_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, max_size_check_cb, bottombox);
efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, max_size_check_cb, bottombox);
efl_gfx_size_hint_align_set(o, 0, 0);
efl_pack(bx, o);
efl_gfx_visible_set(o, 1);
@ -333,7 +333,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_check_add(win);
elm_check_selected_set(o, 0);
elm_object_text_set(o, "Align left");
eo_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, left_check_cb, bottombox);
efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, left_check_cb, bottombox);
efl_gfx_size_hint_align_set(o, 0, 0);
efl_pack(bx, o);
efl_gfx_visible_set(o, 1);
@ -341,7 +341,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = elm_check_add(win);
elm_check_selected_set(o, 0);
elm_object_text_set(o, "Custom layout");
eo_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, custom_check_cb, bottombox);
efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, custom_check_cb, bottombox);
efl_gfx_size_hint_align_set(o, 0, 0);
efl_gfx_size_hint_weight_set(o, 0, 1);
efl_pack(bx, o);
@ -367,7 +367,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_horizontal_set(o, 0);
efl_gfx_size_hint_align_set(o, 0.5, -1);
efl_gfx_size_hint_weight_set(o, 1, 1);
eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL);
efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL);
elm_slider_min_max_set(o, 0, 250);
elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 0);
@ -394,7 +394,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_horizontal_set(o, 0);
efl_gfx_size_hint_align_set(o, 0.5, -1);
efl_gfx_size_hint_weight_set(o, 1, 1);
eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, padding_slider_cb, bottombox);
efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, padding_slider_cb, bottombox);
elm_slider_min_max_set(o, 0, 40);
elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10);
@ -421,7 +421,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_horizontal_set(o, 0);
efl_gfx_size_hint_align_set(o, 0.5, -1);
efl_gfx_size_hint_weight_set(o, 1, 1);
eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, margin_slider_cb, bottombox);
efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, margin_slider_cb, bottombox);
elm_slider_min_max_set(o, 0, 40);
elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10);
@ -448,7 +448,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
elm_slider_horizontal_set(o, 0);
efl_gfx_size_hint_align_set(o, 0.5, -1);
efl_gfx_size_hint_weight_set(o, 1, 1);
eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, alignv_slider_cb, bottombox);
efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, alignv_slider_cb, bottombox);
elm_slider_min_max_set(o, -0.1, 1.0);
elm_slider_step_set(o, 0.1);
elm_slider_value_set(o, 0.5);
@ -462,7 +462,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_align_set(o, 0.5, -1);
efl_gfx_size_hint_weight_set(o, 1, 0);
efl_gfx_size_hint_min_set(o, 100, 0);
eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, alignh_slider_cb, bottombox);
efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, alignh_slider_cb, bottombox);
elm_slider_min_max_set(o, -0.1, 1.0);
elm_slider_step_set(o, 0.1);
elm_slider_value_set(o, 0.5);

52
src/bin/elementary/test_ui_grid.c
View File

@ -18,12 +18,12 @@ typedef enum {
static void _custom_engine_layout_do(Eo *obj, void *pd, Efl_Pack *pack, const void *data);
/* Common Eo Class boilerplate. */
static const Eo_Op_Description custom_engine_op_desc[] = {
/* Common Efl Class boilerplate. */
static const Efl_Op_Description custom_engine_op_desc[] = {
EO_OP_CLASS_FUNC_OVERRIDE(efl_pack_layout_do, _custom_engine_layout_do),
};
static const Eo_Class_Description custom_engine_class_desc = {
static const Efl_Class_Description custom_engine_class_desc = {
EO_VERSION, "Custom Layout Engine", EO_CLASS_TYPE_INTERFACE,
EO_CLASS_DESCRIPTION_OPS(custom_engine_op_desc), NULL, 0, NULL, NULL
};
@ -227,7 +227,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
chk = o = elm_radio_add(win);
elm_object_text_set(o, "No weight");
eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
efl_gfx_size_hint_align_set(o, 0, 0.5);
elm_radio_state_value_set(o, NONE);
efl_pack(bx, o);
@ -235,7 +235,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
o = elm_radio_add(win);
elm_object_text_set(o, "No weight + grid fill");
eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
efl_gfx_size_hint_align_set(o, 0, 0.5);
elm_radio_state_value_set(o, NONE_BUT_FILL);
elm_radio_group_add(o, chk);
@ -244,7 +244,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
o = elm_radio_add(win);
elm_object_text_set(o, "Equal weights");
eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
efl_gfx_size_hint_align_set(o, 0, 0.5);
elm_radio_state_value_set(o, EQUAL);
elm_radio_group_add(o, chk);
@ -253,7 +253,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
o = elm_radio_add(win);
elm_object_text_set(o, "One weight only");
eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
efl_gfx_size_hint_align_set(o, 0, 0.5);
elm_radio_state_value_set(o, ONE);
elm_radio_group_add(o, chk);
@ -262,7 +262,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
o = elm_radio_add(win);
elm_object_text_set(o, "Two weights");
eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
efl_gfx_size_hint_align_set(o, 0, 0.5);
elm_radio_state_value_set(o, TWO);
elm_radio_group_add(o, chk);
@ -271,7 +271,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
o = elm_radio_add(win);
elm_object_text_set(o, "Custom layout");
eo_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid);
efl_gfx_size_hint_align_set(o, 0, 0.5);
elm_radio_state_value_set(o, CUSTOM);
elm_radio_group_add(o, chk);
@ -300,7 +300,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
elm_slider_horizontal_set(o, 0);
efl_gfx_size_hint_align_set(o, 0.5, -1);
efl_gfx_size_hint_weight_set(o, 1, 1);
eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL);
efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL);
elm_slider_min_max_set(o, 0, 250);
elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 0);
@ -327,7 +327,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
elm_slider_horizontal_set(o, 0);
efl_gfx_size_hint_align_set(o, 0.5, -1);
efl_gfx_size_hint_weight_set(o, 1, 1);
eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, padding_slider_cb, grid);
efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, padding_slider_cb, grid);
elm_slider_min_max_set(o, 0, 40);
elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10);
@ -354,7 +354,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
elm_slider_horizontal_set(o, 0);
efl_gfx_size_hint_align_set(o, 0.5, -1);
efl_gfx_size_hint_weight_set(o, 1, 1);
eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, margin_slider_cb, grid);
efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, margin_slider_cb, grid);
elm_slider_min_max_set(o, 0, 40);
elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10);
@ -381,7 +381,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
elm_slider_horizontal_set(o, 0);
efl_gfx_size_hint_align_set(o, 0.5, -1);
efl_gfx_size_hint_weight_set(o, 1, 1);
eo_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, btnmargins_slider_cb, grid);
efl_event_callback_add(o, ELM_SLIDER_EVENT_CHANGED, btnmargins_slider_cb, grid);
elm_slider_min_max_set(o, 0, 40);
elm_slider_inverted_set(o, 1);
elm_slider_value_set(o, 10);
@ -403,13 +403,13 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_gfx_visible_set(o, 1);
o = elm_label_add(win);
eo_event_callback_add(grid, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o);
efl_event_callback_add(grid, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o);
efl_pack(bx, o);
efl_gfx_visible_set(o, 1);
o = elm_label_add(win);
eo_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o);
eo_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o);
efl_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o);
efl_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o);
efl_gfx_size_hint_align_set(o, 0.5, 0);
efl_gfx_size_hint_weight_set(o, 1, 1);
efl_pack(bx, o);
@ -493,7 +493,7 @@ btn_text(const char *str)
static void
remove_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
eo_del(ev->object);
efl_del(ev->object);
}
static void
@ -502,7 +502,7 @@ append_cb(void *data, const Eo_Event *ev EINA_UNUSED)
Eo *grid = data;
Eo *o = elm_button_add(grid);
elm_object_text_set(o, btn_text("appended"));
eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
elm_object_tooltip_text_set(o, "Click to unpack");
efl_pack_end(grid, o);
efl_gfx_visible_set(o, 1);
@ -556,7 +556,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
o = elm_button_add(win);
elm_object_content_set(o, ico);
elm_object_text_set(o, "Append");
eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, append_cb, grid);
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, append_cb, grid);
efl_pack(hbox, o);
efl_gfx_visible_set(o, 1);
@ -565,7 +565,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
o = elm_button_add(win);
elm_object_content_set(o, ico);
elm_object_text_set(o, "Clear");
eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, clear_cb, grid);
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, clear_cb, grid);
efl_pack(hbox, o);
efl_gfx_visible_set(o, 1);
@ -584,13 +584,13 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_gfx_visible_set(o, 1);
o = elm_label_add(win);
eo_event_callback_add(grid, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o);
efl_event_callback_add(grid, EFL_PACK_EVENT_LAYOUT_UPDATED, layout_updated_cb, o);
efl_pack(bx, o);
efl_gfx_visible_set(o, 1);
o = elm_label_add(win);
eo_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o);
eo_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o);
efl_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o);
efl_event_callback_add(grid, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o);
efl_gfx_size_hint_align_set(o, 0.5, 0);
efl_gfx_size_hint_weight_set(o, 1, 1);
efl_pack(bx, o);
@ -613,19 +613,19 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
o = elm_button_add(win);
elm_object_text_set(o, btn_text(NULL));
eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_pack(grid, o);
efl_gfx_visible_set(o, 1);
o = elm_button_add(win);
elm_object_text_set(o, btn_text(NULL));
eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_pack(grid, o);
efl_gfx_visible_set(o, 1);
o = elm_button_add(win);
elm_object_text_set(o, btn_text(NULL));
eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_pack(grid, o);
efl_gfx_visible_set(o, 1);

6
src/bin/elementary/test_win_plug.c
View File

@ -146,8 +146,8 @@ create_handles(Evas_Object *obj)
static void
_notify_end(void *data EINA_UNUSED, const Eo_Event *event)
{
eo_del(event->object);
eo_event_callback_stop(event->object);
efl_del(event->object);
efl_event_callback_stop(event->object);
}
static inline void
@ -161,7 +161,7 @@ _notify_error(Evas_Object *parent, const char *msg)
evas_object_size_hint_weight_set(notif, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_notify_align_set(notif, 0.5, 1.0);
elm_notify_timeout_set(notif, 3.0);
eo_event_callback_add(notif, ELM_NOTIFY_EVENT_DISMISSED, _notify_end, NULL);
efl_event_callback_add(notif, ELM_NOTIFY_EVENT_DISMISSED, _notify_end, NULL);
txt = elm_label_add(notif);
elm_object_text_set(txt, msg);

12
src/bin/eolian/eo_generator.c
View File

@ -19,11 +19,11 @@ static Eina_Hash *_funcs_params_init = NULL;
static const char
tmpl_eo_ops_desc[] = "\
static const Eo_Op_Description _@#class_op_desc[] = {@#list_op\n};\n\n";
static const Efl_Op_Description _@#class_op_desc[] = {@#list_op\n};\n\n";
static const char
tmpl_events_desc[] = "\
static const Eo_Event_Description *_@#class_event_desc[] = {@#list_evdesc\n\
static const Efl_Event_Description *_@#class_event_desc[] = {@#list_evdesc\n\
NULL\n\
};\n\n";
@ -35,7 +35,7 @@ tmpl_eo_src[] = "\
@#dtor_func\
@#ops_desc\
@#events_desc\
static const Eo_Class_Description _@#class_class_desc = {\n\
static const Efl_Class_Description _@#class_class_desc = {\n\
EO_VERSION,\n\
\"@#Class\",\n\
@#type_class,\n\
@ -53,7 +53,7 @@ static const char
tmpl_eo_obj_header[] = "\
#define @#CLASS_@#CLASSTYPE @#klasstype_get()\n\
\n\
EWAPI const Eo_Class *@#klasstype_get(void);\n\
EWAPI const Efl_Class *@#klasstype_get(void);\n\
\n\
";
@ -231,7 +231,7 @@ eo_header_generate(const Eolian_Class *class, Eina_Strbuf *buf)
eina_strbuf_append(str_ev, "/**\n * No description\n */\n");
eina_strbuf_append_printf(str_ev, "#define %s (&(_%s))\n", evname, evname);
eina_strbuf_append_printf(str_extrn_ev, "EOAPI extern const Eo_Event_Description _%s;\n", evname);
eina_strbuf_append_printf(str_extrn_ev, "EOAPI extern const Efl_Event_Description _%s;\n", evname);
eina_stringshare_del(evname);
if (scope == EOLIAN_SCOPE_PROTECTED)
@ -657,7 +657,7 @@ eo_source_beginning_generate(const Eolian_Class *class, Eina_Strbuf *buf)
Eina_Stringshare *evname = eolian_event_c_name_get(event);
eina_strbuf_append_printf(tmpbuf,
"EOAPI const Eo_Event_Description _%s =\n EO_EVENT_DESCRIPTION%s%s(\"%s\");\n",
"EOAPI const Efl_Event_Description _%s =\n EFL_EVENT_DESCRIPTION%s%s(\"%s\");\n",
evname,
eolian_event_is_hot(event) ? "_HOT" : "",
eolian_event_is_restart(event) ? "_RESTART" : "",

4
src/bin/eolian/impl_generator.c
View File

@ -292,7 +292,7 @@ impl_source_generate(const Eolian_Class *class, Eina_Strbuf *buffer)
{
printf("Generation of function %s\n", func_name);
eina_strbuf_append_printf(buffer,
"EOLIAN static void\n_%s_class_constructor(Eo_Class *klass)\n{\n\n}\n\n",
"EOLIAN static void\n_%s_class_constructor(Efl_Class *klass)\n{\n\n}\n\n",
class_env.lower_classname);
}
}
@ -304,7 +304,7 @@ impl_source_generate(const Eolian_Class *class, Eina_Strbuf *buffer)
if (!_function_exists(func_name, buffer))
{
printf("Generation of function %s\n", func_name);
eina_strbuf_append_printf(buffer, "EOLIAN static void\n_%s_class_destructor(Eo_Class *klass)\n{\n\n}\n\n",
eina_strbuf_append_printf(buffer, "EOLIAN static void\n_%s_class_destructor(Efl_Class *klass)\n{\n\n}\n\n",
class_env.lower_classname);
}
}

6
src/examples/ecore/ecore_audio_playback.c
View File

@ -201,7 +201,7 @@ static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
inputs = eina_list_remove(inputs, event->object);
ret = ecore_audio_obj_out_input_detach(out, event->object);
eo_del(event->object);
efl_del(event->object);
if (!ret)
printf("Could not detach input %s\n", name);
@ -266,7 +266,7 @@ main(int argc, const char *argv[])
{
if (!strncmp(val, "freq=", 5)) {
freq = atoi(&val[5]);
eo_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq);
efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq);
} else if (!strncmp(val, "duration=", 9)) {
ecore_audio_obj_in_length_set(in, atof(&val[9]));
}
@ -291,7 +291,7 @@ main(int argc, const char *argv[])
continue;
}
}
eo_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL);
efl_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL);
inputs = eina_list_append(inputs, in);
}

16
src/examples/ecore/ecore_audio_to_ogg.c
View File

@ -24,8 +24,8 @@ static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
printf("Done: %s\n", name);
ecore_audio_obj_in_output_get(event->object, &out);
eo_del(event->object);
eo_del(out);
efl_del(event->object);
efl_del(out);
ecore_main_loop_quit();
@ -54,26 +54,26 @@ main(int argc, char *argv[])
ret = ecore_audio_obj_source_set(in, argv[1]);
if (!ret) {
printf("Could not set %s as input\n", argv[1]);
eo_del(in);
efl_del(in);
return 1;
}
eo_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL);
efl_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL);
out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL);
ret = ecore_audio_obj_source_set(out, argv[2]);
if (!ret) {
printf("Could not set %s as output\n", argv[2]);
eo_del(in);
eo_del(out);
efl_del(in);
efl_del(out);
return 1;
}
ret = ecore_audio_obj_out_input_attach(out, in);
if (!ret) {
printf("Could not attach input\n");
eo_del(out);
eo_del(in);
efl_del(out);
efl_del(in);
return 1;
}

2
src/examples/eio/efl_io_manager_ls.c
View File

@ -52,7 +52,7 @@ void list_files(void *data)
const char *path = data;
Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL);
eo_event_callback_add(job, EFL_IO_MANAGER_EVENT_FILTER_NAME, (Eo_Event_Cb)&filter_cb, NULL);
efl_event_callback_add(job, EFL_IO_MANAGER_EVENT_FILTER_NAME, (Efl_Event_Cb)&filter_cb, NULL);
promise = efl_io_manager_file_ls(job, path);
eina_promise_progress_cb_add(promise, (Eina_Promise_Progress_Cb)&progress_cb, NULL, NULL);
eina_promise_then(promise, &done_cb, &error_cb, job);

4
src/examples/eio/eio_sentry.c
View File

@ -20,7 +20,7 @@ sentry_cb(void *data EINA_UNUSED, const Eo_Event *event)
ecore_main_loop_quit();
eo_event_callback_stop(event->object);
efl_event_callback_stop(event->object);
}
void
@ -28,7 +28,7 @@ monitor_stuff(void *data)
{
const char *path = data;
Eio_Sentry *sentry = eo_add(EIO_SENTRY_CLASS, NULL);
eo_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CREATED, (Eo_Event_Cb)&sentry_cb, NULL);
efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CREATED, (Efl_Event_Cb)&sentry_cb, NULL);
printf("Starting monitoring path %s\n", path);
eio_sentry_add(sentry, path);

4
src/examples/elementary/filemvc.c
View File

@ -160,7 +160,7 @@ elm_main(int argc, char **argv)
vpanes = elm_panes_add(win);
_widget_init(vpanes);
elm_object_part_content_set(panes, "right", vpanes);
eo_event_callback_add(priv.treeview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _tree_selected_cb, &priv);
efl_event_callback_add(priv.treeview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _tree_selected_cb, &priv);
//listview
genlist = elm_genlist_add(win);
@ -172,7 +172,7 @@ elm_main(int argc, char **argv)
_widget_init(genlist);
elm_object_part_content_set(vpanes, "left", genlist);
eo_event_callback_add(priv.fileview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _list_selected_cb, &priv);
efl_event_callback_add(priv.fileview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _list_selected_cb, &priv);
//formview
bxr = elm_box_add(win);

4
src/examples/elementary/performance/graphical.c
View File

@ -289,7 +289,7 @@ _change_scene_setup()
{
evas_canvas3d_node_member_del(globalGraphical.root_node, node);
globalGraphical.list_nodes = eina_list_remove(globalGraphical.list_nodes, node);
/*eo_del(node);Unless evas_canvas3d_destructors work properly*/
/*efl_del(node);Unless evas_canvas3d_destructors work properly*/
}
eina_list_free(globalGraphical.list_nodes);
eina_list_free(l);
@ -298,7 +298,7 @@ _change_scene_setup()
EINA_LIST_FOREACH (globalGraphical.list_meshes, l, m)
{
globalGraphical.list_meshes = eina_list_remove(globalGraphical.list_meshes, m);
/*eo_del(m); Unless evas_canvas3d_destructors work properly*/
/*efl_del(m); Unless evas_canvas3d_destructors work properly*/
}
eina_list_free(globalGraphical.list_meshes);
eina_list_free(l);

2
src/examples/emotion/emotion_basic_example.c
View File

@ -62,7 +62,7 @@ main(int argc, const char *argv[])
em = emotion_object_add(e);
emotion_object_init(em, NULL);
eo_event_callback_add
efl_event_callback_add
(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
emotion_object_file_set(em, filename);

4
src/examples/emotion/emotion_border_example.c
View File

@ -30,7 +30,7 @@ _create_emotion_object(Evas *e)
emotion_object_init(em, "gstreamer1");
eo_event_callback_add(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
efl_event_callback_add(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
return em;
}
@ -220,7 +220,7 @@ main(int argc, const char *argv[])
ecore_evas_data_set(ee, "emotion", em);
eo_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
efl_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em);
evas_object_focus_set(bg, EINA_TRUE);

6
src/examples/emotion/emotion_generic_example.c
View File

@ -39,9 +39,9 @@ _create_emotion_object(Evas *e)
emotion_object_init(em, "generic");
eo_event_callback_add
efl_event_callback_add
(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
eo_event_callback_add
efl_event_callback_add
(em, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_stopped_cb, NULL);
return em;
@ -207,7 +207,7 @@ main(int argc, const char *argv[])
evas_object_resize(em, WIDTH, HEIGHT);
evas_object_show(em);
eo_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
efl_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em);
evas_object_focus_set(bg, EINA_TRUE);

2
src/examples/emotion/emotion_generic_subtitle_example.c
View File

@ -77,7 +77,7 @@ main(int argc, const char *argv[])
if (subtitle_filename)
emotion_object_video_subtitle_file_set(em, subtitle_filename);
eo_event_callback_add
efl_event_callback_add
(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
emotion_object_file_set(em, filename);

6
src/examples/emotion/emotion_signals_example.c
View File

@ -58,7 +58,7 @@ static void
_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object first position update.\n");
eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL);
efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL);
_display_info(ev->object);
}
@ -66,7 +66,7 @@ static void
_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object first frame decode.\n");
eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL);
efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL);
_display_info(ev->object);
}
@ -144,7 +144,7 @@ main(int argc, const char *argv[])
fprintf(stderr, "Emotion: \"%s\" module could not be initialized.\n", module);
_display_info(em);
eo_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
efl_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
if (!emotion_object_file_set(em, filename))
fprintf(stderr, "Emotion: Could not load the file \"%s\"\n", filename);

8
src/examples/eolian_cxx/colourable.c
View File

@ -27,7 +27,7 @@ struct _Colourable_Data
typedef struct _Colourable_Data Colourable_Data;
Eo *
_ns_colourable_eo_base_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
_ns_colourable_efl_object_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
{
if(!_ns_colourable_impl_logdomain)
{
@ -35,11 +35,11 @@ _ns_colourable_eo_base_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
= eina_log_domain_register("colourable", EINA_COLOR_BLUE);
}
DBG("_ns_colourable_constructor(%p, %p)\n", obj, MY_CLASS);
return eo_constructor(eo_super(obj, MY_CLASS));
return efl_constructor(eo_super(obj, MY_CLASS));
}
void
_ns_colourable_eo_base_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
_ns_colourable_efl_object_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
{
if(_ns_colourable_impl_logdomain)
{
@ -47,7 +47,7 @@ _ns_colourable_eo_base_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
_ns_colourable_impl_logdomain = 0;
}
DBG("_ns_colourable_destructor()\n");
eo_destructor(eo_super(obj, MY_CLASS));
efl_destructor(eo_super(obj, MY_CLASS));
}
void

4
src/examples/eolian_cxx/colourable_stub.h
View File

@ -13,8 +13,8 @@ struct _Colourable_Data
};
typedef struct _Colourable_Data Colourable_Data;
Eo *_colourable_eo_base_constructor(Eo *obj, Colourable_Data *self);
void _colourable_eo_base_destructor(Eo *obj, Colourable_Data *self);
Eo *_colourable_efl_object_constructor(Eo *obj, Colourable_Data *self);
void _colourable_efl_object_destructor(Eo *obj, Colourable_Data *self);
void _colourable_rgb_24bits_constructor(Eo *obj, Colourable_Data *self, int rgb);
void _colourable_print_colour(Eo *obj, Colourable_Data *self);
void _colourable_print_colour(Eo *obj, Colourable_Data *self);

6
src/examples/eolian_cxx/ns_colourable.eo
View File

@ -1,4 +1,4 @@
class Ns.Colourable (Eo.Base)
class Ns.Colourable (Efl.Object)
{
[[Colourable class.]]
data: Colourable_Data;
@ -44,8 +44,8 @@ class Ns.Colourable (Eo.Base)
}
}
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Efl.Object.constructor;
Efl.Object.destructor;
}
constructors {
.rgb_24bits_constructor;

12
src/examples/evas/evas-3d-shadows.c
View File

@ -655,14 +655,14 @@ main(void)
nodes2 = eina_list_append(nodes2, data.cone.node);
/*Set callbacks*/
eo_event_callback_add(data.cube.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL);
eo_event_callback_add(data.cube.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes2);
efl_event_callback_add(data.cube.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL);
efl_event_callback_add(data.cube.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes2);
eo_event_callback_add(data.model.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL);
eo_event_callback_add(data.model.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1);
efl_event_callback_add(data.model.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL);
efl_event_callback_add(data.model.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1);
eo_event_callback_add(data.billboard.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL);
eo_event_callback_add(data.billboard.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1);
efl_event_callback_add(data.billboard.node, EVAS_CANVAS3D_OBJECT_EVENT_CLICKED, _cb_clicked, NULL);
efl_event_callback_add(data.billboard.node, EVAS_CANVAS3D_OBJECT_EVENT_COLLISION, _cb_collision, nodes1);
evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN, _on_mouse_down, &data);
evas_object_event_callback_add(image, EVAS_CALLBACK_KEY_DOWN, _on_key_down, &data);

2
src/examples/evas/evas-vg-simple.c
View File

@ -204,7 +204,7 @@ vector_set(int x, int y, int w, int h)
root_node = evas_object_vg_root_node_get(d.vg);
// check if the dupe is working properly or not
eo_parent_set(beginning, root_node);
efl_parent_set(beginning, root_node);
tmp_vg = root;
root = beginning;

4
src/lib/ecore/ecore.c
View File

@ -363,7 +363,7 @@ ecore_shutdown(void)
}
#endif
eo_del(_mainloop_singleton);
efl_del(_mainloop_singleton);
_mainloop_singleton = NULL;
if (_ecore_fps_debug) _ecore_fps_debug_shutdown();
@ -409,7 +409,7 @@ ecore_shutdown(void)
if (vpath)
{
eo_del(vpath);
efl_del(vpath);
vpath = NULL;
}

14
src/lib/ecore/ecore_exe.c
View File

@ -94,15 +94,15 @@ _ecore_exe_command_get(Eo *obj EINA_UNUSED, Ecore_Exe_Data *pd, const char **cmd
}
EOLIAN static Eo *
_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe)
_ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe)
{
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
obj = eo_finalize(eo_super(obj, MY_CLASS));
obj = efl_finalize(eo_super(obj, MY_CLASS));
if (!obj)
return obj;
return _impl_ecore_exe_eo_base_finalize(obj, exe);
return _impl_ecore_exe_efl_object_finalize(obj, exe);
}
EAPI void
@ -210,17 +210,17 @@ ecore_exe_free(Ecore_Exe *obj)
return NULL;
void *data = exe->data;
eo_del(obj);
efl_del(obj);
return data;
}
EOLIAN static void
_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe)
_ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe)
{
eo_destructor(eo_super(obj, ECORE_EXE_CLASS));
efl_destructor(eo_super(obj, ECORE_EXE_CLASS));
_impl_ecore_exe_eo_base_destructor(obj, exe);
_impl_ecore_exe_efl_object_destructor(obj, exe);
}
EAPI void

8
src/lib/ecore/ecore_exe.eo
View File

@ -13,7 +13,7 @@ struct Ecore.Exe.Event_Data.Line
*/
struct Ecore.Exe.Event_Data
{
exe: Eo.Base; [[The handle to the process. FIXME: should actually be Ecore.Exe, workaround cyclic]]
exe: Efl.Object; [[The handle to the process. FIXME: should actually be Ecore.Exe, workaround cyclic]]
data: void_ptr; [[the raw binary data from the child process that was received]]
size: int; [[the size of this data in bytes]]
lines: Ecore.Exe.Event_Data.Line *; [[an array of line data if line buffered, the last one has it's line member set to $NULL]]
@ -37,7 +37,7 @@ enum Ecore.Exe_Flags
term_with_parent = 512 [[Makes child receive SIGTERM when parent dies.]]
}
class Ecore.Exe (Eo.Base, Efl.Control)
class Ecore.Exe (Efl.Object, Efl.Control)
{
[[Ecore.Exe is responsible for managing portable process spawning.
@ -64,8 +64,8 @@ class Ecore.Exe (Eo.Base, Efl.Control)
}
}
implements {
Eo.Base.destructor;
Eo.Base.finalize;
Efl.Object.destructor;
Efl.Object.finalize;
Efl.Control.suspend.set;
}
constructors {

8
src/lib/ecore/ecore_exe_posix.c
View File

@ -228,7 +228,7 @@ _impl_ecore_exe_run_priority_get(void)
}
Eo *
_impl_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe)
_impl_ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe)
{
int statusPipe[2] = { -1, -1 };
int errorPipe[2] = { -1, -1 };
@ -727,7 +727,7 @@ _impl_ecore_exe_event_data_get(Ecore_Exe *obj,
}
void
_impl_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe)
_impl_ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe)
{
void *data;
int ok = 0;
@ -1068,7 +1068,7 @@ _ecore_exe_data_generic_handler(void *data,
Ecore_Exe *obj = data;
int child_fd;
int event_type;
const Eo_Event_Description *eo_event = NULL;
const Efl_Event_Description *eo_event = NULL;
Ecore_Exe_Data *exe = eo_data_scope_get(obj, MY_CLASS);
@ -1167,7 +1167,7 @@ _ecore_exe_data_generic_handler(void *data,
ecore_event_add(event_type, e,
_ecore_exe_event_exe_data_free,
NULL);
eo_event_callback_call(obj, eo_event, e);
efl_event_callback_call(obj, eo_event, e);
}
}
}

4
src/lib/ecore/ecore_exe_private.h
View File

@ -154,11 +154,11 @@ void _ecore_exe_event_add_free(void *data EINA_UNUSED, void *ev);
void _impl_ecore_exe_run_priority_set(int pri);
int _impl_ecore_exe_run_priority_get(void);
void _impl_ecore_exe_auto_limits_set(Ecore_Exe *obj, Ecore_Exe_Data *exe, int start_bytes, int end_bytes, int start_lines, int end_lines);
Eo *_impl_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe);
Eo *_impl_ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe);
void _impl_ecore_exe_efl_control_suspend_set(Eo *obj EINA_UNUSED, Ecore_Exe_Data *exe, Eina_Bool suspend);
Eina_Bool _impl_ecore_exe_send(Ecore_Exe *obj, Ecore_Exe_Data *exe, const void *data, int size);
Ecore_Exe_Event_Data *_impl_ecore_exe_event_data_get(Ecore_Exe *obj, Ecore_Exe_Data *exe, Ecore_Exe_Flags flags);
void _impl_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe);
void _impl_ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe);
void _impl_ecore_exe_pause(Ecore_Exe *obj, Ecore_Exe_Data *exe);
void _impl_ecore_exe_continue(Ecore_Exe *obj, Ecore_Exe_Data *exe);
void _impl_ecore_exe_interrupt(Ecore_Exe *obj, Ecore_Exe_Data *exe);

8
src/lib/ecore/ecore_exe_win32.c
View File

@ -158,7 +158,7 @@ _ecore_exe_pipe_read_thread_cb(void *data)
ecore_event_add(ECORE_EXE_EVENT_DATA, event_data,
_ecore_exe_event_exe_data_free,
NULL);
eo_event_callback_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data);
efl_event_callback_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data);
}
current_buf = NULL;
@ -228,7 +228,7 @@ _ecore_exe_pipe_error_thread_cb(void *data)
ecore_event_add(ECORE_EXE_EVENT_ERROR, event_data,
_ecore_exe_event_exe_data_free,
NULL);
eo_event_callback_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data);
efl_event_callback_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data);
}
current_buf = NULL;
@ -379,7 +379,7 @@ _impl_ecore_exe_run_priority_get(void)
}
Eo *
_impl_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe)
_impl_ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe)
{
char exe_cmd_buf[32768];
SECURITY_ATTRIBUTES sa;
@ -689,7 +689,7 @@ _impl_ecore_exe_event_data_get(Ecore_Exe *obj,
}
void
_impl_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe)
_impl_ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe)
{
void *data;

8
src/lib/ecore/ecore_idle_enterer.c
View File

@ -11,7 +11,7 @@
EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_enterer_callbacks,
{ EFL_LOOP_EVENT_IDLE_ENTER, _ecore_factorized_idle_process },
{ EO_EVENT_DEL, _ecore_factorized_idle_event_del });
{ EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
EAPI Ecore_Idle_Enterer *
@ -30,8 +30,8 @@ ecore_idle_enterer_before_add(Ecore_Task_Cb func,
// This avoid us duplicating code and should only be slightly slower
// due to a useless cycle of callback registration
eo_event_callback_array_del(_mainloop_singleton, ecore_idle_enterer_callbacks(), ie);
eo_event_callback_array_priority_add(_mainloop_singleton, ecore_idle_enterer_callbacks(), EO_CALLBACK_PRIORITY_BEFORE, ie);
efl_event_callback_array_del(_mainloop_singleton, ecore_idle_enterer_callbacks(), ie);
efl_event_callback_array_priority_add(_mainloop_singleton, ecore_idle_enterer_callbacks(), EO_CALLBACK_PRIORITY_BEFORE, ie);
return ie;
}
@ -45,5 +45,5 @@ ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer)
void
_ecore_idle_enterer_call(Eo *loop)
{
eo_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL);
efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL);
}

4
src/lib/ecore/ecore_idle_exiter.c
View File

@ -11,7 +11,7 @@
EO_CALLBACKS_ARRAY_DEFINE(ecore_idle_exiter_callbacks,
{ EFL_LOOP_EVENT_IDLE_EXIT, _ecore_factorized_idle_process },
{ EO_EVENT_DEL, _ecore_factorized_idle_event_del });
{ EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
EAPI Ecore_Idle_Exiter *
ecore_idle_exiter_add(Ecore_Task_Cb func,
@ -29,5 +29,5 @@ ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter)
void
_ecore_idle_exiter_call(Eo *loop)
{
eo_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
}

12
src/lib/ecore/ecore_idler.c
View File

@ -14,7 +14,7 @@ struct _Ecore_Factorized_Idle
Ecore_Task_Cb func;
void *data;
const Eo_Callback_Array_Item *desc;
const Efl_Callback_Array_Item *desc;
short references;
Eina_Bool delete_me : 1;
@ -55,7 +55,7 @@ _ecore_factorized_idle_del(Ecore_Idler *idler)
return idler->data;
}
eo_event_callback_array_del(_mainloop_singleton, idler->desc, idler);
efl_event_callback_array_del(_mainloop_singleton, idler->desc, idler);
data = idler->data;
free(idler);
@ -63,7 +63,7 @@ _ecore_factorized_idle_del(Ecore_Idler *idler)
}
Ecore_Factorized_Idle *
_ecore_factorized_idle_add(const Eo_Callback_Array_Item *desc,
_ecore_factorized_idle_add(const Efl_Callback_Array_Item *desc,
Ecore_Task_Cb func,
const void *data)
{
@ -89,7 +89,7 @@ _ecore_factorized_idle_add(const Eo_Callback_Array_Item *desc,
ret->references = 0;
ret->delete_me = EINA_FALSE;
eo_event_callback_array_add(_mainloop_singleton, desc, ret);
efl_event_callback_array_add(_mainloop_singleton, desc, ret);
return ret;
}
@ -98,7 +98,7 @@ _ecore_factorized_idle_add(const Eo_Callback_Array_Item *desc,
EO_CALLBACKS_ARRAY_DEFINE(ecore_idler_callbacks,
{ EFL_LOOP_EVENT_IDLE, _ecore_factorized_idle_process },
{ EO_EVENT_DEL, _ecore_factorized_idle_event_del });
{ EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
EAPI Ecore_Idler *
ecore_idler_add(Ecore_Task_Cb func,
@ -116,7 +116,7 @@ ecore_idler_del(Ecore_Idler *idler)
void
_ecore_idler_all_call(Eo *loop)
{
eo_event_callback_call(loop, EFL_LOOP_EVENT_IDLE, NULL);
efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE, NULL);
}
int

48
src/lib/ecore/ecore_main.c
View File

@ -2717,7 +2717,7 @@ err :
Eo *_mainloop_singleton = NULL;
EOLIAN static Efl_Loop *
_efl_loop_main_get(Eo_Class *klass EINA_UNUSED, void *_pd EINA_UNUSED)
_efl_loop_main_get(Efl_Class *klass EINA_UNUSED, void *_pd EINA_UNUSED)
{
if (!_mainloop_singleton)
{
@ -2758,23 +2758,23 @@ _efl_loop_quit(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd EINA_UNUSED, unsigned char
_ecore_exit_code = exit_code;
}
EOLIAN static Eo_Base *
_efl_loop_eo_base_provider_find(Eo *obj, Efl_Loop_Data *pd, const Eo_Base *klass)
EOLIAN static Efl_Object *
_efl_loop_efl_object_provider_find(Eo *obj, Efl_Loop_Data *pd, const Efl_Object *klass)
{
Eo_Base *r;
Efl_Object *r;
if (klass == EFL_LOOP_CLASS) return obj;
r = eina_hash_find(pd->providers, &klass);
if (r) return r;
return eo_provider_find(eo_super(obj, EFL_LOOP_CLASS), klass);
return efl_provider_find(eo_super(obj, EFL_LOOP_CLASS), klass);
}
static void
_check_event_catcher_add(void *data, const Eo_Event *event)
{
const Eo_Callback_Array_Item *array = event->info;
const Efl_Callback_Array_Item *array = event->info;
Efl_Loop_Data *pd = data;
int i;
@ -2790,7 +2790,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
static void
_check_event_catcher_del(void *data, const Eo_Event *event)
{
const Eo_Callback_Array_Item *array = event->info;
const Efl_Callback_Array_Item *array = event->info;
Efl_Loop_Data *pd = data;
int i;
@ -2804,16 +2804,16 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
}
EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch,
{ EO_EVENT_CALLBACK_ADD, _check_event_catcher_add },
{ EO_EVENT_CALLBACK_DEL, _check_event_catcher_del });
{ EFL_EVENT_CALLBACK_ADD, _check_event_catcher_add },
{ EFL_EVENT_CALLBACK_DEL, _check_event_catcher_del });
EOLIAN static Eo_Base *
_efl_loop_eo_base_constructor(Eo *obj, Efl_Loop_Data *pd)
EOLIAN static Efl_Object *
_efl_loop_efl_object_constructor(Eo *obj, Efl_Loop_Data *pd)
{
obj = eo_constructor(eo_super(obj, EFL_LOOP_CLASS));
obj = efl_constructor(eo_super(obj, EFL_LOOP_CLASS));
if (!obj) return NULL;
eo_event_callback_array_add(obj, event_catcher_watch(), pd);
efl_event_callback_array_add(obj, event_catcher_watch(), pd);
pd->providers = eina_hash_pointer_new((void*) eo_unref);
@ -2821,9 +2821,9 @@ _efl_loop_eo_base_constructor(Eo *obj, Efl_Loop_Data *pd)
}
EOLIAN static void
_efl_loop_eo_base_destructor(Eo *obj, Efl_Loop_Data *pd)
_efl_loop_efl_object_destructor(Eo *obj, Efl_Loop_Data *pd)
{
eo_destructor(eo_super(obj, EFL_LOOP_CLASS));
efl_destructor(eo_super(obj, EFL_LOOP_CLASS));
eina_hash_free(pd->providers);
}
@ -2873,7 +2873,7 @@ _efl_loop_arguments_send(void *data, void *value EINA_UNUSED)
arge.initialization = initialization;
initialization = EINA_FALSE;
eo_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge);
efl_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge);
_efl_loop_arguments_cleanup(arga);
}
@ -2907,7 +2907,7 @@ static void _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED);
EO_CALLBACKS_ARRAY_DEFINE(timeout,
{ EFL_LOOP_TIMER_EVENT_TICK, _efl_loop_timeout_cb },
{ EO_EVENT_DEL, _efl_loop_timeout_force_cancel_cb });
{ EFL_EVENT_DEL, _efl_loop_timeout_force_cancel_cb });
/* This event will be triggered when the main loop is destroyed and destroy its timers along */
static void _efl_loop_internal_cancel(Efl_Internal_Promise *p);
@ -2925,8 +2925,8 @@ _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED)
eina_promise_owner_value_set(t->promise, t->data, NULL);
eo_event_callback_array_del(t->u.timer, timeout(), t);
eo_del(t->u.timer);
efl_event_callback_array_del(t->u.timer, timeout(), t);
efl_del(t->u.timer);
}
static void
@ -2947,8 +2947,8 @@ _efl_loop_job_cancel(void* data, Eina_Promise_Owner* promise EINA_UNUSED)
}
else
{
eo_event_callback_array_del(j->u.timer, timeout(), j);
eo_del(j->u.timer);
efl_event_callback_array_del(j->u.timer, timeout(), j);
efl_del(j->u.timer);
}
_efl_loop_internal_cancel(j);
@ -3009,7 +3009,7 @@ _efl_loop_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, double time, const voi
t->job_is = EINA_FALSE;
t->u.timer = eo_add(EFL_LOOP_TIMER_CLASS, obj,
efl_loop_timer_interval_set(eo_self, time),
eo_event_callback_array_add(eo_self, timeout(), t));
efl_event_callback_array_add(eo_self, timeout(), t));
if (!t->u.timer) goto on_error;
@ -3023,7 +3023,7 @@ _efl_loop_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, double time, const voi
}
static Eina_Bool
_efl_loop_register(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Eo_Class *klass, const Eo_Base *provider)
_efl_loop_register(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Efl_Class *klass, const Efl_Object *provider)
{
// The passed object does not provide that said class.
if (!eo_isa(provider, klass)) return EINA_FALSE;
@ -3034,7 +3034,7 @@ _efl_loop_register(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Eo_Class *klass
}
static Eina_Bool
_efl_loop_unregister(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Eo_Class *klass, const Eo_Base *provider)
_efl_loop_unregister(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, const Efl_Class *klass, const Efl_Object *provider)
{
return eina_hash_del(pd->providers, &klass, provider);
}

2
src/lib/ecore/ecore_parent.eo
View File

@ -1,4 +1,4 @@
class Ecore.Parent (Eo.Base)
class Ecore.Parent (Efl.Object)
{
data: null;
}

14
src/lib/ecore/ecore_poller.c
View File

@ -173,7 +173,7 @@ _ecore_poller_cb_timer(void *data EINA_UNUSED)
{
pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(poller));
eo_parent_set(poller->obj, NULL);
efl_parent_set(poller->obj, NULL);
if (eo_destructed_is(poller->obj))
eo_manual_free(poller->obj);
else
@ -351,7 +351,7 @@ ecore_poller_del(Ecore_Poller *obj)
data = poller->data;
pollers[poller->ibit] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
eo_parent_set(poller->obj, NULL);
efl_parent_set(poller->obj, NULL);
if (eo_destructed_is(poller->obj))
eo_manual_free(obj);
else
@ -362,7 +362,7 @@ ecore_poller_del(Ecore_Poller *obj)
}
EOLIAN static void
_ecore_poller_eo_base_destructor(Eo *obj, Ecore_Poller_Data *pd)
_ecore_poller_efl_object_destructor(Eo *obj, Ecore_Poller_Data *pd)
{
if (!pd->delete_me)
{
@ -370,18 +370,18 @@ _ecore_poller_eo_base_destructor(Eo *obj, Ecore_Poller_Data *pd)
poller_delete_count++;
}
eo_destructor(eo_super(obj, MY_CLASS));
efl_destructor(eo_super(obj, MY_CLASS));
}
EOLIAN static Eo *
_ecore_poller_eo_base_finalize(Eo *obj, Ecore_Poller_Data *pd)
_ecore_poller_efl_object_finalize(Eo *obj, Ecore_Poller_Data *pd)
{
if (!pd->func)
{
return NULL;
}
return eo_finalize(eo_super(obj, MY_CLASS));
return efl_finalize(eo_super(obj, MY_CLASS));
}
void
@ -395,7 +395,7 @@ _ecore_poller_shutdown(void)
while ((poller = pollers[i]))
{
pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(pollers[i]));
eo_parent_set(poller->obj, NULL);
efl_parent_set(poller->obj, NULL);
if (eo_destructed_is(poller->obj))
eo_manual_free(poller->obj);
else

6
src/lib/ecore/ecore_poller.eo
View File

@ -7,7 +7,7 @@ enum Ecore.Poller_Type
core = 0 [[The core poller interval]]
}
class Ecore.Poller (Eo.Base)
class Ecore.Poller (Efl.Object)
{
[[Ecore poller provides infrastructure for the creation of pollers.
@ -53,8 +53,8 @@ class Ecore.Poller (Eo.Base)
}
}
implements {
Eo.Base.destructor;
Eo.Base.finalize;
Efl.Object.destructor;
Efl.Object.finalize;
}
constructors {
.constructor;

4
src/lib/ecore/ecore_private.h
View File

@ -163,7 +163,7 @@ int _efl_loop_timers_exists(void);
int _efl_loop_timer_expired_call(double when);
Ecore_Factorized_Idle *_ecore_factorized_idle_add(const Eo_Callback_Array_Item*desc,
Ecore_Factorized_Idle *_ecore_factorized_idle_add(const Efl_Callback_Array_Item*desc,
Ecore_Task_Cb func,
const void *data);
void *_ecore_factorized_idle_del(Ecore_Idler *idler);
@ -369,7 +369,7 @@ extern Eo *_mainloop_singleton;
extern Eo *_ecore_parent;
extern Efl_Version _app_efl_version;
#define ECORE_PARENT_CLASS ecore_parent_class_get()
EAPI const Eo_Class *ecore_parent_class_get(void) EINA_CONST;
EAPI const Efl_Class *ecore_parent_class_get(void) EINA_CONST;
// access to direct input cb
#define ECORE_EVAS_INTERNAL

64
src/lib/ecore/ecore_timer.c
View File

@ -77,7 +77,7 @@ ecore_timer_precision_set(double value)
static void
_check_timer_event_catcher_add(void *data, const Eo_Event *event)
{
const Eo_Callback_Array_Item *array = event->info;
const Efl_Callback_Array_Item *array = event->info;
Efl_Loop_Timer_Data *timer = data;
int i;
@ -97,7 +97,7 @@ _check_timer_event_catcher_add(void *data, const Eo_Event *event)
static void
_check_timer_event_catcher_del(void *data, const Eo_Event *event)
{
const Eo_Callback_Array_Item *array = event->info;
const Efl_Callback_Array_Item *array = event->info;
Efl_Loop_Timer_Data *timer = data;
int i;
@ -113,17 +113,17 @@ _check_timer_event_catcher_del(void *data, const Eo_Event *event)
}
EO_CALLBACKS_ARRAY_DEFINE(timer_watch,
{ EO_EVENT_CALLBACK_ADD, _check_timer_event_catcher_add },
{ EO_EVENT_CALLBACK_DEL, _check_timer_event_catcher_del });
{ EFL_EVENT_CALLBACK_ADD, _check_timer_event_catcher_add },
{ EFL_EVENT_CALLBACK_DEL, _check_timer_event_catcher_del });
EOLIAN static Eo *
_efl_loop_timer_eo_base_constructor(Eo *obj, Efl_Loop_Timer_Data *timer)
_efl_loop_timer_efl_object_constructor(Eo *obj, Efl_Loop_Timer_Data *timer)
{
eo_constructor(eo_super(obj, MY_CLASS));
efl_constructor(eo_super(obj, MY_CLASS));
eo_event_callback_array_add(obj, timer_watch(), timer);
efl_event_callback_array_add(obj, timer_watch(), timer);
eo_wref_add(obj, &timer->object);
efl_wref_add(obj, &timer->object);
timer->at = ecore_time_get();
timer->initialized = 0;
@ -133,11 +133,11 @@ _efl_loop_timer_eo_base_constructor(Eo *obj, Efl_Loop_Timer_Data *timer)
EOLIAN static Eo *
_efl_loop_timer_eo_base_finalize(Eo *obj, Efl_Loop_Timer_Data *pd)
_efl_loop_timer_efl_object_finalize(Eo *obj, Efl_Loop_Timer_Data *pd)
{
_efl_loop_timer_util_instanciate(pd);
return eo_finalize(eo_super(obj, MY_CLASS));
return efl_finalize(eo_super(obj, MY_CLASS));
}
typedef struct _Ecore_Timer_Legacy Ecore_Timer_Legacy;
@ -167,14 +167,14 @@ _ecore_timer_legacy_tick(void *data, const Eo_Event *event)
legacy->inside_call = 1;
if (!_ecore_call_task_cb(legacy->func, (void*)legacy->data) ||
legacy->delete_me)
eo_del(event->object);
efl_del(event->object);
else
legacy->inside_call = 0;
}
EO_CALLBACKS_ARRAY_DEFINE(legacy_timer,
{ EFL_LOOP_TIMER_EVENT_TICK, _ecore_timer_legacy_tick },
{ EO_EVENT_DEL, _ecore_timer_legacy_del });
{ EFL_EVENT_DEL, _ecore_timer_legacy_del });
EAPI Ecore_Timer *
ecore_timer_add(double in,
@ -191,8 +191,8 @@ ecore_timer_add(double in,
legacy->func = func;
legacy->data = data;
timer = eo_add(MY_CLASS, ecore_main_loop_get(),
eo_event_callback_array_add(eo_self, legacy_timer(), legacy),
eo_key_data_set(eo_self, "_legacy", legacy),
efl_event_callback_array_add(eo_self, legacy_timer(), legacy),
efl_key_data_set(eo_self, "_legacy", legacy),
efl_loop_timer_interval_set(eo_self, in));
return timer;
@ -213,8 +213,8 @@ ecore_timer_loop_add(double in,
legacy->func = func;
legacy->data = data;
timer = eo_add(MY_CLASS, ecore_main_loop_get(),
eo_event_callback_array_add(eo_self, legacy_timer(), legacy),
eo_key_data_set(eo_self, "_legacy", legacy),
efl_event_callback_array_add(eo_self, legacy_timer(), legacy),
efl_key_data_set(eo_self, "_legacy", legacy),
efl_loop_timer_loop_reset(eo_self),
efl_loop_timer_interval_set(eo_self, in));
@ -230,7 +230,7 @@ ecore_timer_del(Ecore_Timer *timer)
if (!timer) return NULL;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
legacy = eo_key_data_get(timer, "_legacy");
legacy = efl_key_data_get(timer, "_legacy");
// If legacy == NULL, this means double free or something
if (legacy == NULL)
{
@ -245,7 +245,7 @@ ecore_timer_del(Ecore_Timer *timer)
if (legacy->inside_call)
legacy->delete_me = EINA_TRUE;
else
eo_del(timer);
efl_del(timer);
return data;
}
@ -346,17 +346,17 @@ ecore_timer_freeze(Ecore_Timer *timer)
{
EINA_MAIN_LOOP_CHECK_RETURN;
ECORE_TIMER_CHECK(timer);
eo_event_freeze(timer);
efl_event_freeze(timer);
}
EOLIAN static void
_efl_loop_timer_eo_base_event_freeze(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
_efl_loop_timer_efl_object_event_freeze(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
{
double now;
EINA_MAIN_LOOP_CHECK_RETURN;
eo_event_freeze(eo_super(obj, MY_CLASS));
efl_event_freeze(eo_super(obj, MY_CLASS));
/* Timer already frozen */
if (timer->frozen)
@ -377,12 +377,12 @@ ecore_timer_freeze_get(Ecore_Timer *timer)
int r = 0;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE);
r = eo_event_freeze_count_get(timer);
r = efl_event_freeze_count_get(timer);
return !!r;
}
EOLIAN static int
_efl_loop_timer_eo_base_event_freeze_count_get(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
_efl_loop_timer_efl_object_event_freeze_count_get(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
{
EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
@ -394,17 +394,17 @@ ecore_timer_thaw(Ecore_Timer *timer)
{
EINA_MAIN_LOOP_CHECK_RETURN;
ECORE_TIMER_CHECK(timer);
eo_event_thaw(timer);
efl_event_thaw(timer);
}
EOLIAN static void
_efl_loop_timer_eo_base_event_thaw(Eo *obj, Efl_Loop_Timer_Data *timer)
_efl_loop_timer_efl_object_event_thaw(Eo *obj, Efl_Loop_Timer_Data *timer)
{
double now;
EINA_MAIN_LOOP_CHECK_RETURN;
eo_event_thaw(eo_super(obj, MY_CLASS));
efl_event_thaw(eo_super(obj, MY_CLASS));
/* Timer not frozen */
if (!timer->frozen)
@ -469,7 +469,7 @@ _efl_loop_timer_util_delay(Efl_Loop_Timer_Data *timer,
}
EOLIAN static void
_efl_loop_timer_eo_base_parent_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *pd, Eo_Base *parent)
_efl_loop_timer_efl_object_parent_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *pd, Efl_Object *parent)
{
Eina_Inlist *first;
@ -479,9 +479,9 @@ _efl_loop_timer_eo_base_parent_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *pd,
else if (first == suspended)
suspended = eina_inlist_remove(suspended, EINA_INLIST_GET(pd));
eo_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent);
efl_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent);
if (eo_parent_get(obj) != parent)
if (efl_parent_get(obj) != parent)
return ;
if (parent != NULL)
@ -496,7 +496,7 @@ _efl_loop_timer_eo_base_parent_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *pd,
}
EOLIAN static void
_efl_loop_timer_eo_base_destructor(Eo *obj, Efl_Loop_Timer_Data *pd)
_efl_loop_timer_efl_object_destructor(Eo *obj, Efl_Loop_Timer_Data *pd)
{
Eina_Inlist *first;
@ -511,7 +511,7 @@ _efl_loop_timer_eo_base_destructor(Eo *obj, Efl_Loop_Timer_Data *pd)
else if (first == suspended)
suspended = eina_inlist_remove(suspended, EINA_INLIST_GET(pd));
eo_destructor(eo_super(obj, MY_CLASS));
efl_destructor(eo_super(obj, MY_CLASS));
}
void
@ -658,7 +658,7 @@ _efl_loop_timer_expired_call(double when)
eo_ref(timer->object);
eina_evlog("+timer", timer, 0.0, NULL);
eo_event_callback_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL);
efl_event_callback_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL);
eina_evlog("-timer", timer, 0.0, NULL);
/* may have changed in recursive main loops */

16
src/lib/ecore/efl_loop.eo
View File

@ -5,7 +5,7 @@ struct Efl.Loop.Arguments {
initialization: bool; [[Set to true when the program should initialize its internal state. This happen once per process instance.]]
}
class Efl.Loop (Eo.Base)
class Efl.Loop (Efl.Object)
{
[[The Efl Main Loop
@ -86,16 +86,16 @@ class Efl.Loop (Eo.Base)
register {
[[Will register a manager of a specific class to be answered by eo.provider_find.]]
params {
@in klass: const(Eo.Class); [[The class provided by the registered provider.]]
@in provider: const(Eo.Base); [[The provider for the newly registered class that has to provide that said Eo.Class.]]
@in klass: const(Efl.Class); [[The class provided by the registered provider.]]
@in provider: const(Efl.Object); [[The provider for the newly registered class that has to provide that said Efl.Class.]]
}
return: bool; [[true if successfully register, false otherwise.]]
}
unregister {
[[Will unregister a manager of a specific class that was previously registered and answered by eo.provider_find.]]
params {
@in klass: const(Eo.Class); [[The class provided by the provider to unregister for.]]
@in provider: const(Eo.Base); [[The provider for the registered class to unregister.]]
@in klass: const(Efl.Class); [[The class provided by the provider to unregister for.]]
@in provider: const(Efl.Object); [[The provider for the registered class to unregister.]]
}
return: bool; [[true if successfully unregistered, false otherwise.]]
}
@ -107,8 +107,8 @@ class Efl.Loop (Eo.Base)
arguments: Efl.Loop.Arguments; [[Event happens when args are provided to the loop by args_add().]]
}
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Eo.Base.provider_find;
Efl.Object.constructor;
Efl.Object.destructor;
Efl.Object.provider_find;
}
}

30
src/lib/ecore/efl_loop_fd.c
View File

@ -31,15 +31,15 @@ _efl_loop_fd_read_cb(void *data, Ecore_Fd_Handler *fd_handler)
if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
{
eo_event_callback_call(obj, EFL_LOOP_FD_EVENT_READ, NULL);
efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_READ, NULL);
}
if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
{
eo_event_callback_call(obj, EFL_LOOP_FD_EVENT_WRITE, NULL);
efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_WRITE, NULL);
}
if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR))
{
eo_event_callback_call(obj, EFL_LOOP_FD_EVENT_ERROR, NULL);
efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_ERROR, NULL);
}
return ECORE_CALLBACK_RENEW;
@ -95,7 +95,7 @@ _efl_loop_fd_fd_file_get(Eo *obj EINA_UNUSED, Efl_Loop_Fd_Data *pd)
static void
_check_fd_event_catcher_add(void *data, const Eo_Event *event)
{
const Eo_Callback_Array_Item *array = event->info;
const Efl_Callback_Array_Item *array = event->info;
Efl_Loop_Fd_Data *fd = data;
int i;
@ -122,7 +122,7 @@ _check_fd_event_catcher_add(void *data, const Eo_Event *event)
static void
_check_fd_event_catcher_del(void *data, const Eo_Event *event)
{
const Eo_Callback_Array_Item *array = event->info;
const Efl_Callback_Array_Item *array = event->info;
Efl_Loop_Fd_Data *fd = data;
int i;
@ -147,15 +147,15 @@ _check_fd_event_catcher_del(void *data, const Eo_Event *event)
}
EO_CALLBACKS_ARRAY_DEFINE(fd_watch,
{ EO_EVENT_CALLBACK_ADD, _check_fd_event_catcher_add },
{ EO_EVENT_CALLBACK_DEL, _check_fd_event_catcher_del });
{ EFL_EVENT_CALLBACK_ADD, _check_fd_event_catcher_add },
{ EFL_EVENT_CALLBACK_DEL, _check_fd_event_catcher_del });
static Eo_Base *
_efl_loop_fd_eo_base_constructor(Eo *obj, Efl_Loop_Fd_Data *pd)
static Efl_Object *
_efl_loop_fd_efl_object_constructor(Eo *obj, Efl_Loop_Fd_Data *pd)
{
eo_constructor(eo_super(obj, MY_CLASS));
efl_constructor(eo_super(obj, MY_CLASS));
eo_event_callback_array_add(obj, fd_watch(), pd);
efl_event_callback_array_add(obj, fd_watch(), pd);
pd->fd = -1;
@ -163,12 +163,12 @@ _efl_loop_fd_eo_base_constructor(Eo *obj, Efl_Loop_Fd_Data *pd)
}
static void
_efl_loop_fd_eo_base_parent_set(Eo *obj, Efl_Loop_Fd_Data *pd, Eo_Base *parent)
_efl_loop_fd_efl_object_parent_set(Eo *obj, Efl_Loop_Fd_Data *pd, Efl_Object *parent)
{
if (pd->handler) ecore_main_fd_handler_del(pd->handler);
pd->handler = NULL;
eo_parent_set(eo_super(obj, MY_CLASS), parent);
efl_parent_set(eo_super(obj, MY_CLASS), parent);
if (parent == NULL) return ;
@ -176,9 +176,9 @@ _efl_loop_fd_eo_base_parent_set(Eo *obj, Efl_Loop_Fd_Data *pd, Eo_Base *parent)
}
static void
_efl_loop_fd_eo_base_destructor(Eo *obj, Efl_Loop_Fd_Data *pd)
_efl_loop_fd_efl_object_destructor(Eo *obj, Efl_Loop_Fd_Data *pd)
{
eo_destructor(eo_super(obj, MY_CLASS));
efl_destructor(eo_super(obj, MY_CLASS));
ecore_main_fd_handler_del(pd->handler);
}

6
src/lib/ecore/efl_loop_fd.eo
View File

@ -39,8 +39,8 @@ class Efl.Loop.Fd (Efl.Loop_User)
error;
}
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Eo.Base.parent.set;
Efl.Object.constructor;
Efl.Object.destructor;
Efl.Object.parent.set;
}
}

14
src/lib/ecore/efl_loop_timer.eo
View File

@ -59,11 +59,11 @@ class Efl.Loop.Timer (Efl.Loop_User)
tick; [[Event triggered when the specified time as passed.]]
}
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Eo.Base.finalize;
Eo.Base.event_freeze;
Eo.Base.parent.set;
Efl.Object.constructor;
Efl.Object.destructor;
Efl.Object.finalize;
Efl.Object.event_freeze;
Efl.Object.parent.set;
/* XXX: can't document overridden methods
* Pauses a running timer.
*
@ -78,8 +78,8 @@ class Efl.Loop.Timer (Efl.Loop_User)
*
* @see ecore_timer_thaw()
*/
Eo.Base.event_freeze_count.get;
Eo.Base.event_thaw;
Efl.Object.event_freeze_count.get;
Efl.Object.event_thaw;
/* XXX: can't document overridden methods
* Resumes a frozen (paused) timer.
*

8
src/lib/ecore/efl_loop_user.c
View File

@ -14,16 +14,16 @@ struct _Efl_Loop_User_Data
static Efl_Loop *
_efl_loop_user_loop_get(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED)
{
return eo_provider_find(obj, EFL_LOOP_CLASS);
return efl_provider_find(obj, EFL_LOOP_CLASS);
}
static void
_efl_loop_user_eo_base_parent_set(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED, Eo_Base *parent)
_efl_loop_user_efl_object_parent_set(Eo *obj, Efl_Loop_User_Data *pd EINA_UNUSED, Efl_Object *parent)
{
if (parent != NULL && eo_provider_find(parent, EFL_LOOP_CLASS) == NULL)
if (parent != NULL && efl_provider_find(parent, EFL_LOOP_CLASS) == NULL)
return ;
eo_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent);
efl_parent_set(eo_super(obj, EFL_LOOP_USER_CLASS), parent);
}
#include "efl_loop_user.eo.c"

4
src/lib/ecore/efl_loop_user.eo
View File

@ -1,4 +1,4 @@
class Efl.Loop_User (Eo.Base)
class Efl.Loop_User (Efl.Object)
{
[[An Efl.Loop_User is a class that require one of the parent to provide
an Efl.Loop interface when doing provider_find. It will enforce this by
@ -9,6 +9,6 @@ class Efl.Loop_User (Eo.Base)
}
}
implements {
Eo.Base.parent.set;
Efl.Object.parent.set;
}
}

8
src/lib/ecore_audio/ecore_audio.eo
View File

@ -1,5 +1,5 @@
type @extern Ecore.Audio.Vio: __undefined_type; /* FIXME: Had function pointer members. */
type @extern eo_key_data_free_func: __undefined_type; /* FIXME: Function pointers not allowed. */
type @extern efl_key_data_free_func: __undefined_type; /* FIXME: Function pointers not allowed. */
enum Ecore.Audio.Format {
auto, [[Automatically detect the format (for inputs)]]
@ -11,7 +11,7 @@ enum Ecore.Audio.Format {
last [[Sentinel value, do not use]]
}
class Ecore.Audio (Eo.Base)
class Ecore.Audio (Efl.Object)
{
[[Convenience audio class.]]
@ -112,7 +112,7 @@ class Ecore.Audio (Eo.Base)
the function callbacks
]]
data: void_ptr; [[user data to pass to the VIO functions]]
free_func: eo_key_data_free_func; [[this function takes care to
free_func: efl_key_data_free_func; [[this function takes care to
clean up $data when he VIO is
destroyed. NULL means do
nothing.
@ -121,6 +121,6 @@ class Ecore.Audio (Eo.Base)
}
}
implements {
Eo.Base.constructor;
Efl.Object.constructor;
}
}

4
src/lib/ecore_audio/ecore_audio_in.eo
View File

@ -150,8 +150,8 @@ class Ecore.Audio.In (Ecore.Audio)
}
}
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Efl.Object.constructor;
Efl.Object.destructor;
Ecore.Audio.vio_set;
}
events {

2
src/lib/ecore_audio/ecore_audio_in_sndfile.eo
View File

@ -3,7 +3,7 @@ class Ecore.Audio.In.Sndfile (Ecore.Audio.In)
[[Ecore Audio sndfile input.]]
eo_prefix: ecore_audio_obj_in_sndfile;
implements {
Eo.Base.destructor;
Efl.Object.destructor;
Ecore.Audio.source.set;
Ecore.Audio.source.get;
Ecore.Audio.format.set;

4
src/lib/ecore_audio/ecore_audio_in_tone.eo
View File

@ -3,8 +3,8 @@ class Ecore.Audio.In.Tone (Ecore.Audio.In)
[[Ecore Audio tone input.]]
eo_prefix: ecore_audio_obj_in_tone;
implements {
Eo.Base.constructor;
Eo.Base.key_data;
Efl.Object.constructor;
Efl.Object.key_data;
Ecore.Audio.In.length.set;
Ecore.Audio.In.seek;
Ecore.Audio.In.read_internal;

4
src/lib/ecore_audio/ecore_audio_obj.c
View File

@ -55,10 +55,10 @@ _ecore_audio_volume_get(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Object *obj)
}
EOLIAN static Eo *
_ecore_audio_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Object *obj)
_ecore_audio_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Object *obj)
{
obj->volume = 1.0;
return eo_constructor(eo_super(eo_obj, MY_CLASS));
return efl_constructor(eo_super(eo_obj, MY_CLASS));
}
#include "ecore_audio.eo.c"

18
src/lib/ecore_audio/ecore_audio_obj_in.c
View File

@ -27,7 +27,7 @@ _ecore_audio_in_speed_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, double
obj->speed = speed;
eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
}
EOLIAN static double
@ -41,7 +41,7 @@ _ecore_audio_in_samplerate_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, i
{
obj->samplerate = samplerate;
eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
}
EOLIAN static int
@ -107,11 +107,11 @@ _ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len)
len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len);
if (len_read == 0) {
if (!obj->looped || !obj->seekable) {
eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL);
efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL);
} else {
ecore_audio_obj_in_seek(eo_obj, 0, SEEK_SET);
len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len);
eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL);
efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL);
}
}
@ -149,7 +149,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
}
EOLIAN static void
_ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func)
_ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func)
{
Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
@ -171,9 +171,9 @@ _ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Au
}
EOLIAN static Eo *
_ecore_audio_in_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Input *obj)
_ecore_audio_in_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Input *obj)
{
eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
obj->speed = 1.0;
@ -181,12 +181,12 @@ _ecore_audio_in_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Input *obj)
}
EOLIAN static void
_ecore_audio_in_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Input *obj)
_ecore_audio_in_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Input *obj)
{
if(obj->output)
ecore_audio_obj_out_input_detach(obj->output, eo_obj);
eo_destructor(eo_super(eo_obj, MY_CLASS));
efl_destructor(eo_super(eo_obj, MY_CLASS));
}
#include "ecore_audio_in.eo.c"

6
src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
View File

@ -145,7 +145,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
}
EOLIAN static void
_ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func)
_ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func)
{
Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
@ -199,7 +199,7 @@ _ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_D
}
EOLIAN static void
_ecore_audio_in_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj)
_ecore_audio_in_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj)
{
Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
@ -210,7 +210,7 @@ _ecore_audio_in_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Da
if (ea_obj->vio)
_free_vio(ea_obj);
eo_destructor(eo_super(eo_obj, MY_CLASS));
efl_destructor(eo_super(eo_obj, MY_CLASS));
}
#include "ecore_audio_in_sndfile.eo.c"

12
src/lib/ecore_audio/ecore_audio_obj_in_tone.c
View File

@ -83,34 +83,34 @@ _ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_D
}
EOLIAN static void
_ecore_audio_in_tone_eo_base_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key, const void *val)
_ecore_audio_in_tone_efl_object_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key, const void *val)
{
if (!key) return;
if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
obj->freq = *(int *)val;
} else {
eo_key_data_set(eo_super(eo_obj, MY_CLASS), key, val);
efl_key_data_set(eo_super(eo_obj, MY_CLASS), key, val);
}
}
EOLIAN static void *
_ecore_audio_in_tone_eo_base_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key)
_ecore_audio_in_tone_efl_object_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key)
{
if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
return (void *) (intptr_t) obj->freq;
} else {
return eo_key_data_get(eo_super(eo_obj, MY_CLASS), key);
return efl_key_data_get(eo_super(eo_obj, MY_CLASS), key);
}
}
EOLIAN static Eo *
_ecore_audio_in_tone_eo_base_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj)
_ecore_audio_in_tone_efl_object_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj)
{
Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
in_obj->channels = 1;
in_obj->samplerate = 44100;

2
src/lib/ecore_audio/ecore_audio_obj_in_tone.h
View File

@ -37,7 +37,7 @@ extern "C"
/**
* @brief The frequency of the tone in Hz
*
* Set with @ref eo_key_data_set()
* Set with @ref efl_key_data_set()
*/
#define ECORE_AUDIO_ATTR_TONE_FREQ "ecore_audio_freq"

10
src/lib/ecore_audio/ecore_audio_obj_out.c
View File

@ -113,7 +113,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
}
EOLIAN static void
_ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func)
_ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, efl_key_data_free_func free_func)
{
Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
@ -130,9 +130,9 @@ _ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UN
}
EOLIAN static Eo *
_ecore_audio_out_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Output *obj)
_ecore_audio_out_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Output *obj)
{
eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
obj->need_writer = EINA_TRUE;
@ -140,7 +140,7 @@ _ecore_audio_out_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Output *obj)
}
EOLIAN static void
_ecore_audio_out_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Output *obj)
_ecore_audio_out_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Output *obj)
{
Eina_List *cur, *tmp;
Eo *in;
@ -149,7 +149,7 @@ _ecore_audio_out_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Output *obj)
ecore_audio_obj_out_input_detach(eo_obj, in);
}
eo_destructor(eo_super(eo_obj, MY_CLASS));
efl_destructor(eo_super(eo_obj, MY_CLASS));
}
#include "ecore_audio_out.eo.c"

4
src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
View File

@ -293,7 +293,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_attach(Eo *obj, void *sd EINA_
}
/* Keep track of data for deallocation */
eo_key_data_set(input, "coreaudio_data", helper);
efl_key_data_set(input, "coreaudio_data", helper);
/* Start playing */
helper->is_playing = EINA_TRUE;
@ -325,7 +325,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_detach(Eo *obj, void *sd EINA_
DBG("Detach");
/* Free helper */
data = eo_key_data_get(input, "coreaudio_data");
data = efl_key_data_get(input, "coreaudio_data");
_core_audio_helper_free(data);
ret = ecore_audio_obj_out_input_detach(eo_super(obj, MY_CLASS), input);

28
src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
View File

@ -63,7 +63,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_
ecore_audio_obj_volume_set(eo_super(eo_obj, MY_CLASS), volume);
EINA_LIST_FOREACH(out_obj->inputs, input, in) {
stream = eo_key_data_get(in, "pulse_data");
stream = efl_key_data_get(in, "pulse_data");
idx = EPA_CALL(pa_stream_get_index)(stream);
EPA_CALL(pa_operation_unref)(EPA_CALL(pa_context_set_sink_input_volume)(class_vars.context, idx, &pa_volume, NULL, NULL));
}
@ -98,7 +98,7 @@ static void _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *event)
samplerate = ecore_audio_obj_in_samplerate_get(event->object);
speed = ecore_audio_obj_in_speed_get(event->object);
stream = eo_key_data_get(event->object, "pulse_data");
stream = efl_key_data_get(event->object, "pulse_data");
EPA_CALL(pa_operation_unref)(EPA_CALL(pa_stream_update_sample_rate)(stream, samplerate * speed, NULL, NULL));
}
@ -132,9 +132,9 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
return EINA_FALSE;
}
eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj);
efl_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj);
eo_key_data_set(in, "pulse_data", stream);
efl_key_data_set(in, "pulse_data", stream);
EPA_CALL(pa_stream_set_write_callback)(stream, _write_cb, in);
@ -149,7 +149,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
static void _delayed_attach_cb(void *data, const Eo_Event *event)
{
Eo *in = data;
eo_event_callback_del(event->object, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
efl_event_callback_del(event->object, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
_input_attach_internal(event->object, in);
}
@ -161,7 +161,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_
if (class_vars.state != PA_CONTEXT_READY) {
DBG("Delaying input_attach because PA context is not ready.");
eo_event_callback_add(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
efl_event_callback_add(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
} else {
retval = _input_attach_internal(eo_obj, in);
}
@ -188,7 +188,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_
if (!ret2)
return EINA_FALSE;
stream = eo_key_data_get(in, "pulse_data");
stream = efl_key_data_get(in, "pulse_data");
EPA_CALL(pa_stream_set_write_callback)(stream, NULL, NULL);
op = EPA_CALL(pa_stream_drain) (stream, _drain_cb, NULL);
@ -220,12 +220,12 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED)
if (state == PA_CONTEXT_READY) {
DBG("PA context ready.");
EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL);
efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL);
}
} else if ((state == PA_CONTEXT_FAILED) || (state == PA_CONTEXT_TERMINATED)) {
DBG("PA context fail.");
EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
}
} else {
DBG("Connection state %i", state);
@ -251,7 +251,7 @@ static void _state_job(void *data EINA_UNUSED)
}
// the callback here can delete things in the list..
EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
}
// now unref everything safely
EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) {
@ -262,14 +262,14 @@ static void _state_job(void *data EINA_UNUSED)
}
EOLIAN static Eo *
_ecore_audio_out_pulse_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
_ecore_audio_out_pulse_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
{
int argc;
char **argv;
Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
if (!EPA_LOAD()) return NULL;
eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
out_obj->need_writer = EINA_FALSE;
@ -293,10 +293,10 @@ _ecore_audio_out_pulse_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Dat
}
EOLIAN static void
_ecore_audio_out_pulse_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
_ecore_audio_out_pulse_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
{
class_vars.outputs = eina_list_remove(class_vars.outputs, eo_obj);
eo_destructor(eo_super(eo_obj, MY_CLASS));
efl_destructor(eo_super(eo_obj, MY_CLASS));
}
#include "ecore_audio_out_pulse.eo.c"

8
src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
View File

@ -162,11 +162,11 @@ _ecore_audio_out_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_Out_Sndf
}
EOLIAN static Eo *
_ecore_audio_out_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
_ecore_audio_out_sndfile_efl_object_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED)
{
Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
ecore_audio_obj_format_set(eo_obj, ECORE_AUDIO_FORMAT_OGG);
@ -176,7 +176,7 @@ _ecore_audio_out_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile
}
EOLIAN static void
_ecore_audio_out_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj)
_ecore_audio_out_sndfile_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj)
{
Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
@ -186,7 +186,7 @@ _ecore_audio_out_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_
if (out_obj->write_idler)
ecore_idler_del(out_obj->write_idler);
eo_destructor(eo_super(eo_obj, MY_CLASS));
efl_destructor(eo_super(eo_obj, MY_CLASS));
}
#include "ecore_audio_out_sndfile.eo.c"

4
src/lib/ecore_audio/ecore_audio_out.eo
View File

@ -34,8 +34,8 @@ class Ecore.Audio.Out (Ecore.Audio)
}
}
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Efl.Object.constructor;
Efl.Object.destructor;
Ecore.Audio.vio_set;
}
}

4
src/lib/ecore_audio/ecore_audio_out_pulse.eo
View File

@ -4,8 +4,8 @@ class Ecore.Audio.Out.Pulse (Ecore.Audio.Out)
eo_prefix: ecore_audio_obj_out_pulse;
event_prefix: ecore_audio_out_pulse;
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Efl.Object.constructor;
Efl.Object.destructor;
Ecore.Audio.volume.set;
Ecore.Audio.Out.input_attach;
Ecore.Audio.Out.input_detach;

4
src/lib/ecore_audio/ecore_audio_out_sndfile.eo
View File

@ -3,8 +3,8 @@ class Ecore.Audio.Out.Sndfile (Ecore.Audio.Out)
[[Ecore audio output to the sndfile library.]]
eo_prefix: ecore_audio_obj_out_sndfile;
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Efl.Object.constructor;
Efl.Object.destructor;
Ecore.Audio.source.get;
Ecore.Audio.source.set;
Ecore.Audio.format.get;

2
src/lib/ecore_audio/ecore_audio_private.h
View File

@ -94,7 +94,7 @@ struct _Ecore_Audio_Module
struct _Ecore_Audio_Vio_Internal {
Ecore_Audio_Vio *vio;
void *data;
eo_key_data_free_func free_func;
efl_key_data_free_func free_func;
};
typedef struct _Ecore_Audio_Vio_Internal Ecore_Audio_Vio_Internal;

42
src/lib/ecore_con/ecore_con.c
View File

@ -108,7 +108,7 @@ static void _ecore_con_lookup_done(void *data,
static const char *_ecore_con_pretty_ip(struct sockaddr *client_addr);
#define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \
if (eo_finalized_get(obj)) \
if (efl_finalized_get(obj)) \
{ \
ERR("This function is only allowed during construction."); \
return; \
@ -332,7 +332,7 @@ _efl_network_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char *n
return EINA_TRUE;
free(lk);
eo_del(obj);
efl_del(obj);
return EINA_FALSE;
}
@ -367,9 +367,9 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
}
EOLIAN static Eo *
_efl_network_server_eo_base_constructor(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr)
_efl_network_server_efl_object_constructor(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr)
{
obj = eo_constructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
obj = efl_constructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
svr->fd = -1;
svr->reject_excess_clients = EINA_FALSE;
@ -380,12 +380,12 @@ _efl_network_server_eo_base_constructor(Ecore_Con_Server *obj, Efl_Network_Serve
}
EOLIAN static Eo *
_efl_network_server_eo_base_finalize(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr)
_efl_network_server_efl_object_finalize(Ecore_Con_Server *obj, Efl_Network_Server_Data *svr)
{
Ecore_Con_Type compl_type = svr->type;
Ecore_Con_Type type;
eo_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
efl_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
svr->created = EINA_TRUE;
svr->ppid = getpid();
@ -463,7 +463,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
}
EOLIAN static Eo *
_efl_network_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNUSED)
_efl_network_connector_efl_object_finalize(Ecore_Con_Server *obj, void *pd EINA_UNUSED)
{
Efl_Network_Server_Data *svr = eo_data_scope_get(obj, EFL_NETWORK_SERVER_CLASS);
Ecore_Con_Type compl_type = svr->type;
@ -471,7 +471,7 @@ _efl_network_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNU
/* XXX: We intentionally put SERVER class here and not connector, as we'd
* like to skip that one. */
eo_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
efl_finalize(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT;
svr->disable_proxy = (compl_type & ECORE_CON_SUPER_SSL & ECORE_CON_NO_PROXY) == ECORE_CON_NO_PROXY;
@ -1053,7 +1053,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj)
if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE;
ecore_event_add(ev, e,
_ecore_con_event_server_add_free, NULL);
eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
_ecore_con_event_count++;
}
@ -1132,7 +1132,7 @@ ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num,
Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
event_info.data = e->data;
event_info.size = e->size;
eo_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
efl_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
}
_ecore_con_event_count++;
}
@ -1157,7 +1157,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj)
if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE;
ecore_event_add(ev, e,
(Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server);
eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
_ecore_con_event_count++;
}
@ -1239,7 +1239,7 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num,
Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
event_info.data = e->data;
event_info.size = e->size;
eo_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
efl_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
}
_ecore_con_event_count++;
}
@ -1265,7 +1265,7 @@ _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool dupl
DBG("%s", error);
svr->event_count = eina_list_append(svr->event_count, e);
ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL);
eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
_ecore_con_event_count++;
}
@ -1286,18 +1286,18 @@ ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error)
cl->event_count = eina_list_append(cl->event_count, e);
host_server->event_count = eina_list_append(host_server->event_count, e);
ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server);
eo_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
_ecore_con_event_count++;
}
static void
_ecore_con_server_free(Ecore_Con_Server *obj)
{
eo_del(obj);
efl_del(obj);
}
EOLIAN static void
_efl_network_server_eo_base_destructor(Eo *obj, Efl_Network_Server_Data *svr)
_efl_network_server_efl_object_destructor(Eo *obj, Efl_Network_Server_Data *svr)
{
Ecore_Con_Client *cl_obj;
double t_start, t;
@ -1373,7 +1373,7 @@ _efl_network_server_eo_base_destructor(Eo *obj, Efl_Network_Server_Data *svr)
servers = eina_list_remove(servers, obj);
svr->data = NULL;
eo_destructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
efl_destructor(eo_super(obj, EFL_NETWORK_SERVER_CLASS));
end:
return;
}
@ -1381,11 +1381,11 @@ end:
static void
_ecore_con_client_free(Ecore_Con_Client *obj)
{
eo_del(obj);
efl_del(obj);
}
EOLIAN static void
_efl_network_client_eo_base_destructor(Eo *obj, Efl_Network_Client_Data *cl)
_efl_network_client_efl_object_destructor(Eo *obj, Efl_Network_Client_Data *cl)
{
double t_start, t;
@ -1439,7 +1439,7 @@ _efl_network_client_eo_base_destructor(Eo *obj, Efl_Network_Client_Data *cl)
eina_stringshare_del(cl->ip);
cl->data = NULL;
eo_destructor(eo_super(obj, EFL_NETWORK_CLIENT_CLASS));
efl_destructor(eo_super(obj, EFL_NETWORK_CLIENT_CLASS));
}
static Eina_Bool
@ -2130,7 +2130,7 @@ error:
ecore_event_del(ev);
}
}
eo_del(obj);
efl_del(obj);
if (clerr || errno) ecore_con_event_server_error(svr_obj, clerr ? : strerror(errno));
return ECORE_CALLBACK_RENEW;
}

40
src/lib/ecore_con/ecore_con_eet.c
View File

@ -577,10 +577,10 @@ _ecore_con_eet_base_register(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Data *pd, c
EET_DATA_DESCRIPTOR_ADD_MAPPING(pd->matching, name, edd);
}
EOLIAN static Eo_Base *
_ecore_con_eet_server_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
EOLIAN static Efl_Object *
_ecore_con_eet_server_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
obj = efl_constructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
if (!obj) return NULL;
@ -595,7 +595,7 @@ _ecore_con_eet_server_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_
}
EOLIAN static void
_ecore_con_eet_server_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
_ecore_con_eet_server_obj_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
{
Ecore_Con_Reply *n;
Ecore_Con_Eet_Client *c;
@ -615,13 +615,13 @@ _ecore_con_eet_server_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_D
ecore_event_handler_del(pd->handler_del);
ecore_event_handler_del(pd->handler_data);
eo_destructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
efl_destructor(eo_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS));
}
EOLIAN static Eo_Base *
_ecore_con_eet_client_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
EOLIAN static Efl_Object *
_ecore_con_eet_client_obj_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
obj = efl_constructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
if (!obj) return NULL;
@ -636,7 +636,7 @@ _ecore_con_eet_client_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_
}
EOLIAN static void
_ecore_con_eet_client_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
_ecore_con_eet_client_obj_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
{
Ecore_Con_Eet_Server *s;
@ -654,13 +654,13 @@ _ecore_con_eet_client_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_D
ecore_event_handler_del(pd->handler_del);
ecore_event_handler_del(pd->handler_data);
eo_destructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
efl_destructor(eo_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS));
}
EOLIAN static Eo_Base *
_ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
EOLIAN static Efl_Object *
_ecore_con_eet_base_efl_object_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
{
obj = eo_constructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
obj = efl_constructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
if (!obj) return NULL;
@ -673,9 +673,9 @@ _ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
}
EOLIAN static void
_ecore_con_eet_base_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
_ecore_con_eet_base_efl_object_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
{
eo_destructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
efl_destructor(eo_super(obj, ECORE_CON_EET_BASE_CLASS));
eet_data_descriptor_free(pd->edd);
eet_data_descriptor_free(pd->matching);
@ -683,8 +683,8 @@ _ecore_con_eet_base_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
eina_hash_free(pd->raw_data_callbacks);
}
EOLIAN static Eo_Base *
_ecore_con_eet_base_eo_base_finalize(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
EOLIAN static Efl_Object *
_ecore_con_eet_base_efl_object_finalize(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
{
if (pd->server) return obj;
@ -742,7 +742,7 @@ ecore_con_eet_client_new(Ecore_Con_Server *server)
EAPI void
ecore_con_eet_server_free(Ecore_Con_Eet *r)
{
eo_del(r);
efl_del(r);
}
EAPI void
@ -918,13 +918,13 @@ ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_S
EAPI void
ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data)
{
eo_key_data_set(ece, ECORE_CON_EET_DATA_KEY, data);
efl_key_data_set(ece, ECORE_CON_EET_DATA_KEY, data);
}
EAPI const void *
ecore_con_eet_data_get(Ecore_Con_Eet *ece)
{
return eo_key_data_get(ece, ECORE_CON_EET_DATA_KEY);
return efl_key_data_get(ece, ECORE_CON_EET_DATA_KEY);
}
EAPI Ecore_Con_Eet *

8
src/lib/ecore_con/ecore_con_eet_base.eo
View File

@ -6,7 +6,7 @@ type @extern Ecore_Con_Eet_Raw_Data_Cb: __undefined_type; /* FIXME: function poi
struct @extern Eet.Data.Descriptor;
struct Ecore.Con.Reply;
class Ecore.Con.Eet.Base (Eo.Base) {
class Ecore.Con.Eet.Base (Efl.Object) {
[[Ecore Connection Eet Base class.
This class provides Eet data serialization features to Ecore Connection objects.]]
@ -90,8 +90,8 @@ class Ecore.Con.Eet.Base (Eo.Base) {
}
}
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Eo.Base.finalize;
Efl.Object.constructor;
Efl.Object.destructor;
Efl.Object.finalize;
}
}

4
src/lib/ecore_con/ecore_con_eet_client_obj.eo
View File

@ -3,8 +3,8 @@ class Ecore.Con.Eet.Client.Obj (Ecore.Con.Eet.Base) {
eo_prefix: ecore_con_eet_client_obj;
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Efl.Object.constructor;
Efl.Object.destructor;
}
}

4
src/lib/ecore_con/ecore_con_eet_server_obj.eo
View File

@ -3,8 +3,8 @@ class Ecore.Con.Eet.Server.Obj (Ecore.Con.Eet.Base) {
eo_prefix: ecore_con_eet_server_obj;
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Efl.Object.constructor;
Efl.Object.destructor;
}
}

2
src/lib/ecore_con/ecore_con_local_win32.c
View File

@ -356,7 +356,7 @@ del_handler_read:
close_event_read:
CloseHandle(svr->event_read);
free_cl:
eo_del(cl_obj);
efl_del(cl_obj);
return ECORE_CALLBACK_CANCEL;
}

28
src/lib/ecore_con/ecore_con_url.c
View File

@ -169,7 +169,7 @@ _efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event
e = calloc(1, sizeof(Ecore_Con_Event_Url_Complete));
if (!e)
{
eo_event_callback_stop(event->object);
efl_event_callback_stop(event->object);
return;
}
@ -178,7 +178,7 @@ _efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event
ecore_event_add(ECORE_CON_EVENT_URL_COMPLETE, e,
(Ecore_End_Cb)_ecore_con_event_url_free, event->object);
eo_event_callback_stop(event->object);
efl_event_callback_stop(event->object);
}
static void
@ -227,15 +227,15 @@ ecore_con_url_new(const char *url)
Ecore_Con_Url *url_obj;
url_obj = eo_add(EFL_NETWORK_URL_CLASS, NULL, efl_network_url_set(eo_self, url));
eo_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(), NULL);
efl_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(), NULL);
return url_obj;
}
EOLIAN static Eo *
_efl_network_url_eo_base_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con EINA_UNUSED)
_efl_network_url_efl_object_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con EINA_UNUSED)
{
url_obj = eo_constructor(eo_super(url_obj, MY_CLASS));
url_obj = efl_constructor(eo_super(url_obj, MY_CLASS));
if (!_init_count || !_c_init())
{
@ -257,7 +257,7 @@ _efl_network_url_eo_base_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_D
}
EOLIAN static Eo *
_efl_network_url_eo_base_finalize(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con)
_efl_network_url_efl_object_finalize(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con)
{
CURLcode ret;
@ -335,7 +335,7 @@ _efl_network_url_eo_base_finalize(Efl_Network_Url *url_obj, Efl_Network_Url_Data
*/
_c->curl_easy_setopt(url_con->curl_easy, CURLOPT_CONNECTTIMEOUT, 30);
_c->curl_easy_setopt(url_con->curl_easy, CURLOPT_FOLLOWLOCATION, 1);
return eo_finalize(eo_super(url_obj, MY_CLASS));
return efl_finalize(eo_super(url_obj, MY_CLASS));
}
EAPI Ecore_Con_Url *
@ -372,9 +372,9 @@ ecore_con_url_free(Ecore_Con_Url *url_obj)
if (!eo_isa(url_obj, EFL_NETWORK_URL_CLASS))
return;
eo_event_callback_array_del(url_obj, efl_network_url_event_table_callbacks(), NULL);
efl_event_callback_array_del(url_obj, efl_network_url_event_table_callbacks(), NULL);
eo_del(url_obj);
efl_del(url_obj);
}
static void
@ -393,9 +393,9 @@ _ecore_con_url_free_internal(Ecore_Con_Url *url_obj)
}
EOLIAN static void
_efl_network_url_eo_base_destructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con)
_efl_network_url_efl_object_destructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con)
{
eo_destructor(eo_super(url_obj, MY_CLASS));
efl_destructor(eo_super(url_obj, MY_CLASS));
if (!_c) return;
if (url_con->curl_easy)
@ -1140,7 +1140,7 @@ _ecore_con_url_event_url_complete(Ecore_Con_Url *url_obj, CURLMsg *curlmsg)
e.status = status;
e.url_con = url_obj;
url_con->event_count++;
eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e);
efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e);
}
static void
@ -1201,7 +1201,7 @@ _ecore_con_url_data_cb(void *buffer, size_t size, size_t nitems, void *userp)
e.size = real_size;
e.data = buffer;
url_con->event_count++;
eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e);
efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e);
}
else
{
@ -1260,7 +1260,7 @@ _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double u
e.up.total = ultotal;
e.up.now = ulnow;
url_con->event_count++;
eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e);
efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e);
return 0;
}

2
src/lib/ecore_con/efl_network.eo
View File

@ -29,7 +29,7 @@ enum Ecore.Con.Type
socket_activate = (1 << 9)
}
abstract Efl.Network (Eo.Base) {
abstract Efl.Network (Efl.Object) {
[[Abstract base class for all EFL.Network classes]]
legacy_prefix: ecore_con;

2
src/lib/ecore_con/efl_network_client.eo
View File

@ -13,7 +13,7 @@ class Efl.Network.Client (Efl.Network) {
}
}
implements {
Eo.Base.destructor;
Efl.Object.destructor;
Efl.Network.ip.get;
Efl.Network.uptime.get;
Efl.Network.port.get;

2
src/lib/ecore_con/efl_network_connector.eo
View File

@ -3,6 +3,6 @@ class Efl.Network.Connector (Efl.Network.Server) {
eo_prefix: efl_network_connector_obj;
data: null;
implements {
Eo.Base.finalize;
Efl.Object.finalize;
}
}

6
src/lib/ecore_con/efl_network_server.eo
View File

@ -76,9 +76,9 @@ class Efl.Network.Server (Efl.Network) {
}
}
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Eo.Base.finalize;
Efl.Object.constructor;
Efl.Object.destructor;
Efl.Object.finalize;
Efl.Network.ip.get;
Efl.Network.uptime.get;
Efl.Network.port.set;

8
src/lib/ecore_con/efl_network_url.eo
View File

@ -1,4 +1,4 @@
class Efl.Network.Url (Eo.Base) {
class Efl.Network.Url (Efl.Object) {
[[Uniform Resource Locator (URL) base class]]
eo_prefix: efl_network_url;
methods {
@ -15,9 +15,9 @@ class Efl.Network.Url (Eo.Base) {
}
}
implements {
Eo.Base.constructor;
Eo.Base.destructor;
Eo.Base.finalize;
Efl.Object.constructor;
Efl.Object.destructor;
Efl.Object.finalize;
}
events {
data; [[Triggered when data arrives at the socket.]]

36
src/lib/ecore_evas/ecore_evas.c
View File

@ -3110,7 +3110,7 @@ ecore_evas_animator_tick(Ecore_Evas *ee, Eina_Rectangle *viewport)
a.update_area = *viewport;
}
eo_event_callback_call(ee->evas, EFL_EVENT_ANIMATOR_TICK, &a);
efl_event_callback_call(ee->evas, EFL_EVENT_ANIMATOR_TICK, &a);
// FIXME: We do not support partial animator in the subcanvas
EINA_LIST_FOREACH(ee->sub_ecore_evas, l, subee)
@ -3164,7 +3164,7 @@ _ecore_evas_animator_fallback(void *data)
static void
_check_animator_event_catcher_add(void *data, const Eo_Event *event)
{
const Eo_Callback_Array_Item *array = event->info;
const Efl_Callback_Array_Item *array = event->info;
Ecore_Evas *ee = data;
int i;
@ -3198,7 +3198,7 @@ _check_animator_event_catcher_add(void *data, const Eo_Event *event)
static void
_check_animator_event_catcher_del(void *data, const Eo_Event *event)
{
const Eo_Callback_Array_Item *array = event->info;
const Efl_Callback_Array_Item *array = event->info;
Ecore_Evas *ee = data;
int i;
@ -3228,13 +3228,13 @@ _check_animator_event_catcher_del(void *data, const Eo_Event *event)
}
EO_CALLBACKS_ARRAY_DEFINE(animator_watch,
{ EO_EVENT_CALLBACK_ADD, _check_animator_event_catcher_add },
{ EO_EVENT_CALLBACK_DEL, _check_animator_event_catcher_del });
{ EFL_EVENT_CALLBACK_ADD, _check_animator_event_catcher_add },
{ EFL_EVENT_CALLBACK_DEL, _check_animator_event_catcher_del });
EAPI void
_ecore_evas_register_animators(Ecore_Evas *ee)
{
eo_event_callback_array_add(ee->evas, animator_watch(), ee);
efl_event_callback_array_add(ee->evas, animator_watch(), ee);
}
EAPI void
@ -4328,7 +4328,7 @@ _pointer_position_set(Efl_Event_Pointer_Data *ev, Ecore_Evas *ee, int x, int y,
EVENT_XY_SET(ev, my, ee->w + fh - mx - 1, fx, fy);
}
static const Eo_Event_Description *
static const Efl_Event_Description *
_event_description_get(Efl_Pointer_Action action)
{
switch (action)
@ -4384,9 +4384,9 @@ _direct_mouse_updown(Ecore_Evas *ee, const Ecore_Event_Mouse_Button *info, Efl_P
ev->pressure = info->multi.pressure;
ev->angle = info->multi.angle - ee->rotation;
eo_event_callback_call(e, _event_description_get(ev->action), evt);
efl_event_callback_call(e, _event_description_get(ev->action), evt);
processed = ev->evas_done;
eo_del(evt);
efl_del(evt);
return processed;
}
@ -4442,9 +4442,9 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info)
ev->pressure = info->multi.pressure;
ev->angle = info->multi.angle - ee->rotation;
eo_event_callback_call(e, _event_description_get(ev->action), evt);
efl_event_callback_call(e, _event_description_get(ev->action), evt);
processed = ev->evas_done;
eo_del(evt);
efl_del(evt);
return processed;
}
@ -4474,9 +4474,9 @@ _direct_mouse_wheel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Wheel *info)
ev->wheel.z = info->z;
ev->wheel.dir = info->direction ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL;
eo_event_callback_call(e, _event_description_get(ev->action), evt);
efl_event_callback_call(e, _event_description_get(ev->action), evt);
processed = ev->evas_done;
eo_del(evt);
efl_del(evt);
return processed;
}
@ -4501,9 +4501,9 @@ _direct_mouse_inout(Ecore_Evas *ee, const Ecore_Event_Mouse_IO *info, Efl_Pointe
ev->timestamp = info->timestamp;
_pointer_position_set(ev, ee, info->x, info->y, info->x, info->y);
eo_event_callback_call(e, _event_description_get(ev->action), evt);
efl_event_callback_call(e, _event_description_get(ev->action), evt);
processed = ev->evas_done;
eo_del(evt);
efl_del(evt);
return processed;
}
@ -4551,12 +4551,12 @@ _direct_key_updown_cb(Ecore_Evas *ee, const Ecore_Event_Key *info, Eina_Bool dow
ev->device = NULL; /* FIXME */
if (down)
eo_event_callback_call(e, EFL_EVENT_KEY_DOWN, evt);
efl_event_callback_call(e, EFL_EVENT_KEY_DOWN, evt);
else
eo_event_callback_call(e, EFL_EVENT_KEY_UP, evt);
efl_event_callback_call(e, EFL_EVENT_KEY_UP, evt);
processed = ev->evas_done;
eo_del(evt);
efl_del(evt);
return processed;
}

10
src/lib/ector/cairo/ector_cairo_software_surface.c
View File

@ -99,10 +99,10 @@ _ector_cairo_software_surface_surface_get(Eo *obj EINA_UNUSED, Ector_Cairo_Softw
if (height) *height = pd->base->generic->h;
}
static Eo_Base *
_ector_cairo_software_surface_eo_base_constructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd)
static Efl_Object *
_ector_cairo_software_surface_efl_object_constructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd)
{
obj = eo_constructor(eo_super(obj, MY_CLASS));
obj = efl_constructor(eo_super(obj, MY_CLASS));
if (!obj) return NULL;
pd->base = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
@ -112,10 +112,10 @@ _ector_cairo_software_surface_eo_base_constructor(Eo *obj, Ector_Cairo_Software_
}
EOLIAN static void
_ector_cairo_software_surface_eo_base_destructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd)
_ector_cairo_software_surface_efl_object_destructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd)
{
eo_data_unref(obj, pd->base);
eo_destructor(eo_super(obj, MY_CLASS));
efl_destructor(eo_super(obj, MY_CLASS));
}
#include "ector_cairo_software_surface.eo.c"

4
src/lib/ector/cairo/ector_cairo_software_surface.eo
View File

@ -8,7 +8,7 @@ class Ector.Cairo.Software.Surface (Ector.Cairo.Surface, Ector.Software.Buffer.B
methods {}
implements {
Ector.Buffer.pixels_set;
Eo.Base.constructor;
Eo.Base.destructor;
Efl.Object.constructor;
Efl.Object.destructor;
}
}

10
src/lib/ector/cairo/ector_cairo_surface.c
View File

@ -60,7 +60,7 @@ _ector_cairo_surface_symbol_get(Eo *obj EINA_UNUSED,
static Ector_Renderer *
_ector_cairo_surface_ector_surface_renderer_factory_new(Eo *obj,
Ector_Cairo_Surface_Data *pd EINA_UNUSED,
const Eo_Class *type)
const Efl_Class *type)
{
if (type == ECTOR_RENDERER_SHAPE_MIXIN)
return eo_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
@ -115,14 +115,14 @@ _ector_cairo_surface_ector_surface_reference_point_set(Eo *obj EINA_UNUSED,
}
static Eo *
_ector_cairo_surface_eo_base_constructor(Eo *obj,
_ector_cairo_surface_efl_object_constructor(Eo *obj,
Ector_Cairo_Surface_Data *pd)
{
USE(obj, cairo_destroy, NULL);
USE(obj, cairo_image_surface_create, NULL);
USE(obj, cairo_create, NULL);
obj = eo_constructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
obj = efl_constructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
if (!obj) return NULL;
_cairo_count++;
@ -133,10 +133,10 @@ _ector_cairo_surface_eo_base_constructor(Eo *obj,
}
static void
_ector_cairo_surface_eo_base_destructor(Eo *obj EINA_UNUSED,
_ector_cairo_surface_efl_object_destructor(Eo *obj EINA_UNUSED,
Ector_Cairo_Surface_Data *pd EINA_UNUSED)
{
eo_destructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
efl_destructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
if (--_cairo_count) return ;
if (_cairo_so) eina_module_free(_cairo_so);

6
src/lib/ector/cairo/ector_cairo_surface.eo
View File

@ -1,6 +1,6 @@
type @extern cairo_t: void_ptr;
class Ector.Cairo.Surface (Eo.Base, Ector.Surface)
class Ector.Cairo.Surface (Efl.Object, Ector.Surface)
{
[[Ector surface on a cairo backend
@ -28,7 +28,7 @@ class Ector.Cairo.Surface (Eo.Base, Ector.Surface)
implements {
Ector.Surface.renderer_factory_new;
Ector.Surface.reference_point.set;
Eo.Base.destructor;
Eo.Base.constructor;
Efl.Object.destructor;
Efl.Object.constructor;
}
}

14
src/lib/ector/cairo/ector_renderer_cairo.c
View File

@ -180,9 +180,9 @@ _ector_renderer_cairo_ector_renderer_draw(Eo *obj EINA_UNUSED,
}
static Eo *
_ector_renderer_cairo_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd EINA_UNUSED)
_ector_renderer_cairo_efl_object_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd EINA_UNUSED)
{
obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
if (!obj) return NULL;
pd->generic = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
@ -190,10 +190,10 @@ _ector_renderer_cairo_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd
return obj;
}
static Eo_Base *
_ector_renderer_cairo_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd)
static Efl_Object *
_ector_renderer_cairo_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd)
{
obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
if (!obj) return NULL;
USE(pd->generic, cairo_matrix_init, NULL);
@ -213,7 +213,7 @@ _ector_renderer_cairo_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd)
}
static void
_ector_renderer_cairo_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd)
_ector_renderer_cairo_efl_object_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd)
{
Ector_Renderer_Data *base;
@ -223,7 +223,7 @@ _ector_renderer_cairo_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd)
free(pd->m);
eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
}
#include "ector_renderer_cairo.eo.c"

6
src/lib/ector/cairo/ector_renderer_cairo.eo
View File

@ -13,8 +13,8 @@ abstract Ector.Renderer.Cairo (Ector.Renderer)
Ector.Renderer.draw;
Ector.Renderer.color.set;
Ector.Renderer.color.get;
Eo.Base.constructor;
Eo.Base.finalize;
Eo.Base.destructor;
Efl.Object.constructor;
Efl.Object.finalize;
Efl.Object.destructor;
}
}

10
src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
View File

@ -129,12 +129,12 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_bounds_get(Eo *obj,
gld->end.y - gld->start.y);
}
static Eo_Base *
_ector_renderer_cairo_gradient_linear_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED)
static Efl_Object *
_ector_renderer_cairo_gradient_linear_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED)
{
Ector_Renderer_Data *base;
obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
if (!obj) return NULL;
base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
@ -153,7 +153,7 @@ _ector_renderer_cairo_gradient_linear_eo_base_finalize(Eo *obj, Ector_Renderer_C
}
static void
_ector_renderer_cairo_gradient_linear_eo_base_destructor(Eo *obj,
_ector_renderer_cairo_gradient_linear_efl_object_destructor(Eo *obj,
Ector_Renderer_Cairo_Gradient_Linear_Data *pd)
{
Ector_Renderer_Data *base;
@ -161,7 +161,7 @@ _ector_renderer_cairo_gradient_linear_eo_base_destructor(Eo *obj,
base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
eo_data_xunref(base->surface, pd->parent, obj);
eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
}
static void

4
src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
View File

@ -7,8 +7,8 @@ class Ector.Renderer.Cairo.Gradient.Linear (Ector.Renderer.Cairo, Ector.Renderer
Ector.Renderer.bounds_get;
Ector.Renderer.crc.get;
Ector.Renderer.Cairo.fill;
Eo.Base.finalize;
Eo.Base.destructor;
Efl.Object.finalize;
Efl.Object.destructor;
Efl.Gfx.Gradient.stop.set;
}
}

10
src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
View File

@ -134,12 +134,12 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_bounds_get(Eo *obj EINA_UNU
gld->radius * 2, gld->radius * 2);
}
static Eo_Base *
_ector_renderer_cairo_gradient_radial_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED)
static Efl_Object *
_ector_renderer_cairo_gradient_radial_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED)
{
Ector_Renderer_Data *base;
obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
if (!obj) return NULL;
base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
@ -157,7 +157,7 @@ _ector_renderer_cairo_gradient_radial_eo_base_finalize(Eo *obj, Ector_Renderer_C
}
static void
_ector_renderer_cairo_gradient_radial_eo_base_destructor(Eo *obj,
_ector_renderer_cairo_gradient_radial_efl_object_destructor(Eo *obj,
Ector_Renderer_Cairo_Gradient_Radial_Data *pd)
{
Ector_Renderer_Data *base;
@ -165,7 +165,7 @@ _ector_renderer_cairo_gradient_radial_eo_base_destructor(Eo *obj,
base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
eo_data_xunref(base->surface, pd->parent, obj);
eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
}
static void

4
src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
View File

@ -7,8 +7,8 @@ class Ector.Renderer.Cairo.Gradient.Radial (Ector.Renderer.Cairo, Ector.Renderer
Ector.Renderer.bounds_get;
Ector.Renderer.crc.get;
Ector.Renderer.Cairo.fill;
Eo.Base.destructor;
Eo.Base.finalize;
Efl.Object.destructor;
Efl.Object.finalize;
Efl.Gfx.Gradient.stop.set;
}
}

16
src/lib/ector/cairo/ector_renderer_cairo_shape.c
View File

@ -246,9 +246,9 @@ _ector_renderer_cairo_shape_ector_renderer_bounds_get(Eo *obj,
}
Eo *
_ector_renderer_cairo_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
_ector_renderer_cairo_shape_efl_object_constructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
{
obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
if (!obj) return NULL;
@ -256,15 +256,15 @@ _ector_renderer_cairo_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Sh
pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_cairo_shape_path_changed, pd);
efl_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_cairo_shape_path_changed, pd);
return obj;
}
static Eo_Base *
_ector_renderer_cairo_shape_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
static Efl_Object *
_ector_renderer_cairo_shape_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
{
obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
if (!obj) return NULL;
USE(pd->base, cairo_path_destroy, NULL);
@ -291,7 +291,7 @@ _ector_renderer_cairo_shape_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Shape
}
void
_ector_renderer_cairo_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
_ector_renderer_cairo_shape_efl_object_destructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
{
Ector_Renderer_Data *base;
@ -305,7 +305,7 @@ _ector_renderer_cairo_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Sha
eo_data_xunref(obj, pd->shape, obj);
eo_data_xunref(obj, pd->base, obj);
eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
if (pd->path) cairo_path_destroy(pd->path);
}

6
src/lib/ector/cairo/ector_renderer_cairo_shape.eo
View File

@ -7,8 +7,8 @@ class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Shape)
Ector.Renderer.bounds_get;
Ector.Renderer.crc.get;
Ector.Renderer.Cairo.fill;
Eo.Base.constructor;
Eo.Base.finalize;
Eo.Base.destructor;
Efl.Object.constructor;
Efl.Object.finalize;
Efl.Object.destructor;
}
}

10
src/lib/ector/ector_renderer.c
View File

@ -10,16 +10,16 @@
#define MY_CLASS ECTOR_RENDERER_CLASS
static void
_ector_renderer_eo_base_destructor(Eo *obj, Ector_Renderer_Data *pd)
_ector_renderer_efl_object_destructor(Eo *obj, Ector_Renderer_Data *pd)
{
if (pd->m) free(pd->m);
eo_unref(pd->surface);
eo_destructor(eo_super(obj, MY_CLASS));
efl_destructor(eo_super(obj, MY_CLASS));
}
static Eo_Base *
_ector_renderer_eo_base_finalize(Eo *obj, Ector_Renderer_Data *pd)
static Efl_Object *
_ector_renderer_efl_object_finalize(Eo *obj, Ector_Renderer_Data *pd)
{
if (!pd->surface)
{
@ -27,7 +27,7 @@ _ector_renderer_eo_base_finalize(Eo *obj, Ector_Renderer_Data *pd)
return NULL;
}
pd->finalized = EINA_TRUE;
return eo_finalize(eo_super(obj, MY_CLASS));
return efl_finalize(eo_super(obj, MY_CLASS));
}
static Ector_Surface *

6
src/lib/ector/ector_renderer.eo
View File

@ -9,7 +9,7 @@ enum Ector.Quality
last, [[Sentinel]]
}
abstract Ector.Renderer (Eo.Base)
abstract Ector.Renderer (Efl.Object)
{
[[Ector renderer abstract interface]]
@ -128,7 +128,7 @@ abstract Ector.Renderer (Eo.Base)
}
}
implements {
Eo.Base.destructor;
Eo.Base.finalize;
Efl.Object.destructor;
Efl.Object.finalize;
}
}

2
src/lib/ector/ector_renderer_buffer.eo
View File

@ -1,4 +1,4 @@
mixin Ector.Renderer.Buffer (Eo.Interface, Ector.Renderer, Efl.Gfx.Fill)
mixin Ector.Renderer.Buffer (Efl.Interface, Ector.Renderer, Efl.Gfx.Fill)
{
[[Ector buffers have a default fill set to repeat]]
eo_prefix: ector_renderer_buffer;

4
src/lib/ector/ector_surface.eo
View File

@ -16,9 +16,9 @@ mixin Ector.Surface (Ector.Buffer)
}
renderer_factory_new @virtual_pure {
[[Create a new renderer factory for the given type]]
return: Eo.Base; /* FIXME: Should be a more restricted type, only here for cyclic. */
return: Efl.Object; /* FIXME: Should be a more restricted type, only here for cyclic. */
params {
@in type: const(Eo.Class) @nonull; /* FIXME: Should probably be a more restricted type */
@in type: const(Efl.Class) @nonull; /* FIXME: Should probably be a more restricted type */
}
}
}

Some files were not shown because too many files have changed in this diff Show More