From 9c779dca90bea36ad43c77597f107dd157a33c46 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Mon, 5 Sep 2016 16:57:35 +0100 Subject: [PATCH] Rename efl_self to efl_added It has been discussed on the ML (thread: "[RFC] rename efl_self") and IRC, and has been decided we should rename it to this in order to avoid confusion with the already established meaning of self which is very similar to what we were using it for, but didn't have complete overlap. Kudos to Marcel Hollerbach for initiating the discussion and fighting for it until he convinced a significant mass. :) This commit breaks API, and depending on compiler potentially ABI. @feature --- src/bin/elementary/test_application_server.c | 4 +- src/bin/elementary/test_code.c | 8 +-- src/bin/elementary/test_events.c | 2 +- src/bin/elementary/test_glview.c | 6 +- src/bin/elementary/test_grid_static.c | 14 ++-- src/bin/elementary/test_task_switcher.c | 2 +- src/bin/elementary/test_ui_box.c | 12 ++-- src/bin/elementary/test_ui_grid.c | 14 ++-- src/examples/ecore/ecore_idler_example.c | 2 +- src/examples/ecore/ecore_poller_example.c | 6 +- src/examples/ecore/efl_io_copier_example.c | 72 +++++++++---------- .../ecore/efl_io_copier_simple_example.c | 6 +- src/examples/ecore/efl_io_queue_example.c | 34 ++++----- .../ecore/efl_net_dialer_http_example.c | 58 +++++++-------- .../efl_net_dialer_websocket_autobahntestee.c | 4 +- .../ecore/efl_net_dialer_websocket_example.c | 14 ++-- src/examples/ecore/efl_net_server_example.c | 28 ++++---- src/examples/eldbus/dbusmodel.c | 2 +- src/examples/elementary/evas3d_map_example.c | 10 +-- .../evas3d_object_on_button_example.c | 8 +-- .../evas3d_scene_on_button_example.c | 8 +-- src/examples/elementary/filemvc.c | 8 +-- src/examples/elementary/fileviewlist.c | 4 +- .../elementary/performance/graphical.c | 12 ++-- .../sphere_hunter/evas_3d_sphere_hunter.c | 12 ++-- src/examples/evas/evas-3d-aabb.c | 10 +-- src/examples/evas/evas-3d-blending.c | 10 +-- src/examples/evas/evas-3d-colorpick.c | 8 +-- src/examples/evas/evas-3d-cube-rotate.c | 8 +-- src/examples/evas/evas-3d-cube.c | 8 +-- src/examples/evas/evas-3d-cube2.c | 8 +-- src/examples/evas/evas-3d-eet.c | 10 +-- src/examples/evas/evas-3d-fog.c | 12 ++-- src/examples/evas/evas-3d-frustum.c | 10 +-- src/examples/evas/evas-3d-hull.c | 12 ++-- src/examples/evas/evas-3d-md2.c | 8 +-- src/examples/evas/evas-3d-mmap-set.c | 8 +-- src/examples/evas/evas-3d-obj.c | 8 +-- .../evas/evas-3d-parallax-occlusion.c | 8 +-- src/examples/evas/evas-3d-pick.c | 6 +- src/examples/evas/evas-3d-ply.c | 8 +-- src/examples/evas/evas-3d-proxy.c | 8 +-- src/examples/evas/evas-3d-shadows.c | 24 +++---- src/examples/evas/evas-3d-static-lod.c | 12 ++-- src/examples/evas/evas-vg-simple.c | 24 +++---- .../evas/shooter/evas-3d-shooter-header.c | 6 +- .../evas/shooter/evas-3d-shooter-macros.h | 2 +- src/examples/evas/shooter/evas-3d-shooter.c | 4 +- src/lib/ecore/ecore_exe.c | 2 +- src/lib/ecore/ecore_main.c | 4 +- src/lib/ecore/ecore_poller.c | 2 +- src/lib/ecore/ecore_timer.c | 14 ++-- src/lib/ecore_con/ecore_con.c | 6 +- src/lib/ecore_con/ecore_con_eet.c | 4 +- src/lib/ecore_con/ecore_con_url.c | 2 +- src/lib/ecore_con/efl_net_dialer_http.c | 4 +- src/lib/ecore_con/efl_net_dialer_websocket.c | 12 ++-- src/lib/ecore_con/efl_net_server_tcp.c | 4 +- src/lib/ector/cairo/ector_cairo_surface.c | 6 +- src/lib/ector/gl/ector_gl_surface.c | 6 +- .../ector/software/ector_software_surface.c | 8 +-- src/lib/edje/edje_containers.c | 2 +- src/lib/edje/edje_load.c | 8 +-- src/lib/edje/edje_multisense.c | 6 +- src/lib/eio/eio_model.c | 6 +- src/lib/eldbus/eldbus_model_connection.c | 2 +- src/lib/eldbus/eldbus_model_object.c | 2 +- src/lib/eldbus/eldbus_model_proxy.c | 4 +- src/lib/elementary/efl_ui_text.c | 6 +- src/lib/elementary/efl_ui_win.c | 4 +- src/lib/elementary/elc_ctxpopup.c | 4 +- src/lib/elementary/elc_fileselector.c | 10 +-- src/lib/elementary/elc_fileselector_button.c | 4 +- src/lib/elementary/elm_app_client.c | 4 +- src/lib/elementary/elm_app_server.c | 2 +- src/lib/elementary/elm_code_diff_widget.c | 4 +- src/lib/elementary/elm_code_widget.c | 2 +- src/lib/elementary/elm_glview.c | 4 +- src/lib/elementary/elm_layout_pack.c | 4 +- src/lib/eo/Eo.h | 12 ++-- src/lib/eo/eo_add_fallback.c | 2 +- src/lib/evas/canvas/evas_canvas3d_node.c | 2 +- src/lib/evas/canvas/evas_image_legacy.c | 6 +- src/lib/evas/canvas/evas_object_textblock.c | 2 +- src/lib/evas/canvas/evas_vg_container.c | 2 +- src/lib/evas/canvas/evas_vg_node.c | 2 +- src/lib/evas/canvas/evas_vg_shape.c | 6 +- .../evas/engines/gl_generic/evas_engine.c | 6 +- .../engines/software_generic/evas_engine.c | 4 +- src/tests/ecore/ecore_test_ecore.c | 10 +-- src/tests/ecore/ecore_test_timer.c | 6 +- src/tests/eio/eio_model_test_file.c | 2 +- src/tests/eio/eio_model_test_monitor_add.c | 2 +- src/tests/eldbus/eldbus_test_eldbus_model.c | 4 +- .../eldbus/eldbus_test_eldbus_model_method.c | 2 +- .../eldbus/eldbus_test_eldbus_model_signal.c | 2 +- ...dbus_test_fake_server_eldbus_model_proxy.c | 2 +- src/tests/eo/constructors/constructors_main.c | 4 +- src/tests/eo/suite/eo_test_general.c | 8 +-- src/tests/eo/suite/eo_test_threaded_calls.c | 2 +- .../eolian_js_test_constructor_method_impl.c | 4 +- 101 files changed, 408 insertions(+), 408 deletions(-) diff --git a/src/bin/elementary/test_application_server.c b/src/bin/elementary/test_application_server.c index 25b9b9d8db..704613525d 100644 --- a/src/bin/elementary/test_application_server.c +++ b/src/bin/elementary/test_application_server.c @@ -96,7 +96,7 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED, return NULL; } - view = efl_add(ELM_APP_SERVER_VIEW_CLASS, app_server, elm_app_server_view_id_set(efl_self, NULL)); + view = efl_add(ELM_APP_SERVER_VIEW_CLASS, app_server, elm_app_server_view_id_set(efl_added, NULL)); id = elm_app_server_view_id_get(view); pkg = elm_app_server_package_get(app_server); @@ -136,7 +136,7 @@ test_application_server_common(const char *pkg) Elm_App_Server_View *view; Elm_App_Server *server; - server = efl_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(efl_self, pkg, _create_view_cb)); + server = efl_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(efl_added, pkg, _create_view_cb)); elm_app_server_title_set(server, pkg); views_iter = elm_app_server_views_get(server); efl_event_callback_add(server, ELM_APP_SERVER_EVENT_TERMINATE, _terminate_cb, NULL); diff --git a/src/bin/elementary/test_code.c b/src/bin/elementary/test_code.c index fdebe92196..9f615b5cc0 100644 --- a/src/bin/elementary/test_code.c +++ b/src/bin/elementary/test_code.c @@ -55,7 +55,7 @@ _elm_code_test_welcome_setup(Evas_Object *parent) Elm_Code_Widget *widget; code = elm_code_create(); - widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code)); + widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_added, code)); elm_obj_code_widget_font_set(widget, NULL, 12); 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); @@ -83,7 +83,7 @@ _elm_code_test_editor_setup(Evas_Object *parent, Eina_Bool log) Elm_Code_Widget *widget; code = elm_code_create(); - widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code)); + widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_added, code)); elm_obj_code_widget_font_set(widget, NULL, 14); elm_obj_code_widget_editable_set(widget, EINA_TRUE); elm_obj_code_widget_show_whitespace_set(widget, EINA_TRUE); @@ -113,7 +113,7 @@ _elm_code_test_mirror_setup(Elm_Code *code, char *font_name, Evas_Object *parent { Elm_Code_Widget *widget; - widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code)); + widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_added, code)); elm_obj_code_widget_font_set(widget, font_name, 11); elm_obj_code_widget_line_numbers_set(widget, EINA_TRUE); @@ -131,7 +131,7 @@ _elm_code_test_diff_inline_setup(Evas_Object *parent) Elm_Code *code; code = elm_code_create(); - diff = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code)); + diff = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_added, code)); evas_object_size_hint_weight_set(diff, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(diff, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c index 4ff26a923b..df0b5b5f8f 100644 --- a/src/bin/elementary/test_events.c +++ b/src/bin/elementary/test_events.c @@ -186,7 +186,7 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in win = elm_win_util_standard_add("buttons", "Buttons"); elm_win_autodel_set(win, EINA_TRUE); - bx = efl_add(EFL_UI_BOX_CLASS, win, efl_orientation_set(efl_self, EFL_ORIENT_VERTICAL)); + bx = efl_add(EFL_UI_BOX_CLASS, win, efl_orientation_set(efl_added, EFL_ORIENT_VERTICAL)); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bx, -1, -1); efl_pack(win, bx); diff --git a/src/bin/elementary/test_glview.c b/src/bin/elementary/test_glview.c index 12e20bf690..72bb0bf4bc 100644 --- a/src/bin/elementary/test_glview.c +++ b/src/bin/elementary/test_glview.c @@ -637,9 +637,9 @@ test_glview(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in eina_stringshare_del(accel); #else win = efl_add(EFL_UI_WIN_STANDARD_CLASS, NULL, - efl_ui_win_name_set(efl_self, "glview"), - efl_text_set(efl_self, "GLView"), - efl_ui_win_accel_preference_set(efl_self, "gl:depth")); + efl_ui_win_name_set(efl_added, "glview"), + efl_text_set(efl_added, "GLView"), + efl_ui_win_accel_preference_set(efl_added, "gl:depth")); elm_win_autodel_set(win, EINA_TRUE); #endif diff --git a/src/bin/elementary/test_grid_static.c b/src/bin/elementary/test_grid_static.c index 0269a3de76..ef3e51784f 100644 --- a/src/bin/elementary/test_grid_static.c +++ b/src/bin/elementary/test_grid_static.c @@ -105,22 +105,22 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve api_data *api = calloc(1, sizeof(*api)); win = efl_add(EFL_UI_WIN_STANDARD_CLASS, NULL, - efl_ui_win_name_set(efl_self, "grid"), - efl_text_set(efl_self, "Grid"), - efl_ui_win_autodel_set(efl_self, EINA_TRUE), - efl_event_callback_add(efl_self, EFL_EVENT_DEL, _win_del, api)); + efl_ui_win_name_set(efl_added, "grid"), + efl_text_set(efl_added, "Grid"), + efl_ui_win_autodel_set(efl_added, EINA_TRUE), + efl_event_callback_add(efl_added, EFL_EVENT_DEL, _win_del, api)); static int run_count = 0; if (((run_count++) % 2) == 0) { gd = efl_add(EFL_UI_GRID_STATIC_CLASS, win, - efl_gfx_size_hint_weight_set(efl_self, 1, 1)); + efl_gfx_size_hint_weight_set(efl_added, 1, 1)); } else { gd = efl_add(EFL_UI_GRID_CLASS, win, - efl_gfx_size_hint_weight_set(efl_self, 1, 1), - efl_pack_layout_engine_set(efl_self, EFL_UI_GRID_STATIC_CLASS, NULL)); + efl_gfx_size_hint_weight_set(efl_added, 1, 1), + efl_pack_layout_engine_set(efl_added, EFL_UI_GRID_STATIC_CLASS, NULL)); } efl_pack(win, gd); api->data.grid = gd; diff --git a/src/bin/elementary/test_task_switcher.c b/src/bin/elementary/test_task_switcher.c index 5e35a7e48d..3a6f7805d5 100644 --- a/src/bin/elementary/test_task_switcher.c +++ b/src/bin/elementary/test_task_switcher.c @@ -300,7 +300,7 @@ _app_open(const char *package) return; } - app = efl_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(efl_self, package)); + app = efl_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(efl_added, package)); 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); diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c index 44fedfab4c..5e918be4af 100644 --- a/src/bin/elementary/test_ui_box.c +++ b/src/bin/elementary/test_ui_box.c @@ -233,7 +233,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* weights radio group */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); + efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_pack(hbox, bx); efl_gfx_visible_set(bx, 1); @@ -287,7 +287,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* misc */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); + efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); @@ -350,7 +350,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* user min size setter */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); + efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); @@ -377,7 +377,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* inner box padding */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); + efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); @@ -404,7 +404,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* outer margin */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); + efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); @@ -431,7 +431,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* Box align */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); + efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_weight_set(bx, 1, 1); efl_pack(hbox, bx); diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c index ba198c1b43..def80b148d 100644 --- a/src/bin/elementary/test_ui_grid.c +++ b/src/bin/elementary/test_ui_grid.c @@ -226,7 +226,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i /* weights radio group */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); + efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_pack(hbox, bx); efl_gfx_visible_set(bx, 1); @@ -289,7 +289,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i /* min size setter */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); + efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); efl_gfx_size_hint_align_set(bx, 0.5, -1); efl_gfx_size_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); @@ -316,7 +316,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i /* inner box padding */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); + efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); @@ -343,7 +343,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i /* outer margin */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); + efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); @@ -370,7 +370,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i /* button margins */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); + efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_weight_set(bx, 1, 1); efl_pack(hbox, bx); @@ -397,7 +397,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i /* ro info */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); + efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_weight_set(bx, 1, 1); efl_pack(hbox, bx); @@ -578,7 +578,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, /* ro info */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); + efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_weight_set(bx, 1, 1); efl_pack(hbox, bx); diff --git a/src/examples/ecore/ecore_idler_example.c b/src/examples/ecore/ecore_idler_example.c index 5e6ba84cc2..53e7d6fed4 100644 --- a/src/examples/ecore/ecore_idler_example.c +++ b/src/examples/ecore/ecore_idler_example.c @@ -110,7 +110,7 @@ main(void) ctxt.enterer = ecore_idle_enterer_add(_enterer_cb, &ctxt); ctxt.exiter = ecore_idle_exiter_add(_exiter_cb, &ctxt); ctxt.idler = ecore_idler_add(_idler_cb, &ctxt); -// ctxt.idler = efl_add(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(efl_self, _idler_cb, &ctxt)); +// ctxt.idler = efl_add(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(efl_added, _idler_cb, &ctxt)); ctxt.handler = ecore_event_handler_add(_event_type, _event_handler_cb, &ctxt); diff --git a/src/examples/ecore/ecore_poller_example.c b/src/examples/ecore/ecore_poller_example.c index 2e0006c6f8..6c55dbc285 100644 --- a/src/examples/ecore/ecore_poller_example.c +++ b/src/examples/ecore/ecore_poller_example.c @@ -48,9 +48,9 @@ main(void) poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2); poller3 = ecore_poller_add(ECORE_POLLER_CORE, 30, _poller_quit_cb, str3); -// poller1 = efl_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_self, ECORE_POLLER_CORE, 4, _poller_print_cb, str1)); -// poller2 = efl_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_self, ECORE_POLLER_CORE, 8, _poller_print_cb, str2)); -// poller3 = efl_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_self, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3)); +// poller1 = efl_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 4, _poller_print_cb, str1)); +// poller2 = efl_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 8, _poller_print_cb, str2)); +// poller3 = efl_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3)); ecore_main_loop_begin(); diff --git a/src/examples/ecore/efl_io_copier_example.c b/src/examples/ecore/efl_io_copier_example.c index a63377333d..689a7436bb 100644 --- a/src/examples/ecore/efl_io_copier_example.c +++ b/src/examples/ecore/efl_io_copier_example.c @@ -413,7 +413,7 @@ main(int argc, char **argv) if (strcmp(input_fname, ":stdin:") == 0) { input = efl_add(EFL_IO_STDIN_CLASS, NULL, - efl_event_callback_array_add(efl_self, input_cbs(), NULL)); + efl_event_callback_array_add(efl_added, input_cbs(), NULL)); if (!input) { fprintf(stderr, "ERROR: could not open stdin.\n"); @@ -430,8 +430,8 @@ main(int argc, char **argv) const char *address = input_fname + strlen("tcp://"); Eina_Error err; input = efl_add(EFL_NET_DIALER_TCP_CLASS, ecore_main_loop_get(), - efl_event_callback_array_add(efl_self, input_cbs(), NULL), /* optional */ - efl_event_callback_array_add(efl_self, dialer_cbs(), NULL) /* optional */ + efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */ + efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ ); if (!input) { @@ -454,10 +454,10 @@ main(int argc, char **argv) Eina_Error err; input = efl_add(EFL_NET_DIALER_HTTP_CLASS, ecore_main_loop_get(), - efl_net_dialer_http_method_set(efl_self, "GET"), - efl_event_callback_array_add(efl_self, input_cbs(), NULL), /* optional */ - efl_event_callback_array_add(efl_self, dialer_cbs(), NULL), /* optional */ - efl_event_callback_array_add(efl_self, http_cbs(), NULL) /* optional */ + efl_net_dialer_http_method_set(efl_added, "GET"), + efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */ + efl_event_callback_array_add(efl_added, dialer_cbs(), NULL), /* optional */ + efl_event_callback_array_add(efl_added, http_cbs(), NULL) /* optional */ ); if (!input) { @@ -480,9 +480,9 @@ main(int argc, char **argv) Eina_Error err; input = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, ecore_main_loop_get(), - efl_net_dialer_websocket_streaming_mode_set(efl_self, EFL_NET_DIALER_WEBSOCKET_STREAMING_MODE_TEXT), - efl_event_callback_array_add(efl_self, input_cbs(), NULL), /* optional */ - efl_event_callback_array_add(efl_self, dialer_cbs(), NULL) /* optional */ + efl_net_dialer_websocket_streaming_mode_set(efl_added, EFL_NET_DIALER_WEBSOCKET_STREAMING_MODE_TEXT), + efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */ + efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ ); if (!input) { @@ -503,9 +503,9 @@ main(int argc, char **argv) { /* regular file, open with flags: read-only and close-on-exec */ input = efl_add(EFL_IO_FILE_CLASS, NULL, - efl_file_set(efl_self, input_fname, NULL), /* mandatory */ - efl_io_file_flags_set(efl_self, O_RDONLY | O_CLOEXEC), /* recommended */ - efl_event_callback_array_add(efl_self, input_cbs(), NULL) /* optional */ + efl_file_set(efl_added, input_fname, NULL), /* mandatory */ + efl_io_file_flags_set(efl_added, O_RDONLY | O_CLOEXEC), /* recommended */ + efl_event_callback_array_add(efl_added, input_cbs(), NULL) /* optional */ ); if (!input) { @@ -519,7 +519,7 @@ main(int argc, char **argv) if (strcmp(output_fname, ":stdout:") == 0) { output = efl_add(EFL_IO_STDOUT_CLASS, NULL, - efl_event_callback_array_add(efl_self, output_cbs(), NULL) /* optional */ + efl_event_callback_array_add(efl_added, output_cbs(), NULL) /* optional */ ); if (!output) { @@ -531,7 +531,7 @@ main(int argc, char **argv) else if (strcmp(output_fname, ":stderr:") == 0) { output = efl_add(EFL_IO_STDERR_CLASS, NULL, - efl_event_callback_array_add(efl_self, output_cbs(), NULL) /* optional */ + efl_event_callback_array_add(efl_added, output_cbs(), NULL) /* optional */ ); if (!output) { @@ -558,8 +558,8 @@ main(int argc, char **argv) * _copier_done(). */ output = efl_add(EFL_IO_BUFFER_CLASS, NULL, - efl_event_callback_array_add(efl_self, output_cbs(), NULL), /* optional */ - efl_event_callback_array_add(efl_self, output_buffer_cbs(), NULL) /* optional */ + efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */ + efl_event_callback_array_add(efl_added, output_buffer_cbs(), NULL) /* optional */ ); if (!output) { @@ -588,8 +588,8 @@ main(int argc, char **argv) const char *address = output_fname + strlen("tcp://"); Eina_Error err; output = efl_add(EFL_NET_DIALER_TCP_CLASS, ecore_main_loop_get(), - efl_event_callback_array_add(efl_self, output_cbs(), NULL), /* optional */ - efl_event_callback_array_add(efl_self, dialer_cbs(), NULL) /* optional */ + efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */ + efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ ); if (!output) { @@ -612,10 +612,10 @@ main(int argc, char **argv) Eina_Error err; output = efl_add(EFL_NET_DIALER_HTTP_CLASS, ecore_main_loop_get(), - efl_net_dialer_http_method_set(efl_self, "PUT"), - efl_event_callback_array_add(efl_self, output_cbs(), NULL), /* optional */ - efl_event_callback_array_add(efl_self, dialer_cbs(), NULL), /* optional */ - efl_event_callback_array_add(efl_self, http_cbs(), NULL) /* optional */ + efl_net_dialer_http_method_set(efl_added, "PUT"), + efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */ + efl_event_callback_array_add(efl_added, dialer_cbs(), NULL), /* optional */ + efl_event_callback_array_add(efl_added, http_cbs(), NULL) /* optional */ ); if (!output) { @@ -638,9 +638,9 @@ main(int argc, char **argv) Eina_Error err; output = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, ecore_main_loop_get(), - efl_net_dialer_websocket_streaming_mode_set(efl_self, EFL_NET_DIALER_WEBSOCKET_STREAMING_MODE_TEXT), - efl_event_callback_array_add(efl_self, output_cbs(), NULL), /* optional */ - efl_event_callback_array_add(efl_self, dialer_cbs(), NULL) /* optional */ + efl_net_dialer_websocket_streaming_mode_set(efl_added, EFL_NET_DIALER_WEBSOCKET_STREAMING_MODE_TEXT), + efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */ + efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ ); if (!output) { @@ -663,10 +663,10 @@ main(int argc, char **argv) * create if did not exist and truncate if exist. */ output = efl_add(EFL_IO_FILE_CLASS, NULL, - efl_file_set(efl_self, output_fname, NULL), /* mandatory */ - efl_io_file_flags_set(efl_self, O_WRONLY | O_CLOEXEC | O_CREAT | O_TRUNC), /* mandatory for write */ - efl_io_file_mode_set(efl_self, 0644), /* mandatory for write */ - efl_event_callback_array_add(efl_self, output_cbs(), NULL) /* optional */ + efl_file_set(efl_added, output_fname, NULL), /* mandatory */ + efl_io_file_flags_set(efl_added, O_WRONLY | O_CLOEXEC | O_CREAT | O_TRUNC), /* mandatory for write */ + efl_io_file_mode_set(efl_added, 0644), /* mandatory for write */ + efl_event_callback_array_add(efl_added, output_cbs(), NULL) /* optional */ ); if (!output) { @@ -688,12 +688,12 @@ main(int argc, char **argv) line_delm_slice = (Eina_Slice)EINA_SLICE_STR(line_delimiter); copier = efl_add(EFL_IO_COPIER_CLASS, ecore_main_loop_get(), - efl_io_copier_source_set(efl_self, input), /* mandatory */ - efl_io_copier_destination_set(efl_self, output), /* optional, see :none: */ - efl_io_copier_line_delimiter_set(efl_self, &line_delm_slice), /* optional */ - efl_io_copier_buffer_limit_set(efl_self, buffer_limit), /* optional, defaults to unlimited */ - efl_io_copier_read_chunk_size_set(efl_self, read_chunk_size), /* optional, defaults to 4096 */ - efl_event_callback_array_add(efl_self, copier_cbs(), NULL) /* recommended, at least EFL_IO_COPIER_EVENT_DONE. */ + efl_io_copier_source_set(efl_added, input), /* mandatory */ + efl_io_copier_destination_set(efl_added, output), /* optional, see :none: */ + efl_io_copier_line_delimiter_set(efl_added, &line_delm_slice), /* optional */ + efl_io_copier_buffer_limit_set(efl_added, buffer_limit), /* optional, defaults to unlimited */ + efl_io_copier_read_chunk_size_set(efl_added, read_chunk_size), /* optional, defaults to 4096 */ + efl_event_callback_array_add(efl_added, copier_cbs(), NULL) /* recommended, at least EFL_IO_COPIER_EVENT_DONE. */ ); if (!copier) { diff --git a/src/examples/ecore/efl_io_copier_simple_example.c b/src/examples/ecore/efl_io_copier_simple_example.c index 2db73e4b1e..092d373ab7 100644 --- a/src/examples/ecore/efl_io_copier_simple_example.c +++ b/src/examples/ecore/efl_io_copier_simple_example.c @@ -34,9 +34,9 @@ int main(int argc, char *argv[]) input = efl_add(EFL_IO_STDIN_CLASS, loop); output = efl_add(EFL_IO_STDOUT_CLASS, loop); copier = efl_add(EFL_IO_COPIER_CLASS, loop, - efl_io_copier_source_set(efl_self, input), /* mandatory */ - efl_io_copier_destination_set(efl_self, output), /* optional */ - efl_event_callback_array_add(efl_self, copier_cbs(), NULL) /* recommended, at least EFL_IO_COPIER_EVENT_DONE. */ + efl_io_copier_source_set(efl_added, input), /* mandatory */ + efl_io_copier_destination_set(efl_added, output), /* optional */ + efl_event_callback_array_add(efl_added, copier_cbs(), NULL) /* recommended, at least EFL_IO_COPIER_EVENT_DONE. */ ); ecore_main_loop_begin(); diff --git a/src/examples/ecore/efl_io_queue_example.c b/src/examples/ecore/efl_io_queue_example.c index 730b02c3bd..9b5f3a229d 100644 --- a/src/examples/ecore/efl_io_queue_example.c +++ b/src/examples/ecore/efl_io_queue_example.c @@ -245,8 +245,8 @@ main(int argc, char **argv) * write another. */ send_queue = efl_add(EFL_IO_QUEUE_CLASS, NULL, - efl_name_set(efl_self, "send_queue"), - efl_io_queue_limit_set(efl_self, buffer_limit)); + efl_name_set(efl_added, "send_queue"), + efl_io_queue_limit_set(efl_added, buffer_limit)); if (!send_queue) { fprintf(stderr, "ERROR: could not create Efl_Io_Queue (send)\n"); @@ -267,9 +267,9 @@ main(int argc, char **argv) * clear(). */ receive_queue = efl_add(EFL_IO_QUEUE_CLASS, NULL, - efl_name_set(efl_self, "receive_queue"), - efl_io_queue_limit_set(efl_self, buffer_limit), - efl_event_callback_add(efl_self, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, _receiver_data, NULL)); + efl_name_set(efl_added, "receive_queue"), + efl_io_queue_limit_set(efl_added, buffer_limit), + efl_event_callback_add(efl_added, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, _receiver_data, NULL)); if (!receive_queue) { fprintf(stderr, "ERROR: could not create Efl_Io_Queue (receive)\n"); @@ -291,8 +291,8 @@ main(int argc, char **argv) /* The TCP client to use to send/receive network data */ dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, loop, - efl_name_set(efl_self, "dialer"), - efl_event_callback_add(efl_self, EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected, NULL)); + efl_name_set(efl_added, "dialer"), + efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected, NULL)); if (!dialer) { fprintf(stderr, "ERROR: could not create Efl_Net_Dialer_Tcp\n"); @@ -302,11 +302,11 @@ main(int argc, char **argv) /* sender: send_queue->network */ sender = efl_add(EFL_IO_COPIER_CLASS, loop, - efl_name_set(efl_self, "sender"), - efl_io_copier_line_delimiter_set(efl_self, &line_delimiter), - efl_io_copier_source_set(efl_self, send_queue), - efl_io_copier_destination_set(efl_self, dialer), - efl_event_callback_array_add(efl_self, copier_cbs(), NULL)); + efl_name_set(efl_added, "sender"), + efl_io_copier_line_delimiter_set(efl_added, &line_delimiter), + efl_io_copier_source_set(efl_added, send_queue), + efl_io_copier_destination_set(efl_added, dialer), + efl_event_callback_array_add(efl_added, copier_cbs(), NULL)); if (!sender) { fprintf(stderr, "ERROR: could not create Efl_Io_Copier (sender)\n"); @@ -316,11 +316,11 @@ main(int argc, char **argv) /* receiver: network->receive_queue */ receiver = efl_add(EFL_IO_COPIER_CLASS, loop, - efl_name_set(efl_self, "receiver"), - efl_io_copier_line_delimiter_set(efl_self, &line_delimiter), - efl_io_copier_source_set(efl_self, dialer), - efl_io_copier_destination_set(efl_self, receive_queue), - efl_event_callback_array_add(efl_self, copier_cbs(), NULL)); + efl_name_set(efl_added, "receiver"), + efl_io_copier_line_delimiter_set(efl_added, &line_delimiter), + efl_io_copier_source_set(efl_added, dialer), + efl_io_copier_destination_set(efl_added, receive_queue), + efl_event_callback_array_add(efl_added, copier_cbs(), NULL)); if (!receiver) { fprintf(stderr, "ERROR: could not create Efl_Io_Copier (receiver)\n"); diff --git a/src/examples/ecore/efl_net_dialer_http_example.c b/src/examples/ecore/efl_net_dialer_http_example.c index 9e7a4b5509..de7386923d 100644 --- a/src/examples/ecore/efl_net_dialer_http_example.c +++ b/src/examples/ecore/efl_net_dialer_http_example.c @@ -282,30 +282,30 @@ main(int argc, char **argv) if ((!input_fname) || (strcmp(input_fname, ":stdin:") == 0)) { input = efl_add(EFL_IO_STDIN_CLASS, loop, - efl_name_set(efl_self, "stdin"), - efl_event_callback_add(efl_self, EFL_IO_READER_EVENT_EOS, _eos, NULL)); + efl_name_set(efl_added, "stdin"), + efl_event_callback_add(efl_added, EFL_IO_READER_EVENT_EOS, _eos, NULL)); } else { input = efl_add(EFL_IO_FILE_CLASS, loop, - efl_name_set(efl_self, "input"), - efl_file_set(efl_self, input_fname, NULL), - efl_io_file_flags_set(efl_self, O_RDONLY | O_CLOEXEC), - efl_event_callback_add(efl_self, EFL_IO_READER_EVENT_EOS, _eos, NULL)); + efl_name_set(efl_added, "input"), + efl_file_set(efl_added, input_fname, NULL), + efl_io_file_flags_set(efl_added, O_RDONLY | O_CLOEXEC), + efl_event_callback_add(efl_added, EFL_IO_READER_EVENT_EOS, _eos, NULL)); } if ((!output_fname) || (strcmp(output_fname, ":stdout:") == 0)) { output = efl_add(EFL_IO_STDOUT_CLASS, loop, - efl_name_set(efl_self, "stdout")); + efl_name_set(efl_added, "stdout")); } else { output = efl_add(EFL_IO_FILE_CLASS, loop, - efl_name_set(efl_self, "output"), - efl_file_set(efl_self, output_fname, NULL), - efl_io_file_mode_set(efl_self, 0644), - efl_io_file_flags_set(efl_self, O_WRONLY | O_CLOEXEC | O_TRUNC | O_CREAT)); + efl_name_set(efl_added, "output"), + efl_file_set(efl_added, output_fname, NULL), + efl_io_file_mode_set(efl_added, 0644), + efl_io_file_flags_set(efl_added, O_WRONLY | O_CLOEXEC | O_TRUNC | O_CREAT)); } primary_mode = _parse_primary_mode(primary_mode_str); @@ -316,16 +316,16 @@ main(int argc, char **argv) cookie_jar = ""; dialer = efl_add(EFL_NET_DIALER_HTTP_CLASS, loop, - efl_name_set(efl_self, "dialer"), - efl_net_dialer_http_method_set(efl_self, method), - efl_net_dialer_http_primary_mode_set(efl_self, primary_mode), - efl_net_dialer_http_version_set(efl_self, http_version), - efl_net_dialer_http_authentication_set(efl_self, username, password, authentication_method, authentication_restricted), - efl_net_dialer_http_allow_redirects_set(efl_self, allow_redirects), - efl_net_dialer_http_cookie_jar_set(efl_self, cookie_jar), - efl_net_dialer_proxy_set(efl_self, proxy), - efl_net_dialer_timeout_dial_set(efl_self, timeout_dial), - efl_event_callback_array_add(efl_self, dialer_cbs(), NULL)); + efl_name_set(efl_added, "dialer"), + efl_net_dialer_http_method_set(efl_added, method), + efl_net_dialer_http_primary_mode_set(efl_added, primary_mode), + efl_net_dialer_http_version_set(efl_added, http_version), + efl_net_dialer_http_authentication_set(efl_added, username, password, authentication_method, authentication_restricted), + efl_net_dialer_http_allow_redirects_set(efl_added, allow_redirects), + efl_net_dialer_http_cookie_jar_set(efl_added, cookie_jar), + efl_net_dialer_proxy_set(efl_added, proxy), + efl_net_dialer_timeout_dial_set(efl_added, timeout_dial), + efl_event_callback_array_add(efl_added, dialer_cbs(), NULL)); EINA_LIST_FREE(headers, str) { @@ -346,20 +346,20 @@ main(int argc, char **argv) waiting++; sender = efl_add(EFL_IO_COPIER_CLASS, loop, - efl_name_set(efl_self, "sender"), - efl_io_copier_source_set(efl_self, input), - efl_io_copier_destination_set(efl_self, dialer), - efl_event_callback_array_add(efl_self, copier_cbs(), NULL)); + efl_name_set(efl_added, "sender"), + efl_io_copier_source_set(efl_added, input), + efl_io_copier_destination_set(efl_added, dialer), + efl_event_callback_array_add(efl_added, copier_cbs(), NULL)); fprintf(stderr, "INFO: sending %s->%s\n", efl_name_get(input), efl_name_get(dialer)); receiver = efl_add(EFL_IO_COPIER_CLASS, loop, - efl_name_set(efl_self, "receiver"), - efl_io_copier_source_set(efl_self, dialer), - efl_io_copier_destination_set(efl_self, output), - efl_event_callback_array_add(efl_self, copier_cbs(), NULL)); + efl_name_set(efl_added, "receiver"), + efl_io_copier_source_set(efl_added, dialer), + efl_io_copier_destination_set(efl_added, output), + efl_event_callback_array_add(efl_added, copier_cbs(), NULL)); fprintf(stderr, "INFO: receiving %s->%s\n", efl_name_get(dialer), efl_name_get(output)); diff --git a/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c b/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c index 92595b7f70..da68ebe6a0 100644 --- a/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c +++ b/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c @@ -262,8 +262,8 @@ _websocket_new(const char *name) Eo *dialer; dialer = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, ecore_main_loop_get(), - efl_name_set(efl_self, name), - efl_event_callback_array_add(efl_self, dialer_cbs(), NULL)); + efl_name_set(efl_added, name), + efl_event_callback_array_add(efl_added, dialer_cbs(), NULL)); if (!dialer) { retval = EXIT_FAILURE; diff --git a/src/examples/ecore/efl_net_dialer_websocket_example.c b/src/examples/ecore/efl_net_dialer_websocket_example.c index fa7bb2b7c2..10a2bad413 100644 --- a/src/examples/ecore/efl_net_dialer_websocket_example.c +++ b/src/examples/ecore/efl_net_dialer_websocket_example.c @@ -302,13 +302,13 @@ main(int argc, char **argv) cookie_jar = ""; dialer = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, loop, - efl_name_set(efl_self, "dialer"), - efl_net_dialer_websocket_authentication_set(efl_self, username, password, authentication_method, authentication_restricted), - efl_net_dialer_websocket_allow_redirects_set(efl_self, allow_redirects), - efl_net_dialer_websocket_cookie_jar_set(efl_self, cookie_jar), - efl_net_dialer_proxy_set(efl_self, proxy), - efl_net_dialer_timeout_dial_set(efl_self, timeout_dial), - efl_event_callback_array_add(efl_self, dialer_cbs(), NULL)); + efl_name_set(efl_added, "dialer"), + efl_net_dialer_websocket_authentication_set(efl_added, username, password, authentication_method, authentication_restricted), + efl_net_dialer_websocket_allow_redirects_set(efl_added, allow_redirects), + efl_net_dialer_websocket_cookie_jar_set(efl_added, cookie_jar), + efl_net_dialer_proxy_set(efl_added, proxy), + efl_net_dialer_timeout_dial_set(efl_added, timeout_dial), + efl_event_callback_array_add(efl_added, dialer_cbs(), NULL)); if (!dialer) { retval = EXIT_FAILURE; diff --git a/src/examples/ecore/efl_net_server_example.c b/src/examples/ecore/efl_net_server_example.c index ac59e56511..620a94e6e6 100644 --- a/src/examples/ecore/efl_net_server_example.c +++ b/src/examples/ecore/efl_net_server_example.c @@ -303,9 +303,9 @@ _server_client_add(void *data EINA_UNUSED, const Efl_Event *event) * source and destination. */ Eo *echo_copier = efl_add(EFL_IO_COPIER_CLASS, efl_parent_get(client), - efl_io_copier_source_set(efl_self, client), - efl_io_copier_destination_set(efl_self, client), - efl_event_callback_array_add(efl_self, echo_copier_cbs(), client) + efl_io_copier_source_set(efl_added, client), + efl_io_copier_destination_set(efl_added, client), + efl_event_callback_array_add(efl_added, echo_copier_cbs(), client) ); fprintf(stderr, "INFO: using an echo copier=%p for client %s\n", @@ -344,9 +344,9 @@ _server_client_add(void *data EINA_UNUSED, const Efl_Event *event) /* an input copier that takes data from send_buffer and pushes to client */ d->send_copier = efl_add(EFL_IO_COPIER_CLASS, efl_parent_get(client), - efl_io_copier_source_set(efl_self, send_buffer), - efl_io_copier_destination_set(efl_self, client), - efl_event_callback_array_add(efl_self, send_copier_cbs(), d) + efl_io_copier_source_set(efl_added, send_buffer), + efl_io_copier_destination_set(efl_added, client), + efl_event_callback_array_add(efl_added, send_copier_cbs(), d) ); fprintf(stderr, "INFO: using sender buffer %p with copier %p for client %s\n", @@ -359,9 +359,9 @@ _server_client_add(void *data EINA_UNUSED, const Efl_Event *event) /* an output copier that takes data from socket and pushes to recv_buffer. */ d->recv_copier = efl_add(EFL_IO_COPIER_CLASS, efl_parent_get(client), - efl_io_copier_source_set(efl_self, client), - efl_io_copier_destination_set(efl_self, recv_buffer), - efl_event_callback_array_add(efl_self, recv_copier_cbs(), d) + efl_io_copier_source_set(efl_added, client), + efl_io_copier_destination_set(efl_added, recv_buffer), + efl_event_callback_array_add(efl_added, recv_copier_cbs(), d) ); fprintf(stderr, "INFO: using receiver buffer %p with copier %p for client %s\n", @@ -503,13 +503,13 @@ main(int argc, char **argv) } server = efl_add(cls, ecore_main_loop_get(), /* it's mandatory to use a main loop provider as the server parent */ - efl_net_server_fd_close_on_exec_set(efl_self, EINA_TRUE), /* recommended */ - efl_net_server_fd_reuse_address_set(efl_self, EINA_TRUE), /* optional, but nice for testing */ - efl_net_server_fd_reuse_port_set(efl_self, EINA_TRUE), /* optional, but nice for testing... not secure unless you know what you're doing */ - efl_net_server_clients_limit_set(efl_self, + efl_net_server_fd_close_on_exec_set(efl_added, EINA_TRUE), /* recommended */ + efl_net_server_fd_reuse_address_set(efl_added, EINA_TRUE), /* optional, but nice for testing */ + efl_net_server_fd_reuse_port_set(efl_added, EINA_TRUE), /* optional, but nice for testing... not secure unless you know what you're doing */ + efl_net_server_clients_limit_set(efl_added, clients_limit, clients_reject_excess), /* optional */ - efl_event_callback_array_add(efl_self, server_cbs(), NULL)); /* mandatory to have "client,add" in order to be useful */ + efl_event_callback_array_add(efl_added, server_cbs(), NULL)); /* mandatory to have "client,add" in order to be useful */ if (!server) { fprintf(stderr, "ERROR: could not create class %p (%s)\n", diff --git a/src/examples/eldbus/dbusmodel.c b/src/examples/eldbus/dbusmodel.c index 5edbcc82ed..034fde63d2 100644 --- a/src/examples/eldbus/dbusmodel.c +++ b/src/examples/eldbus/dbusmodel.c @@ -134,7 +134,7 @@ main(int argc, char **argv EINA_UNUSED) if (argc > 1) bus = argv[1]; if (argc > 2) path = argv[2]; - root = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, bus, path)); + root = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, bus, path)); Eina_Promise *promises[] = { NULL, NULL, NULL}; promises[0] = efl_model_children_slice_get(root, 0, 0); diff --git a/src/examples/elementary/evas3d_map_example.c b/src/examples/elementary/evas3d_map_example.c index 040b125562..6814db23b6 100644 --- a/src/examples/elementary/evas3d_map_example.c +++ b/src/examples/elementary/evas3d_map_example.c @@ -881,7 +881,7 @@ skybox_setup(void) evas_canvas3d_material_color_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0); evas_canvas3d_material_shininess_set(skybox_material, 50.0); - skybox_mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + skybox_mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(root_node, skybox_mesh_node); evas_canvas3d_node_mesh_add(skybox_mesh_node, skybox_mesh); evas_canvas3d_mesh_shader_mode_set(skybox_mesh, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE); @@ -940,7 +940,7 @@ camera_setup(void) camera_right_vec.y = 0.0; camera_right_vec.z = 0.0; - camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(camera_node, camera); evas_canvas3d_node_position_set(camera_node, camera_pos.x, camera_pos.y, camera_pos.z); evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z); @@ -955,7 +955,7 @@ light_setup(void) evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0); evas_canvas3d_light_specular_set(light, 0.2, 0.2, 0.2, 1.0); - light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(light_node, light); evas_canvas3d_node_position_set(light_node, 0.0, 0.0, MAX_CAMERA_DISTANCE); evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -1001,7 +1001,7 @@ mesh_setup(void) evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0); evas_canvas3d_material_shininess_set(material, 50.0); - mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(root_node, mesh_node); evas_canvas3d_node_mesh_add(mesh_node, mesh); evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP); @@ -1169,7 +1169,7 @@ elm_main(int argc, char **argv) scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); /* Add a root node for the scene. */ - root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); skybox_setup(); texture_source_setup(); diff --git a/src/examples/elementary/evas3d_object_on_button_example.c b/src/examples/elementary/evas3d_object_on_button_example.c index f8ffcebf13..19e223aa7b 100644 --- a/src/examples/elementary/evas3d_object_on_button_example.c +++ b/src/examples/elementary/evas3d_object_on_button_example.c @@ -164,7 +164,7 @@ _camera_setup(Scene_Data *data) evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0); data->camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(data->camera_node, data->camera); evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 15.0); evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1.0, 0.0); @@ -180,7 +180,7 @@ _light_setup(Scene_Data *data) evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); data->light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -220,7 +220,7 @@ _mesh_setup(Scene_Data *data) evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE); data->mesh_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->root_node, data->mesh_node); evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); } @@ -233,7 +233,7 @@ _scene_setup(Scene_Data *data) evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); data->root_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); diff --git a/src/examples/elementary/evas3d_scene_on_button_example.c b/src/examples/elementary/evas3d_scene_on_button_example.c index e4ce30848c..a70cf4a587 100644 --- a/src/examples/elementary/evas3d_scene_on_button_example.c +++ b/src/examples/elementary/evas3d_scene_on_button_example.c @@ -125,7 +125,7 @@ _camera_setup(Scene_Data *data) evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); data->camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(data->camera_node, data->camera); evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -141,7 +141,7 @@ _light_setup(Scene_Data *data) evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); data->light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -175,7 +175,7 @@ _mesh_setup(Scene_Data *data) evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); data->mesh_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->root_node, data->mesh_node); evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); } @@ -188,7 +188,7 @@ _scene_setup(Scene_Data *data) evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); data->root_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c index 22fc5e39de..4441df27ab 100644 --- a/src/examples/elementary/filemvc.c +++ b/src/examples/elementary/filemvc.c @@ -65,7 +65,7 @@ _promise_then(void *data, void *value) Eo *model; eina_value_get(value, &path); - model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path)); + model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, path)); elm_view_list_model_set(priv->fileview, model); } @@ -144,12 +144,12 @@ elm_main(int argc, char **argv) else dirname = EFL_MODEL_TEST_FILENAME_PATH; //treemodel - priv.treemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, dirname)); + priv.treemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, dirname)); eio_model_children_filter_set(priv.treemodel, _filter_cb, NULL); //treeview genlist = elm_genlist_add(win); - priv.treeview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_self, genlist, ELM_GENLIST_ITEM_TREE, NULL)); + priv.treeview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_TREE, NULL)); elm_view_list_property_connect(priv.treeview, "filename", "elm.text"); elm_view_list_property_connect(priv.treeview, "icon", "elm.swallow.icon"); elm_view_list_model_set(priv.treeview, priv.treemodel); @@ -164,7 +164,7 @@ elm_main(int argc, char **argv) //listview genlist = elm_genlist_add(win); - priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_self, genlist, ELM_GENLIST_ITEM_NONE, "double_label")); + priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_NONE, "double_label")); elm_view_list_property_connect(priv.fileview, "filename", "elm.text"); elm_view_list_property_connect(priv.fileview, "mime_type", "elm.text.sub"); diff --git a/src/examples/elementary/fileviewlist.c b/src/examples/elementary/fileviewlist.c index a4613ef54b..96f49557de 100644 --- a/src/examples/elementary/fileviewlist.c +++ b/src/examples/elementary/fileviewlist.c @@ -54,8 +54,8 @@ elm_main(int argc, char **argv) evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(genlist); - priv.filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, dirname)); - priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_self, genlist, ELM_GENLIST_ITEM_TREE, "double_label")); + priv.filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, dirname)); + priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_TREE, "double_label")); elm_view_list_model_set(priv.fileview, priv.filemodel); evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, &priv); diff --git a/src/examples/elementary/performance/graphical.c b/src/examples/elementary/performance/graphical.c index 70a40cd00e..3aa7e4eed8 100644 --- a/src/examples/elementary/performance/graphical.c +++ b/src/examples/elementary/performance/graphical.c @@ -272,7 +272,7 @@ void _init_bounding() evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh_box, 0, globalGraphical.material_box); globalGraphical.mesh_nodebox = - efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(efl_self, 0, -30.0, 0.0)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(efl_added, 0, -30.0, 0.0)); evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_nodebox); evas_canvas3d_node_mesh_add(globalGraphical.mesh_nodebox, globalGraphical.mesh_box); } @@ -359,7 +359,7 @@ _change_scene_setup() for (i = 0; i < quantity; i++) { globalGraphical.mesh_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(efl_self, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(efl_added, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20)); if (globalGraphical.model_path) evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2); evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node); @@ -397,14 +397,14 @@ _init_scene(Evas_Object *img) globalGraphical.scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, globalGraphical.evas); /* Add the root node for the scene. */ - globalGraphical.root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + globalGraphical.root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); /* Add the camera. */ globalGraphical.camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, globalGraphical.evas); evas_canvas3d_camera_projection_perspective_set(globalGraphical.camera, globalGraphical.angle, 1.0, 2.0, 1000.0); globalGraphical.camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(globalGraphical.camera_node, globalGraphical.camera); evas_canvas3d_node_position_set(globalGraphical.camera_node, 0.0, 0.0, 25.0); evas_canvas3d_node_look_at_set(globalGraphical.camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -418,7 +418,7 @@ _init_scene(Evas_Object *img) evas_canvas3d_light_spot_cutoff_set(globalGraphical.light, globalGraphical.angle / 15); globalGraphical.light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(globalGraphical.light_node, globalGraphical.light); evas_canvas3d_node_position_set(globalGraphical.light_node, 0.0, 100.0, 1.0); evas_canvas3d_node_look_at_set(globalGraphical.light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -474,7 +474,7 @@ _init_scene(Evas_Object *img) for (i = 0; i < quantity; i++) { globalGraphical.mesh_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(efl_self, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(efl_added, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20)); if (globalGraphical.model_path) evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2); evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node); diff --git a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c index 9c7f55d541..7127919eba 100644 --- a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c +++ b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c @@ -437,7 +437,7 @@ _camera_setup(Scene_Data *data) data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 1.0, 1000.0); - data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(data->camera_node, data->camera); evas_canvas3d_node_position_set(data->camera_node, 0.0, 40, 70); evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -465,7 +465,7 @@ _light_setup(Scene_Data *data) evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 1000.0); - data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, 0.1, 25.0, 0.1); evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -507,7 +507,7 @@ _create_bondar(Scene_Data *data, Evas_Real scale_x, Evas_Real scale_y, Evas_Real mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); @@ -555,7 +555,7 @@ _create_cubes(Scene_Data *data, Evas_Real r, int count) Eo *node = NULL; alpha = d_alpha * i * M_PI / 180; - node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_mesh_add(node, data->mesh_cube); evas_canvas3d_node_position_set(node, r * sin(alpha), 2.0 + (r / 4 * sin(alpha)), r * cos(alpha)); @@ -574,7 +574,7 @@ _mesh_ball_setup(Scene_Data *data) data->mesh_ball = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); data->material_ball = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); - data->mesh_node_ball = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + data->mesh_node_ball = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); /* Setup material for ball. */ evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); @@ -611,7 +611,7 @@ _scene_setup(Scene_Data *data, Evas_Real r, int count) data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); /* Add the root node for the scene. */ - data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); evas_canvas3d_scene_shadows_enable_set(data->scene, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c index 6399b1ef36..bc97434478 100644 --- a/src/examples/evas/evas-3d-aabb.c +++ b/src/examples/evas/evas-3d-aabb.c @@ -144,13 +144,13 @@ main(void) scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0); camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(camera_node, camera); evas_canvas3d_node_member_add(root_node, camera_node); evas_canvas3d_node_position_set(camera_node, 100.0, 50.0, 20.0); @@ -162,7 +162,7 @@ main(void) evas_canvas3d_light_directional_set(light, EINA_TRUE); light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(light_node, light); evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0); evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -189,8 +189,8 @@ main(void) evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); evas_canvas3d_material_shininess_set(material, 50.0); - mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); - mesh_box_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); + mesh_box_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); material_box = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); evas_canvas3d_material_enable_set(material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c index 8e41cf1f97..ab9ea9c4a3 100644 --- a/src/examples/evas/evas-3d-blending.c +++ b/src/examples/evas/evas-3d-blending.c @@ -153,7 +153,7 @@ _camera_setup(Scene_Data *data) evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); data->camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(data->camera_node, data->camera); evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); @@ -171,7 +171,7 @@ _light_setup(Scene_Data *data) evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); data->light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -220,13 +220,13 @@ _mesh_setup(Scene_Data *data) _set_ball(data->mesh1, data->sphere, data->material1); data->mesh_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->root_node, data->mesh_node); evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); data->mesh_node1 = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->root_node, data->mesh_node1); evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1); @@ -248,7 +248,7 @@ _scene_setup(Scene_Data *data) evas_canvas3d_scene_background_color_set(data->scene, 0.5, 0.5, 0.5, 1); data->root_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c index bbfcdddb39..71a4fca673 100644 --- a/src/examples/evas/evas-3d-colorpick.c +++ b/src/examples/evas/evas-3d-colorpick.c @@ -274,13 +274,13 @@ _init_scene(const char *texture) globalscene.scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - globalscene.root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + globalscene.root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); globalscene.camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); evas_canvas3d_camera_projection_perspective_set(globalscene.camera, 30.0, 1.0, 1.0, 1000.0); globalscene.camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(globalscene.camera_node, globalscene.camera); evas_canvas3d_node_member_add(globalscene.root_node, globalscene.camera_node); evas_canvas3d_node_position_set(globalscene.camera_node, 0.0, 30.0, 800.0); @@ -292,7 +292,7 @@ _init_scene(const char *texture) evas_canvas3d_light_directional_set(globalscene.light, EINA_TRUE); globalscene.light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(globalscene.light_node, globalscene.light); evas_canvas3d_node_position_set(globalscene.light_node, 100.0, 50.0, 300.0); evas_canvas3d_node_look_at_set(globalscene.light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 1.0, 1.0, 1.0); @@ -313,7 +313,7 @@ _init_scene(const char *texture) m->material = spheretmp->material; m->texture = spheretmp->texture; } - m->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + m->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); m->speed = tmp; m->sphere_animate = _animate_sphere; m->animate = ecore_timer_add(m->speed, m->sphere_animate, m); diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c index 24dc10a0c9..c7da14ad70 100644 --- a/src/examples/evas/evas-3d-cube-rotate.c +++ b/src/examples/evas/evas-3d-cube-rotate.c @@ -155,7 +155,7 @@ _camera_setup(Scene_Data *data) data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0); - data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(data->camera_node, data->camera); evas_canvas3d_node_position_set(data->camera_node, 3.0, 3.0, 10.0); evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -172,7 +172,7 @@ _light_setup(Scene_Data *data) evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); - data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, 5.0, 5.0, 10.0); @@ -205,7 +205,7 @@ _mesh_setup(Scene_Data *data) evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG); evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); - data->mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + data->mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->root_node, data->mesh_node); evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); } @@ -214,7 +214,7 @@ static void _scene_setup(Scene_Data *data) { scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); evas_canvas3d_scene_background_color_set(scene, 0.0, 0.0, 0.0, 0.0); diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c index 6c9b0d2fe9..a223a72903 100644 --- a/src/examples/evas/evas-3d-cube.c +++ b/src/examples/evas/evas-3d-cube.c @@ -142,7 +142,7 @@ _camera_setup(Scene_Data *data) evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); data->camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(data->camera_node, data->camera); evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -158,7 +158,7 @@ _light_setup(Scene_Data *data) evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); data->light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -192,7 +192,7 @@ _mesh_setup(Scene_Data *data) evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); data->mesh_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->root_node, data->mesh_node); evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); } @@ -205,7 +205,7 @@ _scene_setup(Scene_Data *data) evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); data->root_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c index 7f6dbb5d39..b8609f221f 100644 --- a/src/examples/evas/evas-3d-cube2.c +++ b/src/examples/evas/evas-3d-cube2.c @@ -115,7 +115,7 @@ _camera_setup(Scene_Data *data) evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); data->camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(data->camera_node, data->camera); evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 3.0); evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -131,7 +131,7 @@ _light_setup(Scene_Data *data) evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); data->light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -188,7 +188,7 @@ _mesh_setup(Scene_Data *data) evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP); data->mesh_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->root_node, data->mesh_node); evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); } @@ -201,7 +201,7 @@ _scene_setup(Scene_Data *data) evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); data->root_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c index aa883f4d44..5393838481 100644 --- a/src/examples/evas/evas-3d-eet.c +++ b/src/examples/evas/evas-3d-eet.c @@ -118,13 +118,13 @@ main(void) scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); /* Add the root node for the scene. */ - root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); /* Add the camera. */ camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0); - camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(camera_node, camera); evas_canvas3d_node_member_add(root_node, camera_node); evas_canvas3d_node_position_set(camera_node, 200.0, 0.0, 40.0); @@ -136,7 +136,7 @@ main(void) evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0); evas_canvas3d_light_directional_set(light, EINA_TRUE); - light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(light_node, light); evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0); evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -169,13 +169,13 @@ main(void) efl_file_set(mesh2, output_model_path, NULL); evas_canvas3d_mesh_shader_mode_set(mesh2, EVAS_CANVAS3D_SHADER_MODE_PHONG); - mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(root_node, mesh_node); evas_canvas3d_node_mesh_add(mesh_node, mesh); evas_canvas3d_node_position_set(mesh_node, 0.0, -40.0, 0.0); - mesh_node2 = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + mesh_node2 = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(root_node, mesh_node2); evas_canvas3d_node_mesh_add(mesh_node2, mesh2); evas_canvas3d_node_position_set(mesh_node2, 0.0, 40.0, 0.0); diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c index a29521aff9..25fbc66002 100644 --- a/src/examples/evas/evas-3d-fog.c +++ b/src/examples/evas/evas-3d-fog.c @@ -88,7 +88,7 @@ _camera_setup(Scene_Data *data) evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); data->camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(data->camera_node, data->camera); evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 7.0); @@ -106,7 +106,7 @@ _light_setup(Scene_Data *data) evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); data->light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -146,10 +146,10 @@ _mesh_setup(Scene_Data *data) _set_ball(data->mesh1, data->sphere, data->material); data->animation_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); data->mesh_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->animation_node, data->mesh_node); evas_canvas3d_node_member_add(data->root_node, data->animation_node); @@ -157,7 +157,7 @@ _mesh_setup(Scene_Data *data) evas_canvas3d_node_position_set(data->mesh_node, 0.0, 0.0, 3.0); data->mesh_node1 = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->root_node, data->mesh_node1); evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1); @@ -178,7 +178,7 @@ _scene_setup(Scene_Data *data) evas_canvas3d_scene_background_color_set(data->scene, FOG_COLOR, 1); data->root_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c index a7d2c2ef8e..a107cd1f15 100644 --- a/src/examples/evas/evas-3d-frustum.c +++ b/src/examples/evas/evas-3d-frustum.c @@ -280,7 +280,7 @@ static void _camera_setup(Scene_Data *data) { data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(data->camera_node, data->camera); evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 300.0); evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -298,7 +298,7 @@ _light_setup(Scene_Data *data) evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); - data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 200.0); evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0); @@ -339,7 +339,7 @@ _mesh_setup(Scene_Data *data) evas_canvas3d_mesh_frame_material_set(data->mesh_sphere, 0, data->material); data->mesh_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->root_node, data->mesh_node); evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh_aabb); } @@ -376,13 +376,13 @@ _scene_setup(Scene_Data *data) { data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); - data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); _light_setup(data); _mesh_setup_model(data); _camera_setup(data); - data->mesh_node_model = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + data->mesh_node_model = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_position_set(data->mesh_node_model, obj_x, obj_y, obj_z); evas_canvas3d_node_orientation_angle_axis_set(data->mesh_node_model, -90, 1.0, 0.0, 0.0); evas_canvas3d_node_scale_set(data->mesh_node_model, obj_sc_x, obj_sc_y, obj_sc_z); diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c index 96d85bb502..0b00cac971 100644 --- a/src/examples/evas/evas-3d-hull.c +++ b/src/examples/evas/evas-3d-hull.c @@ -260,7 +260,7 @@ _camera_setup(Scene_Data *data) evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); data->camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(data->camera_node, data->camera); evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -276,7 +276,7 @@ _light_setup(Scene_Data *data) evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); data->light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -354,7 +354,7 @@ _mesh_setup(Scene_Data *data) MODEL_MESH_INIT(blender_test_sonic, sonic_test, DIFFUSE) data->mesh_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->root_node, data->mesh_node); evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh_sphere); evas_canvas3d_node_scale_set(data->mesh_node, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE); @@ -372,14 +372,14 @@ _mesh_setup(Scene_Data *data) _print_result(data->mesh_sphere_ch, data->mesh_blender_test_sphere); data->mesh_node_convex_hull = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->root_node, data->mesh_node_convex_hull); evas_canvas3d_node_position_set(data->mesh_node_convex_hull, 0.0, 0.0, 0.0); evas_canvas3d_node_scale_set(data->mesh_node_convex_hull, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE); evas_canvas3d_node_mesh_add(data->mesh_node_convex_hull, data->mesh_sphere_ch); data->mesh_node_blender = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->root_node, data->mesh_node_blender); evas_canvas3d_node_position_set(data->mesh_node_blender, -3.0, 0.0, 0.0); evas_canvas3d_node_scale_set(data->mesh_node_blender, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE); @@ -394,7 +394,7 @@ _scene_setup(Scene_Data *data) evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); data->root_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c index 875cc46df8..4203b8a904 100644 --- a/src/examples/evas/evas-3d-md2.c +++ b/src/examples/evas/evas-3d-md2.c @@ -94,14 +94,14 @@ main(void) scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); /* Add the root node for the scene. */ - root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); /* Add the camera. */ camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0); camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(camera_node, camera); evas_canvas3d_node_member_add(root_node, camera_node); evas_canvas3d_node_position_set(camera_node, 100.0, 0.0, 20.0); @@ -114,7 +114,7 @@ main(void) evas_canvas3d_light_directional_set(light, EINA_TRUE); light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(light_node, light); evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0); evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -142,7 +142,7 @@ main(void) evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); evas_canvas3d_material_shininess_set(material, 50.0); - mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(root_node, mesh_node); evas_canvas3d_node_mesh_add(mesh_node, mesh); diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c index 2c04deca7d..2c8269bfcc 100644 --- a/src/examples/evas/evas-3d-mmap-set.c +++ b/src/examples/evas/evas-3d-mmap-set.c @@ -36,7 +36,7 @@ efl_file_mmap_set(mesh_##extention, extention##_file, NULL); \ evas_canvas3d_mesh_frame_material_set(mesh_##extention, 0, material); \ evas_canvas3d_mesh_shader_mode_set(mesh_##extention, EVAS_CANVAS3D_SHADER_MODE_PHONG); \ - node_##extention = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ + node_##extention = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ evas_canvas3d_node_member_add(root_node, node_##extention); \ evas_canvas3d_node_mesh_add(node_##extention, mesh_##extention); \ evas_canvas3d_node_position_set(node_##extention, initial_node_data[number * 10], \ @@ -184,14 +184,14 @@ main(void) scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); /* Add the root node for the scene. */ - root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); /* Add the camera. */ camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); evas_canvas3d_camera_projection_perspective_set(camera, 10.0, 1.0, 1.0, 500.0); camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(camera_node, camera); evas_canvas3d_node_member_add(root_node, camera_node); evas_canvas3d_node_position_set(camera_node, 0.0, 0.0, 100.0); @@ -204,7 +204,7 @@ main(void) evas_canvas3d_light_directional_set(light, EINA_TRUE); light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(light_node, light); evas_canvas3d_node_position_set(light_node, 1.0, 0.0, 100.0); evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c index aaac77ca6f..ea3874d5c8 100644 --- a/src/examples/evas/evas-3d-obj.c +++ b/src/examples/evas/evas-3d-obj.c @@ -49,7 +49,7 @@ efl_file_set(mesh[num], full_file_path, NULL); \ evas_canvas3d_mesh_frame_material_set(mesh[num], 0, name_of_material); \ evas_canvas3d_mesh_shader_mode_set(mesh[num], shade_mode); \ - mesh_node[num] = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ + mesh_node[num] = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ evas_canvas3d_node_member_add(root_node, mesh_node[num]); \ evas_canvas3d_node_mesh_add(mesh_node[num], mesh[num]); \ evas_canvas3d_node_position_set(mesh_node[num], 0, Y, Z); \ @@ -160,14 +160,14 @@ main(void) scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); /* Add the root node for the scene. */ - root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); /* Add the camera. */ camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); evas_canvas3d_camera_projection_perspective_set(camera, 20.0, 1.0, 1.0, 500.0); camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(camera_node, camera); evas_canvas3d_node_member_add(root_node, camera_node); evas_canvas3d_node_position_set(camera_node, 100.0, 0.0, 0.0); @@ -180,7 +180,7 @@ main(void) evas_canvas3d_light_directional_set(light, EINA_TRUE); light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(light_node, light); evas_canvas3d_node_position_set(light_node, 10.0, 0.0, 0.0); evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c index ac9b7a4008..7175546294 100644 --- a/src/examples/evas/evas-3d-parallax-occlusion.c +++ b/src/examples/evas/evas-3d-parallax-occlusion.c @@ -108,7 +108,7 @@ _camera_setup(Scene_Data *data) evas_canvas3d_camera_projection_perspective_set(data->camera, 30.0, 1.0, 2.0, 50.0); - data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(data->camera_node, data->camera); evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -123,7 +123,7 @@ _light_setup(Scene_Data *data) evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); - data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, -20.0, 20.0, 50.0); evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -191,7 +191,7 @@ _mesh_setup(Scene_Data *data) evas_canvas3d_mesh_frame_material_set(data->mesh, 100, data->material_wood); - data->mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + data->mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->root_node, data->mesh_node); evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); evas_canvas3d_node_scale_set(data->mesh_node, 3, 3, 3); @@ -204,7 +204,7 @@ _scene_setup(Scene_Data *data) evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); - data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c index 71608de62f..4ecf9c64f8 100644 --- a/src/examples/evas/evas-3d-pick.c +++ b/src/examples/evas/evas-3d-pick.c @@ -120,14 +120,14 @@ main(void) scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); /* Add the root node for the scene. */ - root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); /* Add the camera. */ camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); evas_canvas3d_camera_projection_perspective_set(camera, 30.0, 1.0, 1.0, 100.0); camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(camera_node, camera); evas_canvas3d_node_position_set(camera_node, 0.0, 0.0, 2.5); evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -154,7 +154,7 @@ main(void) evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); evas_canvas3d_material_shininess_set(material, 50.0); - mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(root_node, mesh_node); evas_canvas3d_node_mesh_add(mesh_node, mesh); diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c index 842be8e385..4e6de36165 100644 --- a/src/examples/evas/evas-3d-ply.c +++ b/src/examples/evas/evas-3d-ply.c @@ -133,13 +133,13 @@ main(void) scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); /* Add the root node for the scene. */ - root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); /* Add the camera. */ camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0); - camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(camera_node, camera); evas_canvas3d_node_member_add(root_node, camera_node); evas_canvas3d_node_position_set(camera_node, 15.0, 0.0, 0.0); @@ -151,7 +151,7 @@ main(void) evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0); evas_canvas3d_light_directional_set(light, EINA_TRUE); - light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(light_node, light); evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0); evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -196,7 +196,7 @@ main(void) evas_canvas3d_mesh_shader_mode_set(mesh[i], draw_mode[(i % 8)]); } - mesh_node[i] = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + mesh_node[i] = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(root_node, mesh_node[i]); evas_canvas3d_node_mesh_add(mesh_node[i], mesh[i]); evas_canvas3d_node_position_set(mesh_node[i], 0, ((i % 4) * 4) + ((i / 16) * 1) - 6.5, (((i % 16) / 4) * 4) - 6); diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c index 5d62ff7b2e..9edbfb2337 100644 --- a/src/examples/evas/evas-3d-proxy.c +++ b/src/examples/evas/evas-3d-proxy.c @@ -120,7 +120,7 @@ _camera_setup(Scene_Data *data) evas_canvas3d_camera_projection_perspective_set(data->camera, 30.0, 1.0, 2.0, 50.0); data->camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(data->camera_node, data->camera); evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 5.0); evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -136,7 +136,7 @@ _light_setup(Scene_Data *data) evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); data->light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); @@ -173,7 +173,7 @@ _mesh_setup(Scene_Data *data) evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); data->mesh_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->root_node, data->mesh_node); evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); @@ -187,7 +187,7 @@ _scene_setup(Scene_Data *data) evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); data->root_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c index 7288bfd75c..2b0f7e9c3d 100644 --- a/src/examples/evas/evas-3d-shadows.c +++ b/src/examples/evas/evas-3d-shadows.c @@ -209,7 +209,7 @@ _sphere_setup(Body_3D *sphere) _body_material_set(sphere, 1, 0.0, 0.0); - sphere->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(efl_self, 3.0, 3.0, 0.0)); + sphere->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(efl_added, 3.0, 3.0, 0.0)); evas_canvas3d_node_mesh_add(sphere->node, sphere->mesh); } @@ -226,7 +226,7 @@ _cone_setup(Body_3D *cone) _body_material_set(cone, 0.8, 0.5, 0.5); cone->node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_mesh_add(cone->node, cone->mesh); evas_canvas3d_node_orientation_angle_axis_set(cone->node, -90.0, 1.0, 0.0, 0.0); evas_canvas3d_node_position_set(cone->node, -4.0, 0.0, -3.0); @@ -245,7 +245,7 @@ _cylinder_setup(Body_3D *cylinder) _body_material_set(cylinder, 0.0, 0.0, 1.0); cylinder->node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_mesh_add(cylinder->node, cylinder->mesh); evas_canvas3d_node_orientation_angle_axis_set(cylinder->node, -90.0, 1.0, 0.0, 0.0); evas_canvas3d_node_position_set(cylinder->node, -2.0, 3.0, 1.0); @@ -293,7 +293,7 @@ _fence_setup(Body_3D *fence) evas_canvas3d_mesh_alpha_test_enable_set(fence->mesh, EINA_TRUE); evas_canvas3d_mesh_shader_mode_set(fence->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP); fence->node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_mesh_add(fence->node, fence->mesh); evas_canvas3d_node_orientation_angle_axis_set(fence->node, -90.0, 1.0, 0.0, 0.0); evas_canvas3d_node_scale_set(fence->node, 10.0, 10.0, 5.0); @@ -312,7 +312,7 @@ _square_setup(Body_3D *square) _body_material_set(square, 0.4, 0.4, 0.4); square->node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_mesh_add(square->node, square->mesh); evas_canvas3d_node_position_set(square->node, 0.0, -1.0, 0.0); evas_canvas3d_node_scale_set(square->node, 30.0, 30.0, 30.0); @@ -330,7 +330,7 @@ _box_setup(Body_3D *box) _body_material_set(box, 0, 1, 0); - box->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + box->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_mesh_add(box->node, box->mesh); evas_canvas3d_node_position_set(box->node, 3.0, 0.0, -3.0); } @@ -358,7 +358,7 @@ _model_setup(Body_3D *model) evas_canvas3d_mesh_shader_mode_set(model->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG); model->node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_mesh_add(model->node, model->mesh); evas_canvas3d_node_scale_set(model->node, 0.1, 0.1, 0.1); evas_canvas3d_node_orientation_angle_axis_set(model->node, 120.0, -0.577, -0.577, -0.577); @@ -389,7 +389,7 @@ _billboard_setup(Scene_Data *data) evas_canvas3d_mesh_blending_enable_set(data->billboard.mesh, EINA_TRUE); evas_canvas3d_mesh_blending_func_set(data->billboard.mesh, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA); - data->billboard.node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + data->billboard.node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_mesh_add(data->billboard.node, data->billboard.mesh); evas_canvas3d_node_position_set(data->billboard.node, 0.0, 2.0, 0.0); evas_canvas3d_node_scale_set(data->billboard.node, 2.2, 4.6, 4.0); @@ -401,12 +401,12 @@ static void _camera_setup(Scene_Data *data) { data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); - data->mediator = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + data->mediator = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 2.0, 100.0); data->camera_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(data->camera_node, data->camera); @@ -429,7 +429,7 @@ _light_setup(Scene_Data *data) evas_canvas3d_light_projection_perspective_set(data->light, 40.0, 1.0, 2.0, 1000.0); data->light_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, 50.0, 50.0, 70.0); evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 15.0, 0.0, -5.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0); @@ -447,7 +447,7 @@ _scene_setup(Scene_Data *data) evas_canvas3d_scene_background_color_set(data->scene, BG_COLOR, 1); data->root_node = - efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c index 49d723c8b6..6e803ec1ab 100644 --- a/src/examples/evas/evas-3d-static-lod.c +++ b/src/examples/evas/evas-3d-static-lod.c @@ -116,7 +116,7 @@ _camera_setup(Scene_Data *data) data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_camera_set(data->camera_node, data->camera); evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 300.0); evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, @@ -134,7 +134,7 @@ _light_setup(Scene_Data *data) data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 300.0); evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, @@ -160,16 +160,16 @@ _mesh_setup(Scene_Data *data) data->lod_mesh_node1 = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_position_set(data->lod_mesh_node1, 2.0, 0.0, 0.0); data->lod_mesh_node2 = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); data->complex_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); evas_canvas3d_node_scale_set(data->complex_node, 30.0, 30.0, 30.0); /* Setup mesh. One model, two meshes object with dufferent lod distances.*/ @@ -209,7 +209,7 @@ _scene_setup(Scene_Data *data) data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, - evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c index d7d641a194..17bf3f03e6 100644 --- a/src/examples/evas/evas-vg-simple.c +++ b/src/examples/evas/evas-vg-simple.c @@ -104,15 +104,15 @@ vector_set(int x, int y, int w, int h) root = efl_add(EFL_VG_CONTAINER_CLASS, NULL); //evas_vg_node_transformation_set(root, &matrix); - Efl_VG *bg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "bg")); + Efl_VG *bg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "bg")); evas_vg_shape_shape_append_rect(bg, 0, 0 , vg_w, vg_h, 0, 0); evas_vg_node_origin_set(bg, 0,0); evas_vg_shape_stroke_width_set(bg, 1.0); evas_vg_node_color_set(bg, 80, 80, 80, 80); - Efl_VG *shape = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "shape")); - Efl_VG *rgradient = efl_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(efl_self, "rgradient")); - Efl_VG *lgradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(efl_self, "lgradient")); + Efl_VG *shape = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "shape")); + Efl_VG *rgradient = efl_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(efl_added, "rgradient")); + Efl_VG *lgradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(efl_added, "lgradient")); evas_vg_shape_shape_append_arc(shape, 0, 0, 100, 100, 25, 330); @@ -153,7 +153,7 @@ vector_set(int x, int y, int w, int h) evas_vg_node_color_set(shape, 0, 0, 255, 255); evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 128); - Efl_VG *rect = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "rect")); + Efl_VG *rect = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "rect")); evas_vg_shape_shape_append_rect(rect, 0, 0, 100, 100, 0, 0); evas_vg_node_origin_set(rect, 100, 100); evas_vg_shape_fill_set(rect, lgradient); @@ -161,7 +161,7 @@ vector_set(int x, int y, int w, int h) evas_vg_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND); evas_vg_shape_stroke_color_set(rect, 255, 255, 255, 255); - Efl_VG *rect1 = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "rect1")); + Efl_VG *rect1 = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "rect1")); evas_vg_shape_shape_append_rect(rect1, 0, 0, 70, 70, 0, 0); evas_vg_node_origin_set(rect1, 50, 70); evas_vg_shape_stroke_scale_set(rect1, 2); @@ -169,7 +169,7 @@ vector_set(int x, int y, int w, int h) evas_vg_shape_stroke_join_set(rect1, EFL_GFX_JOIN_ROUND); evas_vg_shape_stroke_color_set(rect1, 0, 100, 80, 100); - Efl_VG *circle = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "circle")); + Efl_VG *circle = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "circle")); evas_vg_shape_shape_append_arc(circle, 0, 0, 250, 100, 30, 300); evas_vg_shape_fill_set(circle, lgradient); //evas_vg_node_transformation_set(&matrix), @@ -177,27 +177,27 @@ vector_set(int x, int y, int w, int h) evas_vg_node_color_set(circle, 50, 0, 0, 50); // Foreground - Efl_VG *fg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "fg")); + Efl_VG *fg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "fg")); evas_vg_shape_shape_append_rect(fg, 0, 0, vg_w, vg_h, 0, 0); evas_vg_node_origin_set(fg, 0, 0); evas_vg_shape_stroke_width_set(fg, 5.0); evas_vg_shape_stroke_join_set(fg, EFL_GFX_JOIN_ROUND); evas_vg_shape_stroke_color_set(fg, 70, 70, 0, 70); - Efl_VG *tst = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "tst")); + Efl_VG *tst = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "tst")); evas_vg_shape_shape_append_rect(tst, 50, 25, 200, 200, 3, 5); evas_vg_node_color_set(tst, 0, 0, 200, 200); evas_vg_shape_stroke_width_set(tst, 2); evas_vg_shape_stroke_color_set(tst, 255, 0, 0, 255); - Efl_VG *vc = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "vc")); + Efl_VG *vc = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "vc")); evas_vg_shape_shape_append_circle(vc, 100, 100, 23); evas_vg_node_color_set(vc, 0, 200, 0, 255); evas_vg_shape_stroke_width_set(vc, 4); evas_vg_shape_stroke_color_set(vc, 255, 0, 0, 255); - beginning = efl_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(efl_self, root)); - end = efl_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(efl_self, root)); + beginning = efl_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(efl_added, root)); + end = efl_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(efl_added, root)); circle = efl_vg_container_child_get(end, "circle"); efl_vg_transformation_set(circle, &matrix); diff --git a/src/examples/evas/shooter/evas-3d-shooter-header.c b/src/examples/evas/shooter/evas-3d-shooter-header.c index 3907f66324..5c3dfaf8de 100644 --- a/src/examples/evas/shooter/evas-3d-shooter-header.c +++ b/src/examples/evas/shooter/evas-3d-shooter-header.c @@ -29,8 +29,8 @@ _camera_setup(Scene_Data *data) data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); evas_canvas3d_camera_projection_perspective_set(data->camera, 65.0, 1.0, 1.0, 300.0); - data->mediator_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); - data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + data->mediator_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); + data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); evas_canvas3d_node_member_add(data->root_node, data->mediator_node); evas_canvas3d_node_member_add(data->mediator_node, data->camera_node); @@ -50,7 +50,7 @@ _light_setup(Scene_Data *data) evas_canvas3d_light_specular_set(data->light, 0.2, 0.2, 0.2, 1.0); evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 200.0); - data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); evas_canvas3d_node_light_set(data->light_node, data->light); evas_canvas3d_node_position_set(data->light_node, -30.0, 70.0, 0.0); diff --git a/src/examples/evas/shooter/evas-3d-shooter-macros.h b/src/examples/evas/shooter/evas-3d-shooter-macros.h index 91d1563722..7c1282a397 100644 --- a/src/examples/evas/shooter/evas-3d-shooter-macros.h +++ b/src/examples/evas/shooter/evas-3d-shooter-macros.h @@ -144,7 +144,7 @@ typedef struct _vec2 #define SETUP_MESH_NODE(Name) \ - data->mesh_node_##Name = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ + data->mesh_node_##Name = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ \ evas_canvas3d_node_mesh_add(data->mesh_node_##Name, data->mesh_##Name); diff --git a/src/examples/evas/shooter/evas-3d-shooter.c b/src/examples/evas/shooter/evas-3d-shooter.c index 1aa3223300..9fc7bb8cba 100644 --- a/src/examples/evas/shooter/evas-3d-shooter.c +++ b/src/examples/evas/shooter/evas-3d-shooter.c @@ -1004,7 +1004,7 @@ _scene_setup(Scene_Data *data) evas_canvas3d_scene_size_set(global_scene, WIDTH, HEIGHT); evas_canvas3d_scene_background_color_set(global_scene, 0.5, 0.5, 0.9, 0.0); - data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); _camera_setup(data); _light_setup(data); @@ -1069,7 +1069,7 @@ _scene_setup(Scene_Data *data) } } - data->carp_mediator_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + data->carp_mediator_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); evas_canvas3d_node_member_add(data->carp_mediator_node, data->mesh_node_carpet); diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c index e1616ce4b9..6cf7e59718 100644 --- a/src/lib/ecore/ecore_exe.c +++ b/src/lib/ecore/ecore_exe.c @@ -68,7 +68,7 @@ ecore_exe_pipe_run(const char *exe_cmd, const void *data) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); - Ecore_Exe *ret = efl_add(MY_CLASS, NULL, ecore_obj_exe_command_set(efl_self, exe_cmd, flags)); + Ecore_Exe *ret = efl_add(MY_CLASS, NULL, ecore_obj_exe_command_set(efl_added, exe_cmd, flags)); if (ret) { Ecore_Exe_Data *pd = efl_data_scope_get(ret, MY_CLASS); diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c index ad70d87002..851d6fe2e1 100644 --- a/src/lib/ecore/ecore_main.c +++ b/src/lib/ecore/ecore_main.c @@ -3008,8 +3008,8 @@ _efl_loop_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, double time, const voi t->job_is = EINA_FALSE; t->u.timer = efl_add(EFL_LOOP_TIMER_CLASS, obj, - efl_loop_timer_interval_set(efl_self, time), - efl_event_callback_array_add(efl_self, timeout(), t)); + efl_loop_timer_interval_set(efl_added, time), + efl_event_callback_array_add(efl_added, timeout(), t)); if (!t->u.timer) goto on_error; diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c index 320b427a45..59426168f5 100644 --- a/src/lib/ecore/ecore_poller.c +++ b/src/lib/ecore/ecore_poller.c @@ -237,7 +237,7 @@ ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED, const void *data) { Ecore_Poller *poller; - poller = efl_add(MY_CLASS, _ecore_parent, ecore_poller_constructor(efl_self, type, interval, func, data)); + poller = efl_add(MY_CLASS, _ecore_parent, ecore_poller_constructor(efl_added, type, interval, func, data)); return poller; } diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c index 46efa8ae85..e83c7e3559 100644 --- a/src/lib/ecore/ecore_timer.c +++ b/src/lib/ecore/ecore_timer.c @@ -191,9 +191,9 @@ ecore_timer_add(double in, legacy->func = func; legacy->data = data; timer = efl_add(MY_CLASS, ecore_main_loop_get(), - efl_event_callback_array_add(efl_self, legacy_timer(), legacy), - efl_key_data_set(efl_self, "_legacy", legacy), - efl_loop_timer_interval_set(efl_self, in)); + efl_event_callback_array_add(efl_added, legacy_timer(), legacy), + efl_key_data_set(efl_added, "_legacy", legacy), + efl_loop_timer_interval_set(efl_added, in)); return timer; } @@ -213,10 +213,10 @@ ecore_timer_loop_add(double in, legacy->func = func; legacy->data = data; timer = efl_add(MY_CLASS, ecore_main_loop_get(), - efl_event_callback_array_add(efl_self, legacy_timer(), legacy), - efl_key_data_set(efl_self, "_legacy", legacy), - efl_loop_timer_loop_reset(efl_self), - efl_loop_timer_interval_set(efl_self, in)); + efl_event_callback_array_add(efl_added, legacy_timer(), legacy), + efl_key_data_set(efl_added, "_legacy", legacy), + efl_loop_timer_loop_reset(efl_added), + efl_loop_timer_interval_set(efl_added, in)); return timer; } diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c index 8340c3d463..161434a8c8 100644 --- a/src/lib/ecore_con/ecore_con.c +++ b/src/lib/ecore_con/ecore_con.c @@ -305,7 +305,7 @@ _efl_network_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char *n if (!name || !done_cb) return EINA_FALSE; - obj = efl_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(efl_self, ECORE_CON_REMOTE_TCP), efl_network_server_name_set(efl_self, name), efl_network_port_set(efl_self, 1025)); + obj = efl_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(efl_added, ECORE_CON_REMOTE_TCP), efl_network_server_name_set(efl_added, name), efl_network_port_set(efl_added, 1025)); lk = malloc(sizeof (Ecore_Con_Lookup)); if (!lk) @@ -359,7 +359,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type, /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */ /* remote system socket: TCP/IP: [name]:[port] */ - obj = efl_add(EFL_NETWORK_SERVER_CLASS, NULL, efl_network_server_connection_type_set(efl_self, compl_type), efl_network_server_name_set(efl_self, name), efl_network_port_set(efl_self, port)); + obj = efl_add(EFL_NETWORK_SERVER_CLASS, NULL, efl_network_server_connection_type_set(efl_added, compl_type), efl_network_server_name_set(efl_added, name), efl_network_port_set(efl_added, port)); ecore_con_server_data_set(obj, (void *) data); @@ -455,7 +455,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type, /* local user socket: FILE: ~/.ecore/[name]/[port] */ /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */ /* remote system socket: TCP/IP: [name]:[port] */ - obj = efl_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(efl_self, compl_type), efl_network_server_name_set(efl_self, name), efl_network_port_set(efl_self, port)); + obj = efl_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(efl_added, compl_type), efl_network_server_name_set(efl_added, name), efl_network_port_set(efl_added, port)); ecore_con_server_data_set(obj, (void *) data); diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c index 4bf3a48228..1cf9954ebc 100644 --- a/src/lib/ecore_con/ecore_con_eet.c +++ b/src/lib/ecore_con/ecore_con_eet.c @@ -722,7 +722,7 @@ ecore_con_eet_server_new(Ecore_Con_Server *server) if (!server) return NULL; - ece_obj = efl_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(efl_self, server)); + ece_obj = efl_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(efl_added, server)); return ece_obj; } @@ -734,7 +734,7 @@ ecore_con_eet_client_new(Ecore_Con_Server *server) if (!server) return NULL; - ece_obj = efl_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(efl_self, server)); + ece_obj = efl_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(efl_added, server)); return ece_obj; } diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c index 5996c7c699..dffbf42540 100644 --- a/src/lib/ecore_con/ecore_con_url.c +++ b/src/lib/ecore_con/ecore_con_url.c @@ -236,7 +236,7 @@ EAPI Ecore_Con_Url * ecore_con_url_new(const char *url) { Ecore_Con_Url *url_obj; - url_obj = efl_add(EFL_NETWORK_URL_CLASS, NULL, efl_network_url_set(efl_self, url)); + url_obj = efl_add(EFL_NETWORK_URL_CLASS, NULL, efl_network_url_set(efl_added, url)); efl_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(), NULL); diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c index 763f11b1f8..31832f50ef 100644 --- a/src/lib/ecore_con/efl_net_dialer_http.c +++ b/src/lib/ecore_con/efl_net_dialer_http.c @@ -350,8 +350,8 @@ _efl_net_dialer_http_curlm_timer_schedule(CURLM *multi EINA_UNUSED, long timeout else { cm->timer = efl_add(EFL_LOOP_TIMER_CLASS, cm->loop, - efl_loop_timer_interval_set(efl_self, seconds), - efl_event_callback_add(efl_self, EFL_LOOP_TIMER_EVENT_TICK, _efl_net_dialer_http_curlm_timer_do, cm)); + efl_loop_timer_interval_set(efl_added, seconds), + efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _efl_net_dialer_http_curlm_timer_do, cm)); EINA_SAFETY_ON_NULL_RETURN_VAL(cm->timer, -1); } diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.c b/src/lib/ecore_con/efl_net_dialer_websocket.c index 59593b95d7..cec03e8b1e 100644 --- a/src/lib/ecore_con/efl_net_dialer_websocket.c +++ b/src/lib/ecore_con/efl_net_dialer_websocket.c @@ -932,10 +932,10 @@ _efl_net_dialer_websocket_efl_object_constructor(Eo *o, Efl_Net_Dialer_Websocket EINA_SAFETY_ON_NULL_RETURN_VAL(o, NULL); pd->http = efl_add(EFL_NET_DIALER_HTTP_CLASS, o, - efl_net_dialer_http_version_set(efl_self, EFL_NET_HTTP_VERSION_V1_1), - efl_net_dialer_http_method_set(efl_self, "GET"), - efl_net_dialer_http_primary_mode_set(efl_self, EFL_NET_DIALER_HTTP_PRIMARY_MODE_UPLOAD), - efl_event_callback_array_add(efl_self, _efl_net_dialer_websocket_http_cbs(), o)); + efl_net_dialer_http_version_set(efl_added, EFL_NET_HTTP_VERSION_V1_1), + efl_net_dialer_http_method_set(efl_added, "GET"), + efl_net_dialer_http_primary_mode_set(efl_added, EFL_NET_DIALER_HTTP_PRIMARY_MODE_UPLOAD), + efl_event_callback_array_add(efl_added, _efl_net_dialer_websocket_http_cbs(), o)); EINA_SAFETY_ON_NULL_RETURN_VAL(pd->http, NULL); return o; @@ -1483,8 +1483,8 @@ _efl_net_dialer_websocket_close_request(Eo *o, Efl_Net_Dialer_Websocket_Data *pd else { pd->close_timer = efl_add(EFL_LOOP_TIMER_CLASS, efl_loop_user_loop_get(o), - efl_loop_timer_interval_set(efl_self, 2.0), - efl_event_callback_add(efl_self, EFL_LOOP_TIMER_EVENT_TICK, _efl_net_dialer_websocket_close_request_timeout, o)); + efl_loop_timer_interval_set(efl_added, 2.0), + efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _efl_net_dialer_websocket_close_request_timeout, o)); } efl_io_writer_can_write_set(o, EINA_FALSE); diff --git a/src/lib/ecore_con/efl_net_server_tcp.c b/src/lib/ecore_con/efl_net_server_tcp.c index 104b9133f9..9b556f5eef 100644 --- a/src/lib/ecore_con/efl_net_server_tcp.c +++ b/src/lib/ecore_con/efl_net_server_tcp.c @@ -161,8 +161,8 @@ static void _efl_net_server_tcp_efl_net_server_fd_client_add(Eo *o, void *pd EINA_UNUSED, int client_fd) { Eo *client = efl_add(EFL_NET_SOCKET_TCP_CLASS, o, - efl_event_callback_array_add(efl_self, _efl_net_server_tcp_client_cbs(), o), - efl_loop_fd_set(efl_self, client_fd)); + efl_event_callback_array_add(efl_added, _efl_net_server_tcp_client_cbs(), o), + efl_loop_fd_set(efl_added, client_fd)); if (!client) { ERR("could not create client object fd=%d", client_fd); diff --git a/src/lib/ector/cairo/ector_cairo_surface.c b/src/lib/ector/cairo/ector_cairo_surface.c index 64bc1c570e..b21f7ab817 100644 --- a/src/lib/ector/cairo/ector_cairo_surface.c +++ b/src/lib/ector/cairo/ector_cairo_surface.c @@ -63,11 +63,11 @@ _ector_cairo_surface_ector_surface_renderer_factory_new(Eo *obj, const Efl_Class *type) { if (type == ECTOR_RENDERER_SHAPE_MIXIN) - return efl_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); + return efl_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_added, obj)); else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN) - return efl_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); + return efl_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_added, obj)); else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN) - return efl_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); + return efl_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_added, obj)); ERR("Couldn't find class for type: %s\n", efl_class_name_get(type)); return NULL; diff --git a/src/lib/ector/gl/ector_gl_surface.c b/src/lib/ector/gl/ector_gl_surface.c index 54bdb9f41c..a0ec6552f5 100644 --- a/src/lib/ector/gl/ector_gl_surface.c +++ b/src/lib/ector/gl/ector_gl_surface.c @@ -45,11 +45,11 @@ _ector_gl_surface_ector_surface_renderer_factory_new(Eo *obj, const Efl_Class *type) { if (type == ECTOR_RENDERER_SHAPE_MIXIN) - return efl_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); + return efl_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_added, obj)); else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN) - return efl_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); + return efl_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_added, obj)); else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN) - return efl_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); + return efl_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_added, obj)); ERR("Couldn't find class for type: %s\n", efl_class_name_get(type)); return NULL; diff --git a/src/lib/ector/software/ector_software_surface.c b/src/lib/ector/software/ector_software_surface.c index ad504c4499..f1492a2a28 100644 --- a/src/lib/ector/software/ector_software_surface.c +++ b/src/lib/ector/software/ector_software_surface.c @@ -16,13 +16,13 @@ _ector_software_surface_ector_surface_renderer_factory_new(Eo *obj, const Efl_Class *type) { if (type == ECTOR_RENDERER_SHAPE_MIXIN) - return efl_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); + return efl_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_added, obj)); else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN) - return efl_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); + return efl_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_added, obj)); else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN) - return efl_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); + return efl_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_added, obj)); else if (type == ECTOR_RENDERER_BUFFER_MIXIN) - return efl_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); + return efl_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(efl_added, obj)); ERR("Couldn't find class for type: %s\n", efl_class_name_get(type)); return NULL; } diff --git a/src/lib/edje/edje_containers.c b/src/lib/edje/edje_containers.c index ab90ddbd73..6aae0adc2e 100644 --- a/src/lib/edje/edje_containers.c +++ b/src/lib/edje/edje_containers.c @@ -88,7 +88,7 @@ _edje_ ## type ## _internal_proxy_get(Edje_Object *obj EINA_UNUSED, Edje *ed, Ed _ ## type ## _proxy = NULL; \ } \ return efl_add(TYPE ## _CLASS, ed->obj, \ - _edje_real_part_set(efl_self, ed, rp, rp->part->name)); \ + _edje_real_part_set(efl_added, ed, rp, rp->part->name)); \ } \ \ if (EINA_UNLIKELY(pd->temp)) \ diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c index 085c3c71de..4048a8de36 100644 --- a/src/lib/edje/edje_load.c +++ b/src/lib/edje/edje_load.c @@ -847,7 +847,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch Evas_Canvas3D_Material *material = NULL; Edje_Part_Description_Mesh_Node *pd_mesh_node; - rp->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); + rp->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, ed->base->evas); evas_canvas3d_node_mesh_add(rp->node, mesh); @@ -880,7 +880,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch { Evas_Canvas3D_Light *light = NULL; - rp->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); + rp->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, ed->base->evas); evas_canvas3d_node_light_set(rp->node, light); @@ -892,7 +892,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch { Evas_Canvas3D_Camera *camera = NULL; - rp->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); + rp->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, ed->base->evas); evas_canvas3d_node_camera_set(rp->node, camera); @@ -2710,7 +2710,7 @@ edje_3d_object_add(Evas_Object *obj, Eo **root_node, Eo *scene) if (*root_node == NULL) *root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, - evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); + evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE)); if (scene == NULL) scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, ed->base->evas); diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c index b9590ed6c7..06f030f500 100644 --- a/src/lib/edje/edje_multisense.c +++ b/src/lib/edje/edje_multisense.c @@ -199,13 +199,13 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c eet_data->vio.tell = eet_snd_file_tell; eet_data->offset = 0; - in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL, ecore_audio_obj_name_set(efl_self, snd_id_str), ecore_audio_obj_in_speed_set(efl_self, speed), ecore_audio_obj_vio_set(efl_self, &eet_data->vio, eet_data, _free), efl_event_callback_add(efl_self, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL)); + in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL, ecore_audio_obj_name_set(efl_added, snd_id_str), ecore_audio_obj_in_speed_set(efl_added, speed), ecore_audio_obj_vio_set(efl_added, &eet_data->vio, eet_data, _free), efl_event_callback_add(efl_added, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL)); if (!out) { #if HAVE_COREAUDIO out = efl_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL); #elif HAVE_PULSE - out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, efl_event_callback_add(efl_self, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL)); + out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL)); #endif if (out) outs++; } @@ -277,7 +277,7 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const #if HAVE_COREAUDIO out = efl_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL); #elif HAVE_PULSE - out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, efl_event_callback_add(efl_self, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL)); + out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL)); #endif if (out) outs++; } diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c index a7ab9495a6..40663f8fce 100644 --- a/src/lib/eio/eio_model.c +++ b/src/lib/eio/eio_model.c @@ -171,7 +171,7 @@ _efl_model_evt_added_ecore_cb(void *data, int type, void *event) eina_stringshare_del(spath); } - cevt.child = efl_add_ref(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(efl_self, evt->filename)); + cevt.child = efl_add_ref(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(efl_added, evt->filename)); priv->children_list = eina_list_append(priv->children_list, cevt.child); cevt.index = eina_list_count(priv->children_list); @@ -497,7 +497,7 @@ _eio_main_children_load_cb(void *data, Eio_File *handler EINA_UNUSED, const Eina Eio_Model_Data *priv = data; EINA_SAFETY_ON_NULL_RETURN(priv); - child = efl_add_ref(MY_CLASS, priv->obj, eio_model_path_set(efl_self, info->path)); + child = efl_add_ref(MY_CLASS, priv->obj, eio_model_path_set(efl_added, info->path)); eina_spinlock_take(&priv->filter_lock); if (priv->filter_cb) eio_model_children_filter_set(child, priv->filter_cb, priv->filter_userdata); @@ -704,7 +704,7 @@ _eio_model_efl_object_parent_get(Eo *obj , Eio_Model_Data *priv) char *path = ecore_file_dir_get(priv->path); if (path != NULL && strcmp(priv->path, "/") != 0) { - model = efl_add(MY_CLASS, NULL, eio_model_path_set(efl_self, path)); + model = efl_add(MY_CLASS, NULL, eio_model_path_set(efl_added, path)); } else model = NULL; diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c index 465673ad33..aee061e6af 100644 --- a/src/lib/eldbus/eldbus_model_connection.c +++ b/src/lib/eldbus/eldbus_model_connection.c @@ -333,7 +333,7 @@ _eldbus_model_connection_names_list_cb(void *data, { DBG("(%p): bus = %s", pd->obj, bus); - Eo *child = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_connection_constructor(efl_self, pd->connection, bus, "/")); + Eo *child = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_connection_constructor(efl_added, pd->connection, bus, "/")); pd->children_list = eina_list_append(pd->children_list, child); } diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c index 4de2400df1..2baf940923 100644 --- a/src/lib/eldbus/eldbus_model_object.c +++ b/src/lib/eldbus/eldbus_model_object.c @@ -517,7 +517,7 @@ _eldbus_model_object_create_children(Eldbus_Model_Object_Data *pd, Eldbus_Object WRN("(%p) Creating child: bus = %s, path = %s, interface = %s", pd->obj, pd->bus, current_path, interface->name); // TODO: increment reference to keep 'interface' in memory - child = efl_add_ref(ELDBUS_MODEL_PROXY_CLASS, NULL, eldbus_model_proxy_constructor(efl_self, object, interface)); + child = efl_add_ref(ELDBUS_MODEL_PROXY_CLASS, NULL, eldbus_model_proxy_constructor(efl_added, object, interface)); pd->children_list = eina_list_append(pd->children_list, child); } diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c index 54eb6c667a..bc249abb88 100644 --- a/src/lib/eldbus/eldbus_model_proxy.c +++ b/src/lib/eldbus/eldbus_model_proxy.c @@ -296,7 +296,7 @@ _eldbus_model_proxy_create_methods_children(Eldbus_Model_Proxy_Data *pd) INF("(%p) Creating method child: bus = %s, path = %s, method = %s::%s", pd->obj, bus, path, interface_name, method_name); - child = efl_add(ELDBUS_MODEL_METHOD_CLASS, NULL, eldbus_model_method_constructor(efl_self, pd->proxy, method)); + child = efl_add(ELDBUS_MODEL_METHOD_CLASS, NULL, eldbus_model_method_constructor(efl_added, pd->proxy, method)); pd->children_list = eina_list_append(pd->children_list, child); } @@ -331,7 +331,7 @@ _eldbus_model_proxy_create_signals_children(Eldbus_Model_Proxy_Data *pd) DBG("(%p) Creating signal child: bus = %s, path = %s, signal = %s::%s", pd->obj, bus, path, interface_name, signal_name); - child = efl_add(ELDBUS_MODEL_SIGNAL_CLASS, NULL, eldbus_model_signal_constructor(efl_self, pd->proxy, signal)); + child = efl_add(ELDBUS_MODEL_SIGNAL_CLASS, NULL, eldbus_model_signal_constructor(efl_added, pd->proxy, signal)); pd->children_list = eina_list_append(pd->children_list, child); } diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 6995260be0..1f2cbbf7b0 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -4885,7 +4885,7 @@ _efl_ui_text_cursor_new(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED) { Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); return efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, (Eo *) obj, - efl_canvas_text_cursor_text_object_set(efl_self, text_obj)); + efl_canvas_text_cursor_text_object_set(efl_added, text_obj)); } static void @@ -5246,9 +5246,9 @@ _anchors_create(Eo *obj, Efl_Ui_Text_Data *sd) _anchors_clear(obj, sd); start = efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, obj, - efl_canvas_text_cursor_text_object_set(efl_self, text_obj)); + efl_canvas_text_cursor_text_object_set(efl_added, text_obj)); end = efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, obj, - efl_canvas_text_cursor_text_object_set(efl_self, text_obj)); + efl_canvas_text_cursor_text_object_set(efl_added, text_obj)); /* Retrieve all annotations in the text. */ efl_canvas_text_cursor_paragraph_first(start); diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 7751ee8162..a86f998429 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -4003,14 +4003,14 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) { - Evas_Object *obj = efl_add(MY_CLASS, parent, efl_ui_win_name_set(efl_self, name), efl_ui_win_type_set(efl_self, type)); + Evas_Object *obj = efl_add(MY_CLASS, parent, efl_ui_win_name_set(efl_added, name), efl_ui_win_type_set(efl_added, type)); return obj; } EAPI Evas_Object * elm_win_fake_add(Ecore_Evas *ee) { - return efl_add(MY_CLASS, NULL, elm_win_fake_canvas_set(efl_self, ee), efl_ui_win_name_set(efl_self, NULL), efl_ui_win_type_set(efl_self, ELM_WIN_FAKE)); + return efl_add(MY_CLASS, NULL, elm_win_fake_canvas_set(efl_added, ee), efl_ui_win_name_set(efl_added, NULL), efl_ui_win_type_set(efl_added, ELM_WIN_FAKE)); } static void diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index 218ffe083d..f1c72e1fc7 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -1259,7 +1259,7 @@ _elm_ctxpopup_item_append(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Eva { Eo *eo_item; - eo_item = efl_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(efl_self, func, data)); + eo_item = efl_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(efl_added, func, data)); if (!eo_item) return NULL; ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item); @@ -1352,7 +1352,7 @@ _elm_ctxpopup_item_prepend(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Ev { Eo *eo_item; - eo_item = efl_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(efl_self, func, data)); + eo_item = efl_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(efl_added, func, data)); if (!eo_item) return NULL; ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item); diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index 799c0bd961..1f87d75ff1 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -1296,7 +1296,7 @@ _home(void *data, const Efl_Event *event EINA_UNUSED) if (!sd->model || efl_isa(sd->model, EIO_MODEL_CLASS)) { Eio_Model *model = efl_add(EIO_MODEL_CLASS, NULL, - eio_model_path_set(efl_self, eina_environment_home_get())); + eio_model_path_set(efl_added, eina_environment_home_get())); _populate(fs, model, NULL, NULL); efl_unref(model); } @@ -2308,7 +2308,7 @@ elm_fileselector_path_set(Evas_Object *obj, void _elm_fileselector_path_set_internal(Evas_Object *obj, const char *_path) { - Eio_Model *model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, _path)); + Eio_Model *model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, _path)); if (!model) { ERR("Efl.Model allocation error"); @@ -2528,7 +2528,7 @@ elm_fileselector_selected_set(Evas_Object *obj, if (ecore_file_is_dir(path)) { - model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path)); + model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, path)); if (!model) { ERR("Efl.Model allocation error"); @@ -2546,7 +2546,7 @@ elm_fileselector_selected_set(Evas_Object *obj, goto clean_up; } - model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path)); + model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, path)); if (!model) { ERR("Efl.Model allocation error"); @@ -2554,7 +2554,7 @@ elm_fileselector_selected_set(Evas_Object *obj, } dir = ecore_file_dir_get(path); - parent = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, dir)); + parent = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, dir)); if (parent) { _schedule_populate(obj, sd, parent, model); diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c index a234861b07..3e90749a46 100644 --- a/src/lib/elementary/elc_fileselector_button.c +++ b/src/lib/elementary/elc_fileselector_button.c @@ -215,7 +215,7 @@ _elm_fileselector_button_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Bu if (path) priv->fsd.path = eina_stringshare_add(path); else priv->fsd.path = eina_stringshare_add("/"); - priv->fsd.model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, priv->fsd.path)); + priv->fsd.model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, priv->fsd.path)); priv->fsd.expandable = _elm_config->fileselector_expand_enable; priv->inwin_mode = _elm_config->inwin_dialogs_enable; @@ -314,7 +314,7 @@ _elm_fileselector_button_path_set_internal(Evas_Object *obj, const char *path) { ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN(obj, sd); - Efl_Model *model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path)); + Efl_Model *model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, path)); if (!model) { ERR("Efl.Model allocation error"); diff --git a/src/lib/elementary/elm_app_client.c b/src/lib/elementary/elm_app_client.c index 03eb85d115..ab4df1b407 100644 --- a/src/lib/elementary/elm_app_client.c +++ b/src/lib/elementary/elm_app_client.c @@ -39,7 +39,7 @@ _sub_path_process(Elm_App_Client *eo, Eldbus_Message_Iter *obj_iter, Elm_App_Cli if (view) continue; - view = efl_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(efl_self, obj_path)); + view = efl_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(efl_added, obj_path)); eina_hash_add(data->views, obj_path, view); if (!loading_list) efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view); @@ -213,7 +213,7 @@ _create_view_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) view = eina_hash_find(cdata->views, view_path); if (!view) { - view = efl_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(efl_self, view_path)); + view = efl_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(efl_added, view_path)); eina_hash_add(cdata->views, view_path, view); efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view); } diff --git a/src/lib/elementary/elm_app_server.c b/src/lib/elementary/elm_app_server.c index cb853dd116..744a433f16 100644 --- a/src/lib/elementary/elm_app_server.c +++ b/src/lib/elementary/elm_app_server.c @@ -254,7 +254,7 @@ _elm_app_server_constructor(Eo *obj, Elm_App_Server_Data *data, const char *pkg, new_events = elm_app_server_view_props_new_events_get(view_eet_props); progress = elm_app_server_view_props_progress_get(view_eet_props); - view = efl_add(ELM_APP_SERVER_VIEW_CLASS, obj, elm_app_server_view_id_set(efl_self, view_id)); + view = efl_add(ELM_APP_SERVER_VIEW_CLASS, obj, elm_app_server_view_id_set(efl_added, view_id)); if (!view) continue; diff --git a/src/lib/elementary/elm_code_diff_widget.c b/src/lib/elementary/elm_code_diff_widget.c index 118e98e064..eec32ee48d 100644 --- a/src/lib/elementary/elm_code_diff_widget.c +++ b/src/lib/elementary/elm_code_diff_widget.c @@ -95,7 +95,7 @@ elm_code_diff_widget_add(Evas_Object *parent, Elm_Code *code) // left side of diff wcode1 = elm_code_create(); elm_code_parser_standard_add(wcode1, ELM_CODE_PARSER_STANDARD_DIFF); - widget_left = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, wcode1)); + widget_left = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_added, wcode1)); evas_object_size_hint_weight_set(widget_left, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(widget_left, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -106,7 +106,7 @@ elm_code_diff_widget_add(Evas_Object *parent, Elm_Code *code) // right side of diff wcode2 = elm_code_create(); elm_code_parser_standard_add(wcode2, ELM_CODE_PARSER_STANDARD_DIFF); - widget_right = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, wcode2)); + widget_right = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_added, wcode2)); evas_object_size_hint_weight_set(widget_right, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(widget_right, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c index f75731905d..0aadfb6cae 100644 --- a/src/lib/elementary/elm_code_widget.c +++ b/src/lib/elementary/elm_code_widget.c @@ -60,7 +60,7 @@ elm_code_widget_add(Evas_Object *parent, Elm_Code *code) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); Evas_Object *obj = NULL; - obj = efl_add(MY_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code)); + obj = efl_add(MY_CLASS, parent, elm_obj_code_widget_code_set(efl_added, code)); return obj; } diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c index 0bf9029384..ff98a271e1 100644 --- a/src/lib/elementary/elm_glview.c +++ b/src/lib/elementary/elm_glview.c @@ -338,7 +338,7 @@ EAPI Evas_Object * elm_glview_add(Evas_Object *parent) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent, elm_obj_glview_version_constructor(efl_self, EVAS_GL_GLES_2_X)); + Evas_Object *obj = efl_add(MY_CLASS, parent, elm_obj_glview_version_constructor(efl_added, EVAS_GL_GLES_2_X)); return obj; } @@ -346,7 +346,7 @@ EAPI Evas_Object * elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Version version) { EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - Evas_Object *obj = efl_add(MY_CLASS, parent, elm_obj_glview_version_constructor(efl_self, version)); + Evas_Object *obj = efl_add(MY_CLASS, parent, elm_obj_glview_version_constructor(efl_added, version)); return obj; } diff --git a/src/lib/elementary/elm_layout_pack.c b/src/lib/elementary/elm_layout_pack.c index 69a7363b60..ecbbefe991 100644 --- a/src/lib/elementary/elm_layout_pack.c +++ b/src/lib/elementary/elm_layout_pack.c @@ -56,10 +56,10 @@ _elm_layout_pack_proxy_get(Elm_Layout *obj, Edje_Part_Type type, const char *par { if (type == EDJE_PART_TYPE_BOX) return efl_add(BOX_CLASS, obj, - efl_ui_layout_internal_box_real_part_set(efl_self, obj, part)); + efl_ui_layout_internal_box_real_part_set(efl_added, obj, part)); else if (type == EDJE_PART_TYPE_TABLE) return efl_add(TABLE_CLASS, obj, - efl_ui_layout_internal_table_real_part_set(efl_self, obj, part)); + efl_ui_layout_internal_table_real_part_set(efl_added, obj, part)); else return NULL; } diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 91e66085be..950f540182 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -694,29 +694,29 @@ EAPI Eo *efl_super(const Eo *obj, const Efl_Class *cur_klass); */ EAPI const Efl_Class *efl_class_get(const Eo *obj); -EAPI Eo *_efl_self_get(void); +EAPI Eo *_efl_added_get(void); /* Check if GCC compatible (both GCC and clang define this) */ #if defined(__GNUC__) && !defined(_EO_ADD_FALLBACK_FORCE) -# define efl_self __efl_self +# define efl_added __efl_added # define _efl_add_common(klass, parent, is_ref, ...) \ ({ \ - Eo * const __efl_self = _efl_add_internal_start(__FILE__, __LINE__, klass, parent, is_ref, EINA_FALSE); \ + Eo * const __efl_added = _efl_add_internal_start(__FILE__, __LINE__, klass, parent, is_ref, EINA_FALSE); \ (void) ((void)0, ##__VA_ARGS__); \ - (Eo *) _efl_add_end(efl_self, is_ref, EINA_FALSE); \ + (Eo *) _efl_add_end(efl_added, is_ref, EINA_FALSE); \ }) #else -# define efl_self _efl_self_get() +# define efl_added _efl_added_get() # define _efl_add_common(klass, parent, is_ref, ...) \ ( \ _efl_add_internal_start(__FILE__, __LINE__, klass, parent, is_ref, EINA_TRUE), \ ##__VA_ARGS__, \ - (Eo *) _efl_add_end(efl_self, is_ref, EINA_TRUE) \ + (Eo *) _efl_add_end(efl_added, is_ref, EINA_TRUE) \ ) #endif diff --git a/src/lib/eo/eo_add_fallback.c b/src/lib/eo/eo_add_fallback.c index 7973fee6ee..63e98a3d5e 100644 --- a/src/lib/eo/eo_add_fallback.c +++ b/src/lib/eo/eo_add_fallback.c @@ -116,7 +116,7 @@ _eo_call_stack_get_thread(void) } EAPI Eo * -_efl_self_get(void) +_efl_added_get(void) { return _EFL_OBJECT_CALL_STACK_GET()->frame_ptr->obj; } diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c index f7be7e5536..a86560cac5 100644 --- a/src/lib/evas/canvas/evas_canvas3d_node.c +++ b/src/lib/evas/canvas/evas_canvas3d_node.c @@ -1025,7 +1025,7 @@ evas_canvas3d_node_add(Evas *e, Evas_Canvas3D_Node_Type type) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = efl_add(MY_CLASS, e, evas_canvas3d_node_constructor(efl_self, type)); + Evas_Object *eo_obj = efl_add(MY_CLASS, e, evas_canvas3d_node_constructor(efl_added, type)); return eo_obj; } diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c index f257b84359..2b23628fd0 100644 --- a/src/lib/evas/canvas/evas_image_legacy.c +++ b/src/lib/evas/canvas/evas_image_legacy.c @@ -19,8 +19,8 @@ evas_object_image_add(Evas *eo_e) { EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(eo_e, EVAS_CANVAS_CLASS), NULL); return efl_add(EVAS_IMAGE_CLASS, eo_e, - efl_gfx_fill_auto_set(efl_self, EINA_FALSE), - efl_canvas_object_legacy_ctor(efl_self)); + efl_gfx_fill_auto_set(efl_added, EINA_FALSE), + efl_canvas_object_legacy_ctor(efl_added)); } EAPI Evas_Object * @@ -28,7 +28,7 @@ evas_object_image_filled_add(Evas *eo_e) { EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(eo_e, EVAS_CANVAS_CLASS), NULL); return efl_add(EVAS_IMAGE_CLASS, eo_e, - efl_canvas_object_legacy_ctor(efl_self)); + efl_canvas_object_legacy_ctor(efl_added)); } EAPI void diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 890498d676..4b04b569ee 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -8113,7 +8113,7 @@ evas_object_textblock_cursor_new(const Eo *eo_obj) EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); // XXX; Discarding const here return efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, (Eo *) eo_obj, - efl_canvas_text_cursor_text_object_set(efl_self, eo_obj)); + efl_canvas_text_cursor_text_object_set(efl_added, eo_obj)); } EOLIAN static void diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c index 350a621dd1..7534150bf4 100644 --- a/src/lib/evas/canvas/evas_vg_container.c +++ b/src/lib/evas/canvas/evas_vg_container.c @@ -171,7 +171,7 @@ _efl_vg_container_efl_vg_dup(Eo *obj, { // By setting parent, we automatically reference // this new object as a child of obj. Magic at work ! - (void) efl_add(efl_class_get(child), obj, efl_vg_dup(efl_self, child)); + (void) efl_add(efl_class_get(child), obj, efl_vg_dup(efl_added, child)); } } diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c index 5c6e3c7378..baaf36b6d2 100644 --- a/src/lib/evas/canvas/evas_vg_node.c +++ b/src/lib/evas/canvas/evas_vg_node.c @@ -790,7 +790,7 @@ _efl_vg_dup(Eo *obj, Efl_VG_Data *pd, const Efl_VG *from) _efl_vg_clean_object(&pd->mask); if (fromd->mask) { - pd->mask = efl_add(efl_class_get(fromd->mask), obj, efl_vg_dup(efl_self, pd->mask)); + pd->mask = efl_add(efl_class_get(fromd->mask), obj, efl_vg_dup(efl_added, pd->mask)); } pd->x = fromd->x; diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c index dc44a0881a..2f47f27cef 100644 --- a/src/lib/evas/canvas/evas_vg_shape.c +++ b/src/lib/evas/canvas/evas_vg_shape.c @@ -219,21 +219,21 @@ _efl_vg_shape_efl_vg_dup(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, const Efl_V if (fromd->fill) { - fill = efl_add(efl_class_get(fromd->fill), NULL, efl_vg_dup(efl_self, fromd->fill)); + fill = efl_add(efl_class_get(fromd->fill), NULL, efl_vg_dup(efl_added, fromd->fill)); efl_vg_shape_fill_set(obj, fill); efl_unref(fill); } if (fromd->stroke.fill) { - stroke_fill = efl_add(efl_class_get(fromd->stroke.fill), NULL, efl_vg_dup(efl_self, fromd->stroke.fill)); + stroke_fill = efl_add(efl_class_get(fromd->stroke.fill), NULL, efl_vg_dup(efl_added, fromd->stroke.fill)); efl_vg_shape_stroke_fill_set(obj, stroke_fill); efl_unref(stroke_fill); } if (fromd->stroke.marker) { - stroke_marker = efl_add(efl_class_get(fromd->stroke.marker), NULL, efl_vg_dup(efl_self, fromd->stroke.marker)); + stroke_marker = efl_add(efl_class_get(fromd->stroke.marker), NULL, efl_vg_dup(efl_added, fromd->stroke.marker)); efl_vg_shape_stroke_marker_set(obj, stroke_marker); efl_unref(stroke_marker); } diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c index 3c88a868bf..b6e08afcc8 100644 --- a/src/modules/evas/engines/gl_generic/evas_engine.c +++ b/src/modules/evas/engines/gl_generic/evas_engine.c @@ -2517,13 +2517,13 @@ eng_ector_buffer_wrap(void *data EINA_UNUSED, Evas *evas, void *engine_image, Ei { RGBA_Image *im = engine_image; - buf = efl_add(EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(efl_self, evas, im)); + buf = efl_add(EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(efl_added, evas, im)); } else { Evas_GL_Image *im = engine_image; - buf = efl_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(efl_self, evas, im)); + buf = efl_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(efl_added, evas, im)); } return buf; } @@ -2584,7 +2584,7 @@ eng_ector_buffer_new(void *data, Evas *evas, void *pixels, gc = re->window_gl_context_get(re->software.ob); im = evas_gl_common_image_surface_new(gc, iw, ih, EINA_TRUE); - buf = efl_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(efl_self, evas, im)); + buf = efl_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(efl_added, evas, im)); im->references--; } return buf; diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c index 963b0e0635..b684cf0e77 100644 --- a/src/modules/evas/engines/software_generic/evas_engine.c +++ b/src/modules/evas/engines/software_generic/evas_engine.c @@ -4082,7 +4082,7 @@ eng_ector_buffer_wrap(void *data EINA_UNUSED, Evas *e, void *engine_image, Eina_ if (!ie) return NULL; - buf = efl_add(EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, evas_ector_buffer_engine_image_set(efl_self, e, ie)); + buf = efl_add(EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, evas_ector_buffer_engine_image_set(efl_added, e, ie)); return buf; } @@ -4101,7 +4101,7 @@ eng_ector_buffer_new(void *data EINA_UNUSED, Evas *evas, void *pixels, if ((flags & (ECTOR_BUFFER_FLAG_RENDERABLE | ECTOR_BUFFER_FLAG_DRAWABLE)) == 0) { - buf = efl_add(ECTOR_SOFTWARE_BUFFER_CLASS, evas, ector_buffer_pixels_set(efl_self, pixels, width, height, stride, cspace, writeable, l, r, t, b)); + buf = efl_add(ECTOR_SOFTWARE_BUFFER_CLASS, evas, ector_buffer_pixels_set(efl_added, pixels, width, height, stride, cspace, writeable, l, r, t, b)); } else { diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c index e91984bcc3..480e3ee098 100644 --- a/src/tests/ecore/ecore_test_ecore.c +++ b/src/tests/ecore/ecore_test_ecore.c @@ -290,8 +290,8 @@ START_TEST(ecore_test_efl_loop_fd) fail_if(ret != 0); fd = efl_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(), - efl_loop_fd_set(efl_self, comm[0]), - efl_event_callback_add(efl_self, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did)); + efl_loop_fd_set(efl_added, comm[0]), + efl_event_callback_add(efl_added, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did)); fail_if(fd == NULL); ret = write(comm[1], &did, 1); @@ -333,9 +333,9 @@ START_TEST(ecore_test_efl_loop_fd_lifecycle) fail_if(ret != 0); fd = efl_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(), - efl_loop_fd_set(efl_self, comm[0]), - efl_event_callback_add(efl_self, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did), - efl_event_callback_add(efl_self, EFL_EVENT_DEL, _efl_del_cb, &dead)); + efl_loop_fd_set(efl_added, comm[0]), + efl_event_callback_add(efl_added, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did), + efl_event_callback_add(efl_added, EFL_EVENT_DEL, _efl_del_cb, &dead)); efl_ref(fd); fail_if(fd == NULL); diff --git a/src/tests/ecore/ecore_test_timer.c b/src/tests/ecore/ecore_test_timer.c index b94f139739..3d70375d57 100644 --- a/src/tests/ecore/ecore_test_timer.c +++ b/src/tests/ecore/ecore_test_timer.c @@ -281,9 +281,9 @@ START_TEST(ecore_test_timer_lifecycle) efl_event_callback_add((Eo*) t, EFL_EVENT_DEL, _test_death_cb, &dl); et = efl_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get(), - efl_event_callback_add(efl_self, EFL_LOOP_TIMER_EVENT_TICK, _test_run_cb, &re), - efl_event_callback_add(efl_self, EFL_EVENT_DEL, _test_death_cb, &de), - efl_loop_timer_interval_set(efl_self, 1.0)); + efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _test_run_cb, &re), + efl_event_callback_add(efl_added, EFL_EVENT_DEL, _test_death_cb, &de), + efl_loop_timer_interval_set(efl_added, 1.0)); efl_ref(et); ecore_shutdown(); diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c index 824ef68649..ce06bb957c 100644 --- a/src/tests/eio/eio_model_test_file.c +++ b/src/tests/eio/eio_model_test_file.c @@ -114,7 +114,7 @@ START_TEST(eio_model_test_test_file) fail_if(!efl_object_init(), "ERROR: Cannot init EO!\n"); fail_if(!eio_init(), "ERROR: Cannot init EIO!\n"); - filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, EFL_MODEL_TEST_FILENAME_PATH)); + filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, EFL_MODEL_TEST_FILENAME_PATH)); fail_if(!filemodel, "ERROR: Cannot init model!\n"); handler = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, exit_func, NULL); diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c index 0623ee960b..2973dbaf89 100644 --- a/src/tests/eio/eio_model_test_monitor_add.c +++ b/src/tests/eio/eio_model_test_monitor_add.c @@ -94,7 +94,7 @@ START_TEST(eio_model_test_test_monitor_add) tmpdir = eina_environment_tmp_get(); - filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, tmpdir)); + filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, tmpdir)); fail_if(!filemodel, "ERROR: Cannot init model!\n"); efl_event_callback_add(filemodel, EFL_MODEL_EVENT_CHILD_ADDED, &_children_added_cb, filemodel); diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c index 15e8cffad4..cff3fb0c56 100644 --- a/src/tests/eldbus/eldbus_test_eldbus_model.c +++ b/src/tests/eldbus/eldbus_test_eldbus_model.c @@ -168,7 +168,7 @@ check_property(Eo *object, const char *property_name, const char *expected_value Eo * create_connection(void) { - Eo *connection = efl_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, NULL, eldbus_model_connection_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE)); + Eo *connection = efl_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, NULL, eldbus_model_connection_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE)); ck_assert_ptr_ne(NULL, connection); return connection; } @@ -176,7 +176,7 @@ create_connection(void) Eo * create_object(void) { - Eo *object = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH)); + Eo *object = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH)); ck_assert_ptr_ne(NULL, object); return object; } diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_method.c b/src/tests/eldbus/eldbus_test_eldbus_model_method.c index a22e0a5fbc..02f699012a 100644 --- a/src/tests/eldbus/eldbus_test_eldbus_model_method.c +++ b/src/tests/eldbus/eldbus_test_eldbus_model_method.c @@ -29,7 +29,7 @@ _setup(void) fake_server = fake_server_start(&fake_server_data); - fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); + fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); ck_assert_ptr_ne(NULL, fake_server_object); fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE); diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c index a1082d0171..c36410388e 100644 --- a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c +++ b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c @@ -27,7 +27,7 @@ _setup(void) fake_server = fake_server_start(&fake_server_data); - fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); + fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); ck_assert_ptr_ne(NULL, fake_server_object); fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE); diff --git a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c index 7aa8314ab2..0f3dd7dbfc 100644 --- a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c +++ b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c @@ -33,7 +33,7 @@ _setup(void) }; fake_server = fake_server_start(&fake_server_data); - fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); + fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); ck_assert_ptr_ne(NULL, fake_server_object); fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE); diff --git a/src/tests/eo/constructors/constructors_main.c b/src/tests/eo/constructors/constructors_main.c index ffda7793db..e3b0b93ad4 100644 --- a/src/tests/eo/constructors/constructors_main.c +++ b/src/tests/eo/constructors/constructors_main.c @@ -76,14 +76,14 @@ main(int argc, char *argv[]) fail_if(a != 0); my_init_count = 0; - obj = efl_add(SIMPLE_CLASS, NULL, simple_a_set(efl_self, 7)); + obj = efl_add(SIMPLE_CLASS, NULL, simple_a_set(efl_added, 7)); fail_if(!obj); fail_if(my_init_count != 2); a = simple_a_get(obj); fail_if(a != 7); my_init_count = 0; - obj = efl_add(SIMPLE_CLASS, NULL, simple_b_set(efl_self, 6), simple_a_set(efl_self, -1), b = simple_b_get(efl_self)); + obj = efl_add(SIMPLE_CLASS, NULL, simple_b_set(efl_added, 6), simple_a_set(efl_added, -1), b = simple_b_get(efl_added)); fail_if(obj); fail_if(b != 6); fail_if(my_init_count != 0); diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c index 9d072dc055..95ab0b7d6d 100644 --- a/src/tests/eo/suite/eo_test_general.c +++ b/src/tests/eo/suite/eo_test_general.c @@ -1039,24 +1039,24 @@ START_TEST(efl_add_do_and_custom) Eo *obj = NULL; efl_object_init(); - obj = efl_add(SIMPLE_CLASS, NULL, efl_constructor(efl_self)); + obj = efl_add(SIMPLE_CLASS, NULL, efl_constructor(efl_added)); fail_if(!obj); efl_unref(obj); - obj = efl_add(SIMPLE_CLASS, NULL, simple_a_set(efl_self, 7)); + obj = efl_add(SIMPLE_CLASS, NULL, simple_a_set(efl_added, 7)); fail_if(!obj); pd = efl_data_scope_get(obj, SIMPLE_CLASS); fail_if(pd->a != 7); efl_unref(obj); - obj = efl_add(SIMPLE_CLASS, NULL, efl_constructor(efl_self), simple_a_set(efl_self, 7)); + obj = efl_add(SIMPLE_CLASS, NULL, efl_constructor(efl_added), simple_a_set(efl_added, 7)); fail_if(!obj); pd = efl_data_scope_get(obj, SIMPLE_CLASS); fail_if(pd->a != 7); efl_unref(obj); Eina_Bool finalized; - obj = efl_add(SIMPLE_CLASS, NULL, finalized = efl_finalized_get(efl_self)); + obj = efl_add(SIMPLE_CLASS, NULL, finalized = efl_finalized_get(efl_added)); fail_if(finalized); finalized = efl_finalized_get(obj); diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c index 31b31027fd..e707fc04e1 100644 --- a/src/tests/eo/suite/eo_test_threaded_calls.c +++ b/src/tests/eo/suite/eo_test_threaded_calls.c @@ -99,7 +99,7 @@ _thread_job(void *data, Eina_Thread t EINA_UNUSED) fail_if(EINA_LOCK_SUCCEED != eina_spinlock_take(&locks[0])); } - obj = efl_add(THREAD_TEST_CLASS, NULL, thread_test_constructor(efl_self, v)); + obj = efl_add(THREAD_TEST_CLASS, NULL, thread_test_constructor(efl_added, v)); thread_test_try_swap_stack(obj); v = thread_test_v_get(obj); diff --git a/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c b/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c index 62cac07ec7..6fe2cb4b9b 100644 --- a/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c +++ b/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c @@ -132,7 +132,7 @@ _constructor_method_class_classoutmethod1(Eo* obj EINA_UNUSED, Constructor_Metho { fprintf(stderr, "classoutmethod1\n"); fflush(stderr); - return efl_add(MY_CLASS, NULL, constructor_method_class_constructor1(efl_self, one), constructor_method_class_constructor2(efl_self, two)); + return efl_add(MY_CLASS, NULL, constructor_method_class_constructor1(efl_added, one), constructor_method_class_constructor2(efl_added, two)); } EOLIAN static void @@ -140,7 +140,7 @@ _constructor_method_class_classoutmethod2(Eo* obj EINA_UNUSED, Constructor_Metho { fprintf(stderr, "classoutmethod2\n"); fflush(stderr); - *out_class = efl_add(MY_CLASS, NULL, constructor_method_class_constructor1(efl_self, one), constructor_method_class_constructor2(efl_self, two)); + *out_class = efl_add(MY_CLASS, NULL, constructor_method_class_constructor1(efl_added, one), constructor_method_class_constructor2(efl_added, two)); }