summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-09-05 16:57:35 +0100
committerTom Hacohen <tom@stosb.com>2016-09-05 16:59:56 +0100
commit9c779dca90bea36ad43c77597f107dd157a33c46 (patch)
tree7f53cf04ccbb1ca6be0cd42983692f61f44c696f
parent5eedad98fe4fe696593147c87ae2278d76e4c9db (diff)
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
-rw-r--r--src/bin/elementary/test_application_server.c4
-rw-r--r--src/bin/elementary/test_code.c8
-rw-r--r--src/bin/elementary/test_events.c2
-rw-r--r--src/bin/elementary/test_glview.c6
-rw-r--r--src/bin/elementary/test_grid_static.c14
-rw-r--r--src/bin/elementary/test_task_switcher.c2
-rw-r--r--src/bin/elementary/test_ui_box.c12
-rw-r--r--src/bin/elementary/test_ui_grid.c14
-rw-r--r--src/examples/ecore/ecore_idler_example.c2
-rw-r--r--src/examples/ecore/ecore_poller_example.c6
-rw-r--r--src/examples/ecore/efl_io_copier_example.c72
-rw-r--r--src/examples/ecore/efl_io_copier_simple_example.c6
-rw-r--r--src/examples/ecore/efl_io_queue_example.c34
-rw-r--r--src/examples/ecore/efl_net_dialer_http_example.c58
-rw-r--r--src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c4
-rw-r--r--src/examples/ecore/efl_net_dialer_websocket_example.c14
-rw-r--r--src/examples/ecore/efl_net_server_example.c28
-rw-r--r--src/examples/eldbus/dbusmodel.c2
-rw-r--r--src/examples/elementary/evas3d_map_example.c10
-rw-r--r--src/examples/elementary/evas3d_object_on_button_example.c8
-rw-r--r--src/examples/elementary/evas3d_scene_on_button_example.c8
-rw-r--r--src/examples/elementary/filemvc.c8
-rw-r--r--src/examples/elementary/fileviewlist.c4
-rw-r--r--src/examples/elementary/performance/graphical.c12
-rw-r--r--src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c12
-rw-r--r--src/examples/evas/evas-3d-aabb.c10
-rw-r--r--src/examples/evas/evas-3d-blending.c10
-rw-r--r--src/examples/evas/evas-3d-colorpick.c8
-rw-r--r--src/examples/evas/evas-3d-cube-rotate.c8
-rw-r--r--src/examples/evas/evas-3d-cube.c8
-rw-r--r--src/examples/evas/evas-3d-cube2.c8
-rw-r--r--src/examples/evas/evas-3d-eet.c10
-rw-r--r--src/examples/evas/evas-3d-fog.c12
-rw-r--r--src/examples/evas/evas-3d-frustum.c10
-rw-r--r--src/examples/evas/evas-3d-hull.c12
-rw-r--r--src/examples/evas/evas-3d-md2.c8
-rw-r--r--src/examples/evas/evas-3d-mmap-set.c8
-rw-r--r--src/examples/evas/evas-3d-obj.c8
-rw-r--r--src/examples/evas/evas-3d-parallax-occlusion.c8
-rw-r--r--src/examples/evas/evas-3d-pick.c6
-rw-r--r--src/examples/evas/evas-3d-ply.c8
-rw-r--r--src/examples/evas/evas-3d-proxy.c8
-rw-r--r--src/examples/evas/evas-3d-shadows.c24
-rw-r--r--src/examples/evas/evas-3d-static-lod.c12
-rw-r--r--src/examples/evas/evas-vg-simple.c24
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter-header.c6
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter-macros.h2
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter.c4
-rw-r--r--src/lib/ecore/ecore_exe.c2
-rw-r--r--src/lib/ecore/ecore_main.c4
-rw-r--r--src/lib/ecore/ecore_poller.c2
-rw-r--r--src/lib/ecore/ecore_timer.c14
-rw-r--r--src/lib/ecore_con/ecore_con.c6
-rw-r--r--src/lib/ecore_con/ecore_con_eet.c4
-rw-r--r--src/lib/ecore_con/ecore_con_url.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_http.c4
-rw-r--r--src/lib/ecore_con/efl_net_dialer_websocket.c12
-rw-r--r--src/lib/ecore_con/efl_net_server_tcp.c4
-rw-r--r--src/lib/ector/cairo/ector_cairo_surface.c6
-rw-r--r--src/lib/ector/gl/ector_gl_surface.c6
-rw-r--r--src/lib/ector/software/ector_software_surface.c8
-rw-r--r--src/lib/edje/edje_containers.c2
-rw-r--r--src/lib/edje/edje_load.c8
-rw-r--r--src/lib/edje/edje_multisense.c6
-rw-r--r--src/lib/eio/eio_model.c6
-rw-r--r--src/lib/eldbus/eldbus_model_connection.c2
-rw-r--r--src/lib/eldbus/eldbus_model_object.c2
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.c4
-rw-r--r--src/lib/elementary/efl_ui_text.c6
-rw-r--r--src/lib/elementary/efl_ui_win.c4
-rw-r--r--src/lib/elementary/elc_ctxpopup.c4
-rw-r--r--src/lib/elementary/elc_fileselector.c10
-rw-r--r--src/lib/elementary/elc_fileselector_button.c4
-rw-r--r--src/lib/elementary/elm_app_client.c4
-rw-r--r--src/lib/elementary/elm_app_server.c2
-rw-r--r--src/lib/elementary/elm_code_diff_widget.c4
-rw-r--r--src/lib/elementary/elm_code_widget.c2
-rw-r--r--src/lib/elementary/elm_glview.c4
-rw-r--r--src/lib/elementary/elm_layout_pack.c4
-rw-r--r--src/lib/eo/Eo.h12
-rw-r--r--src/lib/eo/eo_add_fallback.c2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c2
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c6
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_container.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c6
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c6
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c4
-rw-r--r--src/tests/ecore/ecore_test_ecore.c10
-rw-r--r--src/tests/ecore/ecore_test_timer.c6
-rw-r--r--src/tests/eio/eio_model_test_file.c2
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c4
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_method.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_signal.c2
-rw-r--r--src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c2
-rw-r--r--src/tests/eo/constructors/constructors_main.c4
-rw-r--r--src/tests/eo/suite/eo_test_general.c8
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c2
-rw-r--r--src/tests/eolian_js/eolian_js_test_constructor_method_impl.c4
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 25b9b9d..7046135 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,
96 return NULL; 96 return NULL;
97 } 97 }
98 98
99 view = efl_add(ELM_APP_SERVER_VIEW_CLASS, app_server, elm_app_server_view_id_set(efl_self, NULL)); 99 view = efl_add(ELM_APP_SERVER_VIEW_CLASS, app_server, elm_app_server_view_id_set(efl_added, NULL));
100 100
101 id = elm_app_server_view_id_get(view); 101 id = elm_app_server_view_id_get(view);
102 pkg = elm_app_server_package_get(app_server); 102 pkg = elm_app_server_package_get(app_server);
@@ -136,7 +136,7 @@ test_application_server_common(const char *pkg)
136 Elm_App_Server_View *view; 136 Elm_App_Server_View *view;
137 Elm_App_Server *server; 137 Elm_App_Server *server;
138 138
139 server = efl_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(efl_self, pkg, _create_view_cb)); 139 server = efl_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(efl_added, pkg, _create_view_cb));
140 elm_app_server_title_set(server, pkg); 140 elm_app_server_title_set(server, pkg);
141 views_iter = elm_app_server_views_get(server); 141 views_iter = elm_app_server_views_get(server);
142 efl_event_callback_add(server, ELM_APP_SERVER_EVENT_TERMINATE, _terminate_cb, NULL); 142 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 fdebe92..9f615b5 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)
55 Elm_Code_Widget *widget; 55 Elm_Code_Widget *widget;
56 56
57 code = elm_code_create(); 57 code = elm_code_create();
58 widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code)); 58 widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_added, code));
59 elm_obj_code_widget_font_set(widget, NULL, 12); 59 elm_obj_code_widget_font_set(widget, NULL, 12);
60 efl_event_callback_add(widget, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_test_line_done_cb, NULL); 60 efl_event_callback_add(widget, &ELM_CODE_EVENT_LINE_LOAD_DONE, _elm_code_test_line_done_cb, NULL);
61 efl_event_callback_add(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, _elm_code_test_line_clicked_cb, code); 61 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)
83 Elm_Code_Widget *widget; 83 Elm_Code_Widget *widget;
84 84
85 code = elm_code_create(); 85 code = elm_code_create();
86 widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code)); 86 widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_added, code));
87 elm_obj_code_widget_font_set(widget, NULL, 14); 87 elm_obj_code_widget_font_set(widget, NULL, 14);
88 elm_obj_code_widget_editable_set(widget, EINA_TRUE); 88 elm_obj_code_widget_editable_set(widget, EINA_TRUE);
89 elm_obj_code_widget_show_whitespace_set(widget, EINA_TRUE); 89 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
113{ 113{
114 Elm_Code_Widget *widget; 114 Elm_Code_Widget *widget;
115 115
116 widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code)); 116 widget = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_added, code));
117 elm_obj_code_widget_font_set(widget, font_name, 11); 117 elm_obj_code_widget_font_set(widget, font_name, 11);
118 elm_obj_code_widget_line_numbers_set(widget, EINA_TRUE); 118 elm_obj_code_widget_line_numbers_set(widget, EINA_TRUE);
119 119
@@ -131,7 +131,7 @@ _elm_code_test_diff_inline_setup(Evas_Object *parent)
131 Elm_Code *code; 131 Elm_Code *code;
132 132
133 code = elm_code_create(); 133 code = elm_code_create();
134 diff = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code)); 134 diff = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_added, code));
135 135
136 evas_object_size_hint_weight_set(diff, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 136 evas_object_size_hint_weight_set(diff, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
137 evas_object_size_hint_align_set(diff, EVAS_HINT_FILL, EVAS_HINT_FILL); 137 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 4ff26a9..df0b5b5 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
186 win = elm_win_util_standard_add("buttons", "Buttons"); 186 win = elm_win_util_standard_add("buttons", "Buttons");
187 elm_win_autodel_set(win, EINA_TRUE); 187 elm_win_autodel_set(win, EINA_TRUE);
188 188
189 bx = efl_add(EFL_UI_BOX_CLASS, win, efl_orientation_set(efl_self, EFL_ORIENT_VERTICAL)); 189 bx = efl_add(EFL_UI_BOX_CLASS, win, efl_orientation_set(efl_added, EFL_ORIENT_VERTICAL));
190 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 190 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
191 evas_object_size_hint_align_set(bx, -1, -1); 191 evas_object_size_hint_align_set(bx, -1, -1);
192 efl_pack(win, bx); 192 efl_pack(win, bx);
diff --git a/src/bin/elementary/test_glview.c b/src/bin/elementary/test_glview.c
index 12e20bf..72bb0bf 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
637 eina_stringshare_del(accel); 637 eina_stringshare_del(accel);
638#else 638#else
639 win = efl_add(EFL_UI_WIN_STANDARD_CLASS, NULL, 639 win = efl_add(EFL_UI_WIN_STANDARD_CLASS, NULL,
640 efl_ui_win_name_set(efl_self, "glview"), 640 efl_ui_win_name_set(efl_added, "glview"),
641 efl_text_set(efl_self, "GLView"), 641 efl_text_set(efl_added, "GLView"),
642 efl_ui_win_accel_preference_set(efl_self, "gl:depth")); 642 efl_ui_win_accel_preference_set(efl_added, "gl:depth"));
643 elm_win_autodel_set(win, EINA_TRUE); 643 elm_win_autodel_set(win, EINA_TRUE);
644#endif 644#endif
645 645
diff --git a/src/bin/elementary/test_grid_static.c b/src/bin/elementary/test_grid_static.c
index 0269a3d..ef3e517 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
105 api_data *api = calloc(1, sizeof(*api)); 105 api_data *api = calloc(1, sizeof(*api));
106 106
107 win = efl_add(EFL_UI_WIN_STANDARD_CLASS, NULL, 107 win = efl_add(EFL_UI_WIN_STANDARD_CLASS, NULL,
108 efl_ui_win_name_set(efl_self, "grid"), 108 efl_ui_win_name_set(efl_added, "grid"),
109 efl_text_set(efl_self, "Grid"), 109 efl_text_set(efl_added, "Grid"),
110 efl_ui_win_autodel_set(efl_self, EINA_TRUE), 110 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
111 efl_event_callback_add(efl_self, EFL_EVENT_DEL, _win_del, api)); 111 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _win_del, api));
112 112
113 static int run_count = 0; 113 static int run_count = 0;
114 if (((run_count++) % 2) == 0) 114 if (((run_count++) % 2) == 0)
115 { 115 {
116 gd = efl_add(EFL_UI_GRID_STATIC_CLASS, win, 116 gd = efl_add(EFL_UI_GRID_STATIC_CLASS, win,
117 efl_gfx_size_hint_weight_set(efl_self, 1, 1)); 117 efl_gfx_size_hint_weight_set(efl_added, 1, 1));
118 } 118 }
119 else 119 else
120 { 120 {
121 gd = efl_add(EFL_UI_GRID_CLASS, win, 121 gd = efl_add(EFL_UI_GRID_CLASS, win,
122 efl_gfx_size_hint_weight_set(efl_self, 1, 1), 122 efl_gfx_size_hint_weight_set(efl_added, 1, 1),
123 efl_pack_layout_engine_set(efl_self, EFL_UI_GRID_STATIC_CLASS, NULL)); 123 efl_pack_layout_engine_set(efl_added, EFL_UI_GRID_STATIC_CLASS, NULL));
124 } 124 }
125 efl_pack(win, gd); 125 efl_pack(win, gd);
126 api->data.grid = gd; 126 api->data.grid = gd;
diff --git a/src/bin/elementary/test_task_switcher.c b/src/bin/elementary/test_task_switcher.c
index 5e35a7e..3a6f780 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)
300 return; 300 return;
301 } 301 }
302 302
303 app = efl_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(efl_self, package)); 303 app = efl_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(efl_added, package));
304 efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, _view_list_update_cb, table); 304 efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, _view_list_update_cb, table);
305 efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_CREATED, _view_list_update_cb, table); 305 efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_CREATED, _view_list_update_cb, table);
306 efl_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_DELETED, _view_list_update_cb, table); 306 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 44fedfa..5e918be 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
233 233
234 /* weights radio group */ 234 /* weights radio group */
235 bx = efl_add(EFL_UI_BOX_CLASS, win, 235 bx = efl_add(EFL_UI_BOX_CLASS, win,
236 efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); 236 efl_orientation_set(efl_added, EFL_ORIENT_DOWN));
237 efl_gfx_size_hint_align_set(bx, 0, -1); 237 efl_gfx_size_hint_align_set(bx, 0, -1);
238 efl_pack(hbox, bx); 238 efl_pack(hbox, bx);
239 efl_gfx_visible_set(bx, 1); 239 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
287 287
288 /* misc */ 288 /* misc */
289 bx = efl_add(EFL_UI_BOX_CLASS, win, 289 bx = efl_add(EFL_UI_BOX_CLASS, win,
290 efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); 290 efl_orientation_set(efl_added, EFL_ORIENT_DOWN));
291 efl_gfx_size_hint_align_set(bx, 0, -1); 291 efl_gfx_size_hint_align_set(bx, 0, -1);
292 efl_gfx_size_hint_weight_set(bx, 0, 1); 292 efl_gfx_size_hint_weight_set(bx, 0, 1);
293 efl_pack(hbox, bx); 293 efl_pack(hbox, bx);
@@ -350,7 +350,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
350 350
351 /* user min size setter */ 351 /* user min size setter */
352 bx = efl_add(EFL_UI_BOX_CLASS, win, 352 bx = efl_add(EFL_UI_BOX_CLASS, win,
353 efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); 353 efl_orientation_set(efl_added, EFL_ORIENT_DOWN));
354 efl_gfx_size_hint_align_set(bx, 0, -1); 354 efl_gfx_size_hint_align_set(bx, 0, -1);
355 efl_gfx_size_hint_weight_set(bx, 0, 1); 355 efl_gfx_size_hint_weight_set(bx, 0, 1);
356 efl_pack(hbox, bx); 356 efl_pack(hbox, bx);
@@ -377,7 +377,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
377 377
378 /* inner box padding */ 378 /* inner box padding */
379 bx = efl_add(EFL_UI_BOX_CLASS, win, 379 bx = efl_add(EFL_UI_BOX_CLASS, win,
380 efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); 380 efl_orientation_set(efl_added, EFL_ORIENT_DOWN));
381 efl_gfx_size_hint_align_set(bx, 0, -1); 381 efl_gfx_size_hint_align_set(bx, 0, -1);
382 efl_gfx_size_hint_weight_set(bx, 0, 1); 382 efl_gfx_size_hint_weight_set(bx, 0, 1);
383 efl_pack(hbox, bx); 383 efl_pack(hbox, bx);
@@ -404,7 +404,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
404 404
405 /* outer margin */ 405 /* outer margin */
406 bx = efl_add(EFL_UI_BOX_CLASS, win, 406 bx = efl_add(EFL_UI_BOX_CLASS, win,
407 efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); 407 efl_orientation_set(efl_added, EFL_ORIENT_DOWN));
408 efl_gfx_size_hint_align_set(bx, 0, -1); 408 efl_gfx_size_hint_align_set(bx, 0, -1);
409 efl_gfx_size_hint_weight_set(bx, 0, 1); 409 efl_gfx_size_hint_weight_set(bx, 0, 1);
410 efl_pack(hbox, bx); 410 efl_pack(hbox, bx);
@@ -431,7 +431,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
431 431
432 /* Box align */ 432 /* Box align */
433 bx = efl_add(EFL_UI_BOX_CLASS, win, 433 bx = efl_add(EFL_UI_BOX_CLASS, win,
434 efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); 434 efl_orientation_set(efl_added, EFL_ORIENT_DOWN));
435 efl_gfx_size_hint_align_set(bx, 0, -1); 435 efl_gfx_size_hint_align_set(bx, 0, -1);
436 efl_gfx_size_hint_weight_set(bx, 1, 1); 436 efl_gfx_size_hint_weight_set(bx, 1, 1);
437 efl_pack(hbox, bx); 437 efl_pack(hbox, bx);
diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index ba198c1..def80b1 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
226 226
227 /* weights radio group */ 227 /* weights radio group */
228 bx = efl_add(EFL_UI_BOX_CLASS, win, 228 bx = efl_add(EFL_UI_BOX_CLASS, win,
229 efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); 229 efl_orientation_set(efl_added, EFL_ORIENT_DOWN));
230 efl_gfx_size_hint_align_set(bx, 0, -1); 230 efl_gfx_size_hint_align_set(bx, 0, -1);
231 efl_pack(hbox, bx); 231 efl_pack(hbox, bx);
232 efl_gfx_visible_set(bx, 1); 232 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
289 289
290 /* min size setter */ 290 /* min size setter */
291 bx = efl_add(EFL_UI_BOX_CLASS, win, 291 bx = efl_add(EFL_UI_BOX_CLASS, win,
292 efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); 292 efl_orientation_set(efl_added, EFL_ORIENT_DOWN));
293 efl_gfx_size_hint_align_set(bx, 0.5, -1); 293 efl_gfx_size_hint_align_set(bx, 0.5, -1);
294 efl_gfx_size_hint_weight_set(bx, 0, 1); 294 efl_gfx_size_hint_weight_set(bx, 0, 1);
295 efl_pack(hbox, bx); 295 efl_pack(hbox, bx);
@@ -316,7 +316,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
316 316
317 /* inner box padding */ 317 /* inner box padding */
318 bx = efl_add(EFL_UI_BOX_CLASS, win, 318 bx = efl_add(EFL_UI_BOX_CLASS, win,
319 efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); 319 efl_orientation_set(efl_added, EFL_ORIENT_DOWN));
320 efl_gfx_size_hint_align_set(bx, 0, -1); 320 efl_gfx_size_hint_align_set(bx, 0, -1);
321 efl_gfx_size_hint_weight_set(bx, 0, 1); 321 efl_gfx_size_hint_weight_set(bx, 0, 1);
322 efl_pack(hbox, bx); 322 efl_pack(hbox, bx);
@@ -343,7 +343,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
343 343
344 /* outer margin */ 344 /* outer margin */
345 bx = efl_add(EFL_UI_BOX_CLASS, win, 345 bx = efl_add(EFL_UI_BOX_CLASS, win,
346 efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); 346 efl_orientation_set(efl_added, EFL_ORIENT_DOWN));
347 efl_gfx_size_hint_align_set(bx, 0, -1); 347 efl_gfx_size_hint_align_set(bx, 0, -1);
348 efl_gfx_size_hint_weight_set(bx, 0, 1); 348 efl_gfx_size_hint_weight_set(bx, 0, 1);
349 efl_pack(hbox, bx); 349 efl_pack(hbox, bx);
@@ -370,7 +370,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
370 370
371 /* button margins */ 371 /* button margins */
372 bx = efl_add(EFL_UI_BOX_CLASS, win, 372 bx = efl_add(EFL_UI_BOX_CLASS, win,
373 efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); 373 efl_orientation_set(efl_added, EFL_ORIENT_DOWN));
374 efl_gfx_size_hint_align_set(bx, 0, -1); 374 efl_gfx_size_hint_align_set(bx, 0, -1);
375 efl_gfx_size_hint_weight_set(bx, 1, 1); 375 efl_gfx_size_hint_weight_set(bx, 1, 1);
376 efl_pack(hbox, bx); 376 efl_pack(hbox, bx);
@@ -397,7 +397,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
397 397
398 /* ro info */ 398 /* ro info */
399 bx = efl_add(EFL_UI_BOX_CLASS, win, 399 bx = efl_add(EFL_UI_BOX_CLASS, win,
400 efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); 400 efl_orientation_set(efl_added, EFL_ORIENT_DOWN));
401 efl_gfx_size_hint_align_set(bx, 0, -1); 401 efl_gfx_size_hint_align_set(bx, 0, -1);
402 efl_gfx_size_hint_weight_set(bx, 1, 1); 402 efl_gfx_size_hint_weight_set(bx, 1, 1);
403 efl_pack(hbox, bx); 403 efl_pack(hbox, bx);
@@ -578,7 +578,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
578 578
579 /* ro info */ 579 /* ro info */
580 bx = efl_add(EFL_UI_BOX_CLASS, win, 580 bx = efl_add(EFL_UI_BOX_CLASS, win,
581 efl_orientation_set(efl_self, EFL_ORIENT_DOWN)); 581 efl_orientation_set(efl_added, EFL_ORIENT_DOWN));
582 efl_gfx_size_hint_align_set(bx, 0, -1); 582 efl_gfx_size_hint_align_set(bx, 0, -1);
583 efl_gfx_size_hint_weight_set(bx, 1, 1); 583 efl_gfx_size_hint_weight_set(bx, 1, 1);
584 efl_pack(hbox, bx); 584 efl_pack(hbox, bx);
diff --git a/src/examples/ecore/ecore_idler_example.c b/src/examples/ecore/ecore_idler_example.c
index 5e6ba84..53e7d6f 100644
--- a/src/examples/ecore/ecore_idler_example.c
+++ b/src/examples/ecore/ecore_idler_example.c
@@ -110,7 +110,7 @@ main(void)
110 ctxt.enterer = ecore_idle_enterer_add(_enterer_cb, &ctxt); 110 ctxt.enterer = ecore_idle_enterer_add(_enterer_cb, &ctxt);
111 ctxt.exiter = ecore_idle_exiter_add(_exiter_cb, &ctxt); 111 ctxt.exiter = ecore_idle_exiter_add(_exiter_cb, &ctxt);
112 ctxt.idler = ecore_idler_add(_idler_cb, &ctxt); 112 ctxt.idler = ecore_idler_add(_idler_cb, &ctxt);
113// ctxt.idler = efl_add(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(efl_self, _idler_cb, &ctxt)); 113// ctxt.idler = efl_add(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(efl_added, _idler_cb, &ctxt));
114 ctxt.handler = ecore_event_handler_add(_event_type, 114 ctxt.handler = ecore_event_handler_add(_event_type,
115 _event_handler_cb, 115 _event_handler_cb,
116 &ctxt); 116 &ctxt);
diff --git a/src/examples/ecore/ecore_poller_example.c b/src/examples/ecore/ecore_poller_example.c
index 2e0006c..6c55dbc 100644
--- a/src/examples/ecore/ecore_poller_example.c
+++ b/src/examples/ecore/ecore_poller_example.c
@@ -48,9 +48,9 @@ main(void)
48 poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2); 48 poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2);
49 poller3 = ecore_poller_add(ECORE_POLLER_CORE, 30, _poller_quit_cb, str3); 49 poller3 = ecore_poller_add(ECORE_POLLER_CORE, 30, _poller_quit_cb, str3);
50 50
51// poller1 = efl_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_self, ECORE_POLLER_CORE, 4, _poller_print_cb, str1)); 51// poller1 = efl_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 4, _poller_print_cb, str1));
52// poller2 = efl_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_self, ECORE_POLLER_CORE, 8, _poller_print_cb, str2)); 52// poller2 = efl_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 8, _poller_print_cb, str2));
53// poller3 = efl_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_self, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3)); 53// poller3 = efl_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3));
54 54
55 55
56 ecore_main_loop_begin(); 56 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 a633773..689a743 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)
413 if (strcmp(input_fname, ":stdin:") == 0) 413 if (strcmp(input_fname, ":stdin:") == 0)
414 { 414 {
415 input = efl_add(EFL_IO_STDIN_CLASS, NULL, 415 input = efl_add(EFL_IO_STDIN_CLASS, NULL,
416 efl_event_callback_array_add(efl_self, input_cbs(), NULL)); 416 efl_event_callback_array_add(efl_added, input_cbs(), NULL));
417 if (!input) 417 if (!input)
418 { 418 {
419 fprintf(stderr, "ERROR: could not open stdin.\n"); 419 fprintf(stderr, "ERROR: could not open stdin.\n");
@@ -430,8 +430,8 @@ main(int argc, char **argv)
430 const char *address = input_fname + strlen("tcp://"); 430 const char *address = input_fname + strlen("tcp://");
431 Eina_Error err; 431 Eina_Error err;
432 input = efl_add(EFL_NET_DIALER_TCP_CLASS, ecore_main_loop_get(), 432 input = efl_add(EFL_NET_DIALER_TCP_CLASS, ecore_main_loop_get(),
433 efl_event_callback_array_add(efl_self, input_cbs(), NULL), /* optional */ 433 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
434 efl_event_callback_array_add(efl_self, dialer_cbs(), NULL) /* optional */ 434 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
435 ); 435 );
436 if (!input) 436 if (!input)
437 { 437 {
@@ -454,10 +454,10 @@ main(int argc, char **argv)
454 Eina_Error err; 454 Eina_Error err;
455 455
456 input = efl_add(EFL_NET_DIALER_HTTP_CLASS, ecore_main_loop_get(), 456 input = efl_add(EFL_NET_DIALER_HTTP_CLASS, ecore_main_loop_get(),
457 efl_net_dialer_http_method_set(efl_self, "GET"), 457 efl_net_dialer_http_method_set(efl_added, "GET"),
458 efl_event_callback_array_add(efl_self, input_cbs(), NULL), /* optional */ 458 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
459 efl_event_callback_array_add(efl_self, dialer_cbs(), NULL), /* optional */ 459 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL), /* optional */
460 efl_event_callback_array_add(efl_self, http_cbs(), NULL) /* optional */ 460 efl_event_callback_array_add(efl_added, http_cbs(), NULL) /* optional */
461 ); 461 );
462 if (!input) 462 if (!input)
463 { 463 {
@@ -480,9 +480,9 @@ main(int argc, char **argv)
480 Eina_Error err; 480 Eina_Error err;
481 481
482 input = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, ecore_main_loop_get(), 482 input = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, ecore_main_loop_get(),
483 efl_net_dialer_websocket_streaming_mode_set(efl_self, EFL_NET_DIALER_WEBSOCKET_STREAMING_MODE_TEXT), 483 efl_net_dialer_websocket_streaming_mode_set(efl_added, EFL_NET_DIALER_WEBSOCKET_STREAMING_MODE_TEXT),
484 efl_event_callback_array_add(efl_self, input_cbs(), NULL), /* optional */ 484 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
485 efl_event_callback_array_add(efl_self, dialer_cbs(), NULL) /* optional */ 485 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
486 ); 486 );
487 if (!input) 487 if (!input)
488 { 488 {
@@ -503,9 +503,9 @@ main(int argc, char **argv)
503 { 503 {
504 /* regular file, open with flags: read-only and close-on-exec */ 504 /* regular file, open with flags: read-only and close-on-exec */
505 input = efl_add(EFL_IO_FILE_CLASS, NULL, 505 input = efl_add(EFL_IO_FILE_CLASS, NULL,
506 efl_file_set(efl_self, input_fname, NULL), /* mandatory */ 506 efl_file_set(efl_added, input_fname, NULL), /* mandatory */
507 efl_io_file_flags_set(efl_self, O_RDONLY | O_CLOEXEC), /* recommended */ 507 efl_io_file_flags_set(efl_added, O_RDONLY | O_CLOEXEC), /* recommended */
508 efl_event_callback_array_add(efl_self, input_cbs(), NULL) /* optional */ 508 efl_event_callback_array_add(efl_added, input_cbs(), NULL) /* optional */
509 ); 509 );
510 if (!input) 510 if (!input)
511 { 511 {
@@ -519,7 +519,7 @@ main(int argc, char **argv)
519 if (strcmp(output_fname, ":stdout:") == 0) 519 if (strcmp(output_fname, ":stdout:") == 0)
520 { 520 {
521 output = efl_add(EFL_IO_STDOUT_CLASS, NULL, 521 output = efl_add(EFL_IO_STDOUT_CLASS, NULL,
522 efl_event_callback_array_add(efl_self, output_cbs(), NULL) /* optional */ 522 efl_event_callback_array_add(efl_added, output_cbs(), NULL) /* optional */
523 ); 523 );
524 if (!output) 524 if (!output)
525 { 525 {
@@ -531,7 +531,7 @@ main(int argc, char **argv)
531 else if (strcmp(output_fname, ":stderr:") == 0) 531 else if (strcmp(output_fname, ":stderr:") == 0)
532 { 532 {
533 output = efl_add(EFL_IO_STDERR_CLASS, NULL, 533 output = efl_add(EFL_IO_STDERR_CLASS, NULL,
534 efl_event_callback_array_add(efl_self, output_cbs(), NULL) /* optional */ 534 efl_event_callback_array_add(efl_added, output_cbs(), NULL) /* optional */
535 ); 535 );
536 if (!output) 536 if (!output)
537 { 537 {
@@ -558,8 +558,8 @@ main(int argc, char **argv)
558 * _copier_done(). 558 * _copier_done().
559 */ 559 */
560 output = efl_add(EFL_IO_BUFFER_CLASS, NULL, 560 output = efl_add(EFL_IO_BUFFER_CLASS, NULL,
561 efl_event_callback_array_add(efl_self, output_cbs(), NULL), /* optional */ 561 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
562 efl_event_callback_array_add(efl_self, output_buffer_cbs(), NULL) /* optional */ 562 efl_event_callback_array_add(efl_added, output_buffer_cbs(), NULL) /* optional */
563 ); 563 );
564 if (!output) 564 if (!output)
565 { 565 {
@@ -588,8 +588,8 @@ main(int argc, char **argv)
588 const char *address = output_fname + strlen("tcp://"); 588 const char *address = output_fname + strlen("tcp://");
589 Eina_Error err; 589 Eina_Error err;
590 output = efl_add(EFL_NET_DIALER_TCP_CLASS, ecore_main_loop_get(), 590 output = efl_add(EFL_NET_DIALER_TCP_CLASS, ecore_main_loop_get(),
591 efl_event_callback_array_add(efl_self, output_cbs(), NULL), /* optional */ 591 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
592 efl_event_callback_array_add(efl_self, dialer_cbs(), NULL) /* optional */ 592 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
593 ); 593 );
594 if (!output) 594 if (!output)
595 { 595 {
@@ -612,10 +612,10 @@ main(int argc, char **argv)
612 Eina_Error err; 612 Eina_Error err;
613 613
614 output = efl_add(EFL_NET_DIALER_HTTP_CLASS, ecore_main_loop_get(), 614 output = efl_add(EFL_NET_DIALER_HTTP_CLASS, ecore_main_loop_get(),
615 efl_net_dialer_http_method_set(efl_self, "PUT"), 615 efl_net_dialer_http_method_set(efl_added, "PUT"),
616 efl_event_callback_array_add(efl_self, output_cbs(), NULL), /* optional */ 616 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
617 efl_event_callback_array_add(efl_self, dialer_cbs(), NULL), /* optional */ 617 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL), /* optional */
618 efl_event_callback_array_add(efl_self, http_cbs(), NULL) /* optional */ 618 efl_event_callback_array_add(efl_added, http_cbs(), NULL) /* optional */
619 ); 619 );
620 if (!output) 620 if (!output)
621 { 621 {
@@ -638,9 +638,9 @@ main(int argc, char **argv)
638 Eina_Error err; 638 Eina_Error err;
639 639
640 output = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, ecore_main_loop_get(), 640 output = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, ecore_main_loop_get(),
641 efl_net_dialer_websocket_streaming_mode_set(efl_self, EFL_NET_DIALER_WEBSOCKET_STREAMING_MODE_TEXT), 641 efl_net_dialer_websocket_streaming_mode_set(efl_added, EFL_NET_DIALER_WEBSOCKET_STREAMING_MODE_TEXT),
642 efl_event_callback_array_add(efl_self, output_cbs(), NULL), /* optional */ 642 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
643 efl_event_callback_array_add(efl_self, dialer_cbs(), NULL) /* optional */ 643 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
644 ); 644 );
645 if (!output) 645 if (!output)
646 { 646 {
@@ -663,10 +663,10 @@ main(int argc, char **argv)
663 * create if did not exist and truncate if exist. 663 * create if did not exist and truncate if exist.
664 */ 664 */
665 output = efl_add(EFL_IO_FILE_CLASS, NULL, 665 output = efl_add(EFL_IO_FILE_CLASS, NULL,
666 efl_file_set(efl_self, output_fname, NULL), /* mandatory */ 666 efl_file_set(efl_added, output_fname, NULL), /* mandatory */
667 efl_io_file_flags_set(efl_self, O_WRONLY | O_CLOEXEC | O_CREAT | O_TRUNC), /* mandatory for write */ 667 efl_io_file_flags_set(efl_added, O_WRONLY | O_CLOEXEC | O_CREAT | O_TRUNC), /* mandatory for write */
668 efl_io_file_mode_set(efl_self, 0644), /* mandatory for write */ 668 efl_io_file_mode_set(efl_added, 0644), /* mandatory for write */
669 efl_event_callback_array_add(efl_self, output_cbs(), NULL) /* optional */ 669 efl_event_callback_array_add(efl_added, output_cbs(), NULL) /* optional */
670 ); 670 );
671 if (!output) 671 if (!output)
672 { 672 {
@@ -688,12 +688,12 @@ main(int argc, char **argv)
688 line_delm_slice = (Eina_Slice)EINA_SLICE_STR(line_delimiter); 688 line_delm_slice = (Eina_Slice)EINA_SLICE_STR(line_delimiter);
689 689
690 copier = efl_add(EFL_IO_COPIER_CLASS, ecore_main_loop_get(), 690 copier = efl_add(EFL_IO_COPIER_CLASS, ecore_main_loop_get(),
691 efl_io_copier_source_set(efl_self, input), /* mandatory */ 691 efl_io_copier_source_set(efl_added, input), /* mandatory */
692 efl_io_copier_destination_set(efl_self, output), /* optional, see :none: */ 692 efl_io_copier_destination_set(efl_added, output), /* optional, see :none: */
693 efl_io_copier_line_delimiter_set(efl_self, &line_delm_slice), /* optional */ 693 efl_io_copier_line_delimiter_set(efl_added, &line_delm_slice), /* optional */
694 efl_io_copier_buffer_limit_set(efl_self, buffer_limit), /* optional, defaults to unlimited */ 694 efl_io_copier_buffer_limit_set(efl_added, buffer_limit), /* optional, defaults to unlimited */
695 efl_io_copier_read_chunk_size_set(efl_self, read_chunk_size), /* optional, defaults to 4096 */ 695 efl_io_copier_read_chunk_size_set(efl_added, read_chunk_size), /* optional, defaults to 4096 */
696 efl_event_callback_array_add(efl_self, copier_cbs(), NULL) /* recommended, at least EFL_IO_COPIER_EVENT_DONE. */ 696 efl_event_callback_array_add(efl_added, copier_cbs(), NULL) /* recommended, at least EFL_IO_COPIER_EVENT_DONE. */
697 ); 697 );
698 if (!copier) 698 if (!copier)
699 { 699 {
diff --git a/src/examples/ecore/efl_io_copier_simple_example.c b/src/examples/ecore/efl_io_copier_simple_example.c
index 2db73e4..092d373 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[])
34 input = efl_add(EFL_IO_STDIN_CLASS, loop); 34 input = efl_add(EFL_IO_STDIN_CLASS, loop);
35 output = efl_add(EFL_IO_STDOUT_CLASS, loop); 35 output = efl_add(EFL_IO_STDOUT_CLASS, loop);
36 copier = efl_add(EFL_IO_COPIER_CLASS, loop, 36 copier = efl_add(EFL_IO_COPIER_CLASS, loop,
37 efl_io_copier_source_set(efl_self, input), /* mandatory */ 37 efl_io_copier_source_set(efl_added, input), /* mandatory */
38 efl_io_copier_destination_set(efl_self, output), /* optional */ 38 efl_io_copier_destination_set(efl_added, output), /* optional */
39 efl_event_callback_array_add(efl_self, copier_cbs(), NULL) /* recommended, at least EFL_IO_COPIER_EVENT_DONE. */ 39 efl_event_callback_array_add(efl_added, copier_cbs(), NULL) /* recommended, at least EFL_IO_COPIER_EVENT_DONE. */
40 ); 40 );
41 41
42 ecore_main_loop_begin(); 42 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 730b02c..9b5f3a2 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)
245 * write another. 245 * write another.
246 */ 246 */
247 send_queue = efl_add(EFL_IO_QUEUE_CLASS, NULL, 247 send_queue = efl_add(EFL_IO_QUEUE_CLASS, NULL,
248 efl_name_set(efl_self, "send_queue"), 248 efl_name_set(efl_added, "send_queue"),
249 efl_io_queue_limit_set(efl_self, buffer_limit)); 249 efl_io_queue_limit_set(efl_added, buffer_limit));
250 if (!send_queue) 250 if (!send_queue)
251 { 251 {
252 fprintf(stderr, "ERROR: could not create Efl_Io_Queue (send)\n"); 252 fprintf(stderr, "ERROR: could not create Efl_Io_Queue (send)\n");
@@ -267,9 +267,9 @@ main(int argc, char **argv)
267 * clear(). 267 * clear().
268 */ 268 */
269 receive_queue = efl_add(EFL_IO_QUEUE_CLASS, NULL, 269 receive_queue = efl_add(EFL_IO_QUEUE_CLASS, NULL,
270 efl_name_set(efl_self, "receive_queue"), 270 efl_name_set(efl_added, "receive_queue"),
271 efl_io_queue_limit_set(efl_self, buffer_limit), 271 efl_io_queue_limit_set(efl_added, buffer_limit),
272 efl_event_callback_add(efl_self, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, _receiver_data, NULL)); 272 efl_event_callback_add(efl_added, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, _receiver_data, NULL));
273 if (!receive_queue) 273 if (!receive_queue)
274 { 274 {
275 fprintf(stderr, "ERROR: could not create Efl_Io_Queue (receive)\n"); 275 fprintf(stderr, "ERROR: could not create Efl_Io_Queue (receive)\n");
@@ -291,8 +291,8 @@ main(int argc, char **argv)
291 291
292 /* The TCP client to use to send/receive network data */ 292 /* The TCP client to use to send/receive network data */
293 dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, loop, 293 dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, loop,
294 efl_name_set(efl_self, "dialer"), 294 efl_name_set(efl_added, "dialer"),
295 efl_event_callback_add(efl_self, EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected, NULL)); 295 efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected, NULL));
296 if (!dialer) 296 if (!dialer)
297 { 297 {
298 fprintf(stderr, "ERROR: could not create Efl_Net_Dialer_Tcp\n"); 298 fprintf(stderr, "ERROR: could not create Efl_Net_Dialer_Tcp\n");
@@ -302,11 +302,11 @@ main(int argc, char **argv)
302 302
303 /* sender: send_queue->network */ 303 /* sender: send_queue->network */
304 sender = efl_add(EFL_IO_COPIER_CLASS, loop, 304 sender = efl_add(EFL_IO_COPIER_CLASS, loop,
305 efl_name_set(efl_self, "sender"), 305 efl_name_set(efl_added, "sender"),
306 efl_io_copier_line_delimiter_set(efl_self, &line_delimiter), 306 efl_io_copier_line_delimiter_set(efl_added, &line_delimiter),
307 efl_io_copier_source_set(efl_self, send_queue), 307 efl_io_copier_source_set(efl_added, send_queue),
308 efl_io_copier_destination_set(efl_self, dialer), 308 efl_io_copier_destination_set(efl_added, dialer),
309 efl_event_callback_array_add(efl_self, copier_cbs(), NULL)); 309 efl_event_callback_array_add(efl_added, copier_cbs(), NULL));
310 if (!sender) 310 if (!sender)
311 { 311 {
312 fprintf(stderr, "ERROR: could not create Efl_Io_Copier (sender)\n"); 312 fprintf(stderr, "ERROR: could not create Efl_Io_Copier (sender)\n");
@@ -316,11 +316,11 @@ main(int argc, char **argv)
316 316
317 /* receiver: network->receive_queue */ 317 /* receiver: network->receive_queue */
318 receiver = efl_add(EFL_IO_COPIER_CLASS, loop, 318 receiver = efl_add(EFL_IO_COPIER_CLASS, loop,
319 efl_name_set(efl_self, "receiver"), 319 efl_name_set(efl_added, "receiver"),
320 efl_io_copier_line_delimiter_set(efl_self, &line_delimiter), 320 efl_io_copier_line_delimiter_set(efl_added, &line_delimiter),
321 efl_io_copier_source_set(efl_self, dialer), 321 efl_io_copier_source_set(efl_added, dialer),
322 efl_io_copier_destination_set(efl_self, receive_queue), 322 efl_io_copier_destination_set(efl_added, receive_queue),
323 efl_event_callback_array_add(efl_self, copier_cbs(), NULL)); 323 efl_event_callback_array_add(efl_added, copier_cbs(), NULL));
324 if (!receiver) 324 if (!receiver)
325 { 325 {
326 fprintf(stderr, "ERROR: could not create Efl_Io_Copier (receiver)\n"); 326 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 9e7a4b5..de73869 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)
282 if ((!input_fname) || (strcmp(input_fname, ":stdin:") == 0)) 282 if ((!input_fname) || (strcmp(input_fname, ":stdin:") == 0))
283 { 283 {
284 input = efl_add(EFL_IO_STDIN_CLASS, loop, 284 input = efl_add(EFL_IO_STDIN_CLASS, loop,
285 efl_name_set(efl_self, "stdin"), 285 efl_name_set(efl_added, "stdin"),
286 efl_event_callback_add(efl_self, EFL_IO_READER_EVENT_EOS, _eos, NULL)); 286 efl_event_callback_add(efl_added, EFL_IO_READER_EVENT_EOS, _eos, NULL));
287 } 287 }
288 else 288 else
289 { 289 {
290 input = efl_add(EFL_IO_FILE_CLASS, loop, 290 input = efl_add(EFL_IO_FILE_CLASS, loop,
291 efl_name_set(efl_self, "input"), 291 efl_name_set(efl_added, "input"),
292 efl_file_set(efl_self, input_fname, NULL), 292 efl_file_set(efl_added, input_fname, NULL),
293 efl_io_file_flags_set(efl_self, O_RDONLY | O_CLOEXEC), 293 efl_io_file_flags_set(efl_added, O_RDONLY | O_CLOEXEC),
294 efl_event_callback_add(efl_self, EFL_IO_READER_EVENT_EOS, _eos, NULL)); 294 efl_event_callback_add(efl_added, EFL_IO_READER_EVENT_EOS, _eos, NULL));
295 } 295 }
296 296
297 if ((!output_fname) || (strcmp(output_fname, ":stdout:") == 0)) 297 if ((!output_fname) || (strcmp(output_fname, ":stdout:") == 0))
298 { 298 {
299 output = efl_add(EFL_IO_STDOUT_CLASS, loop, 299 output = efl_add(EFL_IO_STDOUT_CLASS, loop,
300 efl_name_set(efl_self, "stdout")); 300 efl_name_set(efl_added, "stdout"));
301 } 301 }
302 else 302 else
303 { 303 {
304 output = efl_add(EFL_IO_FILE_CLASS, loop, 304 output = efl_add(EFL_IO_FILE_CLASS, loop,
305 efl_name_set(efl_self, "output"), 305 efl_name_set(efl_added, "output"),
306 efl_file_set(efl_self, output_fname, NULL), 306 efl_file_set(efl_added, output_fname, NULL),
307 efl_io_file_mode_set(efl_self, 0644), 307 efl_io_file_mode_set(efl_added, 0644),
308 efl_io_file_flags_set(efl_self, O_WRONLY | O_CLOEXEC | O_TRUNC | O_CREAT)); 308 efl_io_file_flags_set(efl_added, O_WRONLY | O_CLOEXEC | O_TRUNC | O_CREAT));
309 } 309 }
310 310
311 primary_mode = _parse_primary_mode(primary_mode_str); 311 primary_mode = _parse_primary_mode(primary_mode_str);
@@ -316,16 +316,16 @@ main(int argc, char **argv)
316 cookie_jar = ""; 316 cookie_jar = "";
317 317
318 dialer = efl_add(EFL_NET_DIALER_HTTP_CLASS, loop, 318 dialer = efl_add(EFL_NET_DIALER_HTTP_CLASS, loop,
319 efl_name_set(efl_self, "dialer"), 319 efl_name_set(efl_added, "dialer"),
320 efl_net_dialer_http_method_set(efl_self, method), 320 efl_net_dialer_http_method_set(efl_added, method),
321 efl_net_dialer_http_primary_mode_set(efl_self, primary_mode), 321 efl_net_dialer_http_primary_mode_set(efl_added, primary_mode),
322 efl_net_dialer_http_version_set(efl_self, http_version), 322 efl_net_dialer_http_version_set(efl_added, http_version),
323 efl_net_dialer_http_authentication_set(efl_self, username, password, authentication_method, authentication_restricted), 323 efl_net_dialer_http_authentication_set(efl_added, username, password, authentication_method, authentication_restricted),
324 efl_net_dialer_http_allow_redirects_set(efl_self, allow_redirects), 324 efl_net_dialer_http_allow_redirects_set(efl_added, allow_redirects),
325 efl_net_dialer_http_cookie_jar_set(efl_self, cookie_jar), 325 efl_net_dialer_http_cookie_jar_set(efl_added, cookie_jar),
326 efl_net_dialer_proxy_set(efl_self, proxy), 326 efl_net_dialer_proxy_set(efl_added, proxy),
327 efl_net_dialer_timeout_dial_set(efl_self, timeout_dial), 327 efl_net_dialer_timeout_dial_set(efl_added, timeout_dial),
328 efl_event_callback_array_add(efl_self, dialer_cbs(), NULL)); 328 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL));
329 329
330 EINA_LIST_FREE(headers, str) 330 EINA_LIST_FREE(headers, str)
331 { 331 {
@@ -346,20 +346,20 @@ main(int argc, char **argv)
346 waiting++; 346 waiting++;
347 347
348 sender = efl_add(EFL_IO_COPIER_CLASS, loop, 348 sender = efl_add(EFL_IO_COPIER_CLASS, loop,
349 efl_name_set(efl_self, "sender"), 349 efl_name_set(efl_added, "sender"),
350 efl_io_copier_source_set(efl_self, input), 350 efl_io_copier_source_set(efl_added, input),
351 efl_io_copier_destination_set(efl_self, dialer), 351 efl_io_copier_destination_set(efl_added, dialer),
352 efl_event_callback_array_add(efl_self, copier_cbs(), NULL)); 352 efl_event_callback_array_add(efl_added, copier_cbs(), NULL));
353 353
354 fprintf(stderr, "INFO: sending %s->%s\n", 354 fprintf(stderr, "INFO: sending %s->%s\n",
355 efl_name_get(input), 355 efl_name_get(input),
356 efl_name_get(dialer)); 356 efl_name_get(dialer));
357 357
358 receiver = efl_add(EFL_IO_COPIER_CLASS, loop, 358 receiver = efl_add(EFL_IO_COPIER_CLASS, loop,
359 efl_name_set(efl_self, "receiver"), 359 efl_name_set(efl_added, "receiver"),
360 efl_io_copier_source_set(efl_self, dialer), 360 efl_io_copier_source_set(efl_added, dialer),
361 efl_io_copier_destination_set(efl_self, output), 361 efl_io_copier_destination_set(efl_added, output),
362 efl_event_callback_array_add(efl_self, copier_cbs(), NULL)); 362 efl_event_callback_array_add(efl_added, copier_cbs(), NULL));
363 fprintf(stderr, "INFO: receiving %s->%s\n", 363 fprintf(stderr, "INFO: receiving %s->%s\n",
364 efl_name_get(dialer), 364 efl_name_get(dialer),
365 efl_name_get(output)); 365 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 92595b7..da68ebe 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)
262 Eo *dialer; 262 Eo *dialer;
263 263
264 dialer = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, ecore_main_loop_get(), 264 dialer = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, ecore_main_loop_get(),
265 efl_name_set(efl_self, name), 265 efl_name_set(efl_added, name),
266 efl_event_callback_array_add(efl_self, dialer_cbs(), NULL)); 266 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL));
267 if (!dialer) 267 if (!dialer)
268 { 268 {
269 retval = EXIT_FAILURE; 269 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 fa7bb2b..10a2bad 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)
302 cookie_jar = ""; 302 cookie_jar = "";
303 303
304 dialer = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, loop, 304 dialer = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, loop,
305 efl_name_set(efl_self, "dialer"), 305 efl_name_set(efl_added, "dialer"),
306 efl_net_dialer_websocket_authentication_set(efl_self, username, password, authentication_method, authentication_restricted), 306 efl_net_dialer_websocket_authentication_set(efl_added, username, password, authentication_method, authentication_restricted),
307 efl_net_dialer_websocket_allow_redirects_set(efl_self, allow_redirects), 307 efl_net_dialer_websocket_allow_redirects_set(efl_added, allow_redirects),
308 efl_net_dialer_websocket_cookie_jar_set(efl_self, cookie_jar), 308 efl_net_dialer_websocket_cookie_jar_set(efl_added, cookie_jar),
309 efl_net_dialer_proxy_set(efl_self, proxy), 309 efl_net_dialer_proxy_set(efl_added, proxy),
310 efl_net_dialer_timeout_dial_set(efl_self, timeout_dial), 310 efl_net_dialer_timeout_dial_set(efl_added, timeout_dial),
311 efl_event_callback_array_add(efl_self, dialer_cbs(), NULL)); 311 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL));
312 if (!dialer) 312 if (!dialer)
313 { 313 {
314 retval = EXIT_FAILURE; 314 retval = EXIT_FAILURE;
diff --git a/src/examples/ecore/efl_net_server_example.c b/src/examples/ecore/efl_net_server_example.c
index ac59e56..620a94e 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)
303 * source and destination. 303 * source and destination.
304 */ 304 */
305 Eo *echo_copier = efl_add(EFL_IO_COPIER_CLASS, efl_parent_get(client), 305 Eo *echo_copier = efl_add(EFL_IO_COPIER_CLASS, efl_parent_get(client),
306 efl_io_copier_source_set(efl_self, client), 306 efl_io_copier_source_set(efl_added, client),
307 efl_io_copier_destination_set(efl_self, client), 307 efl_io_copier_destination_set(efl_added, client),
308 efl_event_callback_array_add(efl_self, echo_copier_cbs(), client) 308 efl_event_callback_array_add(efl_added, echo_copier_cbs(), client)
309 ); 309 );
310 310
311 fprintf(stderr, "INFO: using an echo copier=%p for client %s\n", 311 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)
344 344
345 /* an input copier that takes data from send_buffer and pushes to client */ 345 /* an input copier that takes data from send_buffer and pushes to client */
346 d->send_copier = efl_add(EFL_IO_COPIER_CLASS, efl_parent_get(client), 346 d->send_copier = efl_add(EFL_IO_COPIER_CLASS, efl_parent_get(client),
347 efl_io_copier_source_set(efl_self, send_buffer), 347 efl_io_copier_source_set(efl_added, send_buffer),
348 efl_io_copier_destination_set(efl_self, client), 348 efl_io_copier_destination_set(efl_added, client),
349 efl_event_callback_array_add(efl_self, send_copier_cbs(), d) 349 efl_event_callback_array_add(efl_added, send_copier_cbs(), d)
350 ); 350 );
351 351
352 fprintf(stderr, "INFO: using sender buffer %p with copier %p for client %s\n", 352 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)
359 359
360 /* an output copier that takes data from socket and pushes to recv_buffer. */ 360 /* an output copier that takes data from socket and pushes to recv_buffer. */
361 d->recv_copier = efl_add(EFL_IO_COPIER_CLASS, efl_parent_get(client), 361 d->recv_copier = efl_add(EFL_IO_COPIER_CLASS, efl_parent_get(client),
362 efl_io_copier_source_set(efl_self, client), 362 efl_io_copier_source_set(efl_added, client),
363 efl_io_copier_destination_set(efl_self, recv_buffer), 363 efl_io_copier_destination_set(efl_added, recv_buffer),
364 efl_event_callback_array_add(efl_self, recv_copier_cbs(), d) 364 efl_event_callback_array_add(efl_added, recv_copier_cbs(), d)
365 ); 365 );
366 366
367 fprintf(stderr, "INFO: using receiver buffer %p with copier %p for client %s\n", 367 fprintf(stderr, "INFO: using receiver buffer %p with copier %p for client %s\n",
@@ -503,13 +503,13 @@ main(int argc, char **argv)
503 } 503 }
504 504
505 server = efl_add(cls, ecore_main_loop_get(), /* it's mandatory to use a main loop provider as the server parent */ 505 server = efl_add(cls, ecore_main_loop_get(), /* it's mandatory to use a main loop provider as the server parent */
506 efl_net_server_fd_close_on_exec_set(efl_self, EINA_TRUE), /* recommended */ 506 efl_net_server_fd_close_on_exec_set(efl_added, EINA_TRUE), /* recommended */
507 efl_net_server_fd_reuse_address_set(efl_self, EINA_TRUE), /* optional, but nice for testing */ 507 efl_net_server_fd_reuse_address_set(efl_added, EINA_TRUE), /* optional, but nice for testing */
508 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 */ 508 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 */
509 efl_net_server_clients_limit_set(efl_self, 509 efl_net_server_clients_limit_set(efl_added,
510 clients_limit, 510 clients_limit,
511 clients_reject_excess), /* optional */ 511 clients_reject_excess), /* optional */
512 efl_event_callback_array_add(efl_self, server_cbs(), NULL)); /* mandatory to have "client,add" in order to be useful */ 512 efl_event_callback_array_add(efl_added, server_cbs(), NULL)); /* mandatory to have "client,add" in order to be useful */
513 if (!server) 513 if (!server)
514 { 514 {
515 fprintf(stderr, "ERROR: could not create class %p (%s)\n", 515 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 5edbcc8..034fde6 100644
--- a/src/examples/eldbus/dbusmodel.c
+++ b/src/examples/eldbus/dbusmodel.c
@@ -134,7 +134,7 @@ main(int argc, char **argv EINA_UNUSED)
134 if (argc > 1) bus = argv[1]; 134 if (argc > 1) bus = argv[1];
135 if (argc > 2) path = argv[2]; 135 if (argc > 2) path = argv[2];
136 136
137 root = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, bus, path)); 137 root = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, bus, path));
138 138
139 Eina_Promise *promises[] = { NULL, NULL, NULL}; 139 Eina_Promise *promises[] = { NULL, NULL, NULL};
140 promises[0] = efl_model_children_slice_get(root, 0, 0); 140 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 040b125..6814db2 100644
--- a/src/examples/elementary/evas3d_map_example.c
+++ b/src/examples/elementary/evas3d_map_example.c
@@ -881,7 +881,7 @@ skybox_setup(void)
881 evas_canvas3d_material_color_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0); 881 evas_canvas3d_material_color_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0);
882 evas_canvas3d_material_shininess_set(skybox_material, 50.0); 882 evas_canvas3d_material_shininess_set(skybox_material, 50.0);
883 883
884 skybox_mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 884 skybox_mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
885 evas_canvas3d_node_member_add(root_node, skybox_mesh_node); 885 evas_canvas3d_node_member_add(root_node, skybox_mesh_node);
886 evas_canvas3d_node_mesh_add(skybox_mesh_node, skybox_mesh); 886 evas_canvas3d_node_mesh_add(skybox_mesh_node, skybox_mesh);
887 evas_canvas3d_mesh_shader_mode_set(skybox_mesh, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE); 887 evas_canvas3d_mesh_shader_mode_set(skybox_mesh, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
@@ -940,7 +940,7 @@ camera_setup(void)
940 camera_right_vec.y = 0.0; 940 camera_right_vec.y = 0.0;
941 camera_right_vec.z = 0.0; 941 camera_right_vec.z = 0.0;
942 942
943 camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 943 camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
944 evas_canvas3d_node_camera_set(camera_node, camera); 944 evas_canvas3d_node_camera_set(camera_node, camera);
945 evas_canvas3d_node_position_set(camera_node, camera_pos.x, camera_pos.y, camera_pos.z); 945 evas_canvas3d_node_position_set(camera_node, camera_pos.x, camera_pos.y, camera_pos.z);
946 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); 946 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)
955 evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0); 955 evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0);
956 evas_canvas3d_light_specular_set(light, 0.2, 0.2, 0.2, 1.0); 956 evas_canvas3d_light_specular_set(light, 0.2, 0.2, 0.2, 1.0);
957 957
958 light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 958 light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
959 evas_canvas3d_node_light_set(light_node, light); 959 evas_canvas3d_node_light_set(light_node, light);
960 evas_canvas3d_node_position_set(light_node, 0.0, 0.0, MAX_CAMERA_DISTANCE); 960 evas_canvas3d_node_position_set(light_node, 0.0, 0.0, MAX_CAMERA_DISTANCE);
961 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); 961 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)
1001 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0); 1001 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0);
1002 evas_canvas3d_material_shininess_set(material, 50.0); 1002 evas_canvas3d_material_shininess_set(material, 50.0);
1003 1003
1004 mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 1004 mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
1005 evas_canvas3d_node_member_add(root_node, mesh_node); 1005 evas_canvas3d_node_member_add(root_node, mesh_node);
1006 evas_canvas3d_node_mesh_add(mesh_node, mesh); 1006 evas_canvas3d_node_mesh_add(mesh_node, mesh);
1007 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP); 1007 evas_canvas3d_mesh_shader_mode_set(mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
@@ -1169,7 +1169,7 @@ elm_main(int argc, char **argv)
1169 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 1169 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
1170 1170
1171 /* Add a root node for the scene. */ 1171 /* Add a root node for the scene. */
1172 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 1172 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
1173 1173
1174 skybox_setup(); 1174 skybox_setup();
1175 texture_source_setup(); 1175 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 f8ffceb..19e223a 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)
164 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0); 164 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0);
165 165
166 data->camera_node = 166 data->camera_node =
167 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 167 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
168 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 168 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
169 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 15.0); 169 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 15.0);
170 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); 170 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)
180 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 180 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
181 181
182 data->light_node = 182 data->light_node =
183 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 183 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
184 evas_canvas3d_node_light_set(data->light_node, data->light); 184 evas_canvas3d_node_light_set(data->light_node, data->light);
185 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 185 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
186 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); 186 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)
220 evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE); 220 evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE);
221 221
222 data->mesh_node = 222 data->mesh_node =
223 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 223 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
224 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 224 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
225 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 225 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
226} 226}
@@ -233,7 +233,7 @@ _scene_setup(Scene_Data *data)
233 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); 233 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
234 234
235 data->root_node = 235 data->root_node =
236 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 236 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
237 237
238 _camera_setup(data); 238 _camera_setup(data);
239 _light_setup(data); 239 _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 e4ce308..a70cf4a 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)
125 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); 125 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
126 126
127 data->camera_node = 127 data->camera_node =
128 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 128 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
129 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 129 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
130 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); 130 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
131 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 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)
141 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 141 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
142 142
143 data->light_node = 143 data->light_node =
144 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 144 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
145 evas_canvas3d_node_light_set(data->light_node, data->light); 145 evas_canvas3d_node_light_set(data->light_node, data->light);
146 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 146 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
147 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); 147 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)
175 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); 175 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
176 176
177 data->mesh_node = 177 data->mesh_node =
178 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 178 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
179 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 179 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
180 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 180 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
181} 181}
@@ -188,7 +188,7 @@ _scene_setup(Scene_Data *data)
188 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); 188 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
189 189
190 data->root_node = 190 data->root_node =
191 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 191 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
192 192
193 _camera_setup(data); 193 _camera_setup(data);
194 _light_setup(data); 194 _light_setup(data);
diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c
index 22fc5e3..4441df2 100644
--- a/src/examples/elementary/filemvc.c
+++ b/src/examples/elementary/filemvc.c
@@ -65,7 +65,7 @@ _promise_then(void *data, void *value)
65 Eo *model; 65 Eo *model;
66 66
67 eina_value_get(value, &path); 67 eina_value_get(value, &path);
68 model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path)); 68 model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, path));
69 elm_view_list_model_set(priv->fileview, model); 69 elm_view_list_model_set(priv->fileview, model);
70} 70}
71 71
@@ -144,12 +144,12 @@ elm_main(int argc, char **argv)
144 else dirname = EFL_MODEL_TEST_FILENAME_PATH; 144 else dirname = EFL_MODEL_TEST_FILENAME_PATH;
145 145
146 //treemodel 146 //treemodel
147 priv.treemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, dirname)); 147 priv.treemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, dirname));
148 eio_model_children_filter_set(priv.treemodel, _filter_cb, NULL); 148 eio_model_children_filter_set(priv.treemodel, _filter_cb, NULL);
149 149
150 //treeview 150 //treeview
151 genlist = elm_genlist_add(win); 151 genlist = elm_genlist_add(win);
152 priv.treeview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_self, genlist, ELM_GENLIST_ITEM_TREE, NULL)); 152 priv.treeview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_TREE, NULL));
153 elm_view_list_property_connect(priv.treeview, "filename", "elm.text"); 153 elm_view_list_property_connect(priv.treeview, "filename", "elm.text");
154 elm_view_list_property_connect(priv.treeview, "icon", "elm.swallow.icon"); 154 elm_view_list_property_connect(priv.treeview, "icon", "elm.swallow.icon");
155 elm_view_list_model_set(priv.treeview, priv.treemodel); 155 elm_view_list_model_set(priv.treeview, priv.treemodel);
@@ -164,7 +164,7 @@ elm_main(int argc, char **argv)
164 164
165 //listview 165 //listview
166 genlist = elm_genlist_add(win); 166 genlist = elm_genlist_add(win);
167 priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_self, genlist, ELM_GENLIST_ITEM_NONE, "double_label")); 167 priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_NONE, "double_label"));
168 elm_view_list_property_connect(priv.fileview, "filename", "elm.text"); 168 elm_view_list_property_connect(priv.fileview, "filename", "elm.text");
169 elm_view_list_property_connect(priv.fileview, "mime_type", "elm.text.sub"); 169 elm_view_list_property_connect(priv.fileview, "mime_type", "elm.text.sub");
170 170
diff --git a/src/examples/elementary/fileviewlist.c b/src/examples/elementary/fileviewlist.c
index a4613ef..96f4955 100644
--- a/src/examples/elementary/fileviewlist.c
+++ b/src/examples/elementary/fileviewlist.c
@@ -54,8 +54,8 @@ elm_main(int argc, char **argv)
54 evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 54 evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
55 evas_object_show(genlist); 55 evas_object_show(genlist);
56 56
57 priv.filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, dirname)); 57 priv.filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, dirname));
58 priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_self, genlist, ELM_GENLIST_ITEM_TREE, "double_label")); 58 priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_TREE, "double_label"));
59 elm_view_list_model_set(priv.fileview, priv.filemodel); 59 elm_view_list_model_set(priv.fileview, priv.filemodel);
60 evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, &priv); 60 evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, &priv);
61 61
diff --git a/src/examples/elementary/performance/graphical.c b/src/examples/elementary/performance/graphical.c
index 70a40cd..3aa7e4e 100644
--- a/src/examples/elementary/performance/graphical.c
+++ b/src/examples/elementary/performance/graphical.c
@@ -272,7 +272,7 @@ void _init_bounding()
272 evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh_box, 0, globalGraphical.material_box); 272 evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh_box, 0, globalGraphical.material_box);
273 273
274 globalGraphical.mesh_nodebox = 274 globalGraphical.mesh_nodebox =
275 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)); 275 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));
276 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_nodebox); 276 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_nodebox);
277 evas_canvas3d_node_mesh_add(globalGraphical.mesh_nodebox, globalGraphical.mesh_box); 277 evas_canvas3d_node_mesh_add(globalGraphical.mesh_nodebox, globalGraphical.mesh_box);
278} 278}
@@ -359,7 +359,7 @@ _change_scene_setup()
359 for (i = 0; i < quantity; i++) 359 for (i = 0; i < quantity; i++)
360 { 360 {
361 globalGraphical.mesh_node = 361 globalGraphical.mesh_node =
362 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)); 362 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));
363 if (globalGraphical.model_path) 363 if (globalGraphical.model_path)
364 evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2); 364 evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2);
365 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node); 365 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node);
@@ -397,14 +397,14 @@ _init_scene(Evas_Object *img)
397 globalGraphical.scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, globalGraphical.evas); 397 globalGraphical.scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, globalGraphical.evas);
398 398
399 /* Add the root node for the scene. */ 399 /* Add the root node for the scene. */
400 globalGraphical.root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 400 globalGraphical.root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
401 401
402 /* Add the camera. */ 402 /* Add the camera. */
403 globalGraphical.camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, globalGraphical.evas); 403 globalGraphical.camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, globalGraphical.evas);
404 evas_canvas3d_camera_projection_perspective_set(globalGraphical.camera, globalGraphical.angle, 1.0, 2.0, 1000.0); 404 evas_canvas3d_camera_projection_perspective_set(globalGraphical.camera, globalGraphical.angle, 1.0, 2.0, 1000.0);
405 405
406 globalGraphical.camera_node = 406 globalGraphical.camera_node =
407 efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 407 efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
408 evas_canvas3d_node_camera_set(globalGraphical.camera_node, globalGraphical.camera); 408 evas_canvas3d_node_camera_set(globalGraphical.camera_node, globalGraphical.camera);
409 evas_canvas3d_node_position_set(globalGraphical.camera_node, 0.0, 0.0, 25.0); 409 evas_canvas3d_node_position_set(globalGraphical.camera_node, 0.0, 0.0, 25.0);
410 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); 410 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)
418 evas_canvas3d_light_spot_cutoff_set(globalGraphical.light, globalGraphical.angle / 15); 418 evas_canvas3d_light_spot_cutoff_set(globalGraphical.light, globalGraphical.angle / 15);
419 419
420 globalGraphical.light_node = 420 globalGraphical.light_node =
421 efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 421 efl_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
422 evas_canvas3d_node_light_set(globalGraphical.light_node, globalGraphical.light); 422 evas_canvas3d_node_light_set(globalGraphical.light_node, globalGraphical.light);
423 evas_canvas3d_node_position_set(globalGraphical.light_node, 0.0, 100.0, 1.0); 423 evas_canvas3d_node_position_set(globalGraphical.light_node, 0.0, 100.0, 1.0);
424 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); 424 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)
474 for (i = 0; i < quantity; i++) 474 for (i = 0; i < quantity; i++)
475 { 475 {
476 globalGraphical.mesh_node = 476 globalGraphical.mesh_node =
477 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)); 477 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));
478 if (globalGraphical.model_path) 478 if (globalGraphical.model_path)
479 evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2); 479 evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2);
480 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node); 480 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 9c7f55d..7127919 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)
437 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 437 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
438 evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 1.0, 1000.0); 438 evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 1.0, 1000.0);
439 439
440 data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 440 data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
441 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 441 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
442 evas_canvas3d_node_position_set(data->camera_node, 0.0, 40, 70); 442 evas_canvas3d_node_position_set(data->camera_node, 0.0, 40, 70);
443 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); 443 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)
465 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 465 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
466 evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 1000.0); 466 evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 1000.0);
467 467
468 data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 468 data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
469 evas_canvas3d_node_light_set(data->light_node, data->light); 469 evas_canvas3d_node_light_set(data->light_node, data->light);
470 evas_canvas3d_node_position_set(data->light_node, 0.1, 25.0, 0.1); 470 evas_canvas3d_node_position_set(data->light_node, 0.1, 25.0, 0.1);
471 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); 471 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
507 507
508 mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); 508 mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
509 material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 509 material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
510 node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 510 node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
511 511
512 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); 512 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
513 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); 513 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)
555 Eo *node = NULL; 555 Eo *node = NULL;
556 556
557 alpha = d_alpha * i * M_PI / 180; 557 alpha = d_alpha * i * M_PI / 180;
558 node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 558 node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
559 559
560 evas_canvas3d_node_mesh_add(node, data->mesh_cube); 560 evas_canvas3d_node_mesh_add(node, data->mesh_cube);
561 evas_canvas3d_node_position_set(node, r * sin(alpha), 2.0 + (r / 4 * sin(alpha)), r * cos(alpha)); 561 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)
574 574
575 data->mesh_ball = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas); 575 data->mesh_ball = efl_add(EVAS_CANVAS3D_MESH_CLASS, evas);
576 data->material_ball = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 576 data->material_ball = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
577 data->mesh_node_ball = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 577 data->mesh_node_ball = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
578 578
579 /* Setup material for ball. */ 579 /* Setup material for ball. */
580 evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); 580 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)
611 data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 611 data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
612 612
613 /* Add the root node for the scene. */ 613 /* Add the root node for the scene. */
614 data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 614 data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
615 615
616 evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); 616 evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
617 evas_canvas3d_scene_shadows_enable_set(data->scene, EINA_TRUE); 617 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 6399b1e..bc97434 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -144,13 +144,13 @@ main(void)
144 144
145 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 145 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
146 146
147 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 147 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
148 148
149 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 149 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
150 evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0); 150 evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0);
151 151
152 camera_node = 152 camera_node =
153 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 153 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
154 evas_canvas3d_node_camera_set(camera_node, camera); 154 evas_canvas3d_node_camera_set(camera_node, camera);
155 evas_canvas3d_node_member_add(root_node, camera_node); 155 evas_canvas3d_node_member_add(root_node, camera_node);
156 evas_canvas3d_node_position_set(camera_node, 100.0, 50.0, 20.0); 156 evas_canvas3d_node_position_set(camera_node, 100.0, 50.0, 20.0);
@@ -162,7 +162,7 @@ main(void)
162 evas_canvas3d_light_directional_set(light, EINA_TRUE); 162 evas_canvas3d_light_directional_set(light, EINA_TRUE);
163 163
164 light_node = 164 light_node =
165 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 165 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
166 evas_canvas3d_node_light_set(light_node, light); 166 evas_canvas3d_node_light_set(light_node, light);
167 evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0); 167 evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0);
168 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); 168 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)
189 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); 189 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
190 evas_canvas3d_material_shininess_set(material, 50.0); 190 evas_canvas3d_material_shininess_set(material, 50.0);
191 191
192 mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 192 mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
193 mesh_box_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 193 mesh_box_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
194 194
195 material_box = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 195 material_box = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
196 evas_canvas3d_material_enable_set(material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); 196 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 8e41cf1..ab9ea9c 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)
153 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); 153 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
154 154
155 data->camera_node = 155 data->camera_node =
156 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 156 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
157 157
158 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 158 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
159 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); 159 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
@@ -171,7 +171,7 @@ _light_setup(Scene_Data *data)
171 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 171 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
172 172
173 data->light_node = 173 data->light_node =
174 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 174 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
175 evas_canvas3d_node_light_set(data->light_node, data->light); 175 evas_canvas3d_node_light_set(data->light_node, data->light);
176 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 176 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
177 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); 177 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)
220 _set_ball(data->mesh1, data->sphere, data->material1); 220 _set_ball(data->mesh1, data->sphere, data->material1);
221 221
222 data->mesh_node = 222 data->mesh_node =
223 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 223 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
224 224
225 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 225 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
226 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 226 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
227 227
228 data->mesh_node1 = 228 data->mesh_node1 =
229 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 229 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
230 230
231 evas_canvas3d_node_member_add(data->root_node, data->mesh_node1); 231 evas_canvas3d_node_member_add(data->root_node, data->mesh_node1);
232 evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1); 232 evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1);
@@ -248,7 +248,7 @@ _scene_setup(Scene_Data *data)
248 evas_canvas3d_scene_background_color_set(data->scene, 0.5, 0.5, 0.5, 1); 248 evas_canvas3d_scene_background_color_set(data->scene, 0.5, 0.5, 0.5, 1);
249 249
250 data->root_node = 250 data->root_node =
251 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 251 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
252 252
253 _camera_setup(data); 253 _camera_setup(data);
254 _light_setup(data); 254 _light_setup(data);
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index bbfcddd..71a4fca 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)
274 274
275 globalscene.scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 275 globalscene.scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
276 276
277 globalscene.root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 277 globalscene.root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
278 278
279 globalscene.camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 279 globalscene.camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
280 evas_canvas3d_camera_projection_perspective_set(globalscene.camera, 30.0, 1.0, 1.0, 1000.0); 280 evas_canvas3d_camera_projection_perspective_set(globalscene.camera, 30.0, 1.0, 1.0, 1000.0);
281 281
282 globalscene.camera_node = 282 globalscene.camera_node =
283 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 283 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
284 evas_canvas3d_node_camera_set(globalscene.camera_node, globalscene.camera); 284 evas_canvas3d_node_camera_set(globalscene.camera_node, globalscene.camera);
285 evas_canvas3d_node_member_add(globalscene.root_node, globalscene.camera_node); 285 evas_canvas3d_node_member_add(globalscene.root_node, globalscene.camera_node);
286 evas_canvas3d_node_position_set(globalscene.camera_node, 0.0, 30.0, 800.0); 286 evas_canvas3d_node_position_set(globalscene.camera_node, 0.0, 30.0, 800.0);
@@ -292,7 +292,7 @@ _init_scene(const char *texture)
292 evas_canvas3d_light_directional_set(globalscene.light, EINA_TRUE); 292 evas_canvas3d_light_directional_set(globalscene.light, EINA_TRUE);
293 293
294 globalscene.light_node = 294 globalscene.light_node =
295 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 295 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
296 evas_canvas3d_node_light_set(globalscene.light_node, globalscene.light); 296 evas_canvas3d_node_light_set(globalscene.light_node, globalscene.light);
297 evas_canvas3d_node_position_set(globalscene.light_node, 100.0, 50.0, 300.0); 297 evas_canvas3d_node_position_set(globalscene.light_node, 100.0, 50.0, 300.0);
298 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); 298 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)
313 m->material = spheretmp->material; 313 m->material = spheretmp->material;
314 m->texture = spheretmp->texture; 314 m->texture = spheretmp->texture;
315 } 315 }
316 m->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 316 m->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
317 m->speed = tmp; 317 m->speed = tmp;
318 m->sphere_animate = _animate_sphere; 318 m->sphere_animate = _animate_sphere;
319 m->animate = ecore_timer_add(m->speed, m->sphere_animate, m); 319 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 24dc10a..c7da14a 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)
155 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 155 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
156 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0); 156 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0);
157 157
158 data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 158 data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
159 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 159 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
160 evas_canvas3d_node_position_set(data->camera_node, 3.0, 3.0, 10.0); 160 evas_canvas3d_node_position_set(data->camera_node, 3.0, 3.0, 10.0);
161 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); 161 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)
172 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); 172 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
173 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 173 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
174 174
175 data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 175 data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
176 176
177 evas_canvas3d_node_light_set(data->light_node, data->light); 177 evas_canvas3d_node_light_set(data->light_node, data->light);
178 evas_canvas3d_node_position_set(data->light_node, 5.0, 5.0, 10.0); 178 evas_canvas3d_node_position_set(data->light_node, 5.0, 5.0, 10.0);
@@ -205,7 +205,7 @@ _mesh_setup(Scene_Data *data)
205 evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG); 205 evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
206 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); 206 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
207 207
208 data->mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 208 data->mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
209 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 209 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
210 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 210 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
211} 211}
@@ -214,7 +214,7 @@ static void
214_scene_setup(Scene_Data *data) 214_scene_setup(Scene_Data *data)
215{ 215{
216 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 216 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
217 data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 217 data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
218 218
219 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); 219 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
220 evas_canvas3d_scene_background_color_set(scene, 0.0, 0.0, 0.0, 0.0); 220 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 6c9b0d2..a223a72 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)
142 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); 142 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
143 143
144 data->camera_node = 144 data->camera_node =
145 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 145 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
146 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 146 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
147 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); 147 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
148 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); 148 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)
158 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 158 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
159 159
160 data->light_node = 160 data->light_node =
161 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 161 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
162 evas_canvas3d_node_light_set(data->light_node, data->light); 162 evas_canvas3d_node_light_set(data->light_node, data->light);
163 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 163 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
164 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); 164 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)
192 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); 192 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
193 193
194 data->mesh_node = 194 data->mesh_node =
195 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 195 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
196 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 196 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
197 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 197 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
198} 198}
@@ -205,7 +205,7 @@ _scene_setup(Scene_Data *data)
205 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); 205 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
206 206
207 data->root_node = 207 data->root_node =
208 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 208 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
209 209
210 _camera_setup(data); 210 _camera_setup(data);
211 _light_setup(data); 211 _light_setup(data);
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index 7f6dbb5..b8609f2 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)
115 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); 115 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
116 116
117 data->camera_node = 117 data->camera_node =
118 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 118 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
119 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 119 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
120 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 3.0); 120 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 3.0);
121 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); 121 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)
131 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 131 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
132 132
133 data->light_node = 133 data->light_node =
134 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 134 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
135 evas_canvas3d_node_light_set(data->light_node, data->light); 135 evas_canvas3d_node_light_set(data->light_node, data->light);
136 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 136 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
137 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); 137 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)
188 evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP); 188 evas_canvas3d_mesh_shader_mode_set(data->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
189 189
190 data->mesh_node = 190 data->mesh_node =
191 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 191 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
192 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 192 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
193 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 193 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
194} 194}
@@ -201,7 +201,7 @@ _scene_setup(Scene_Data *data)
201 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); 201 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
202 202
203 data->root_node = 203 data->root_node =
204 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 204 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
205 205
206 _camera_setup(data); 206 _camera_setup(data);
207 _light_setup(data); 207 _light_setup(data);
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index aa883f4..5393838 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -118,13 +118,13 @@ main(void)
118 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 118 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
119 119
120 /* Add the root node for the scene. */ 120 /* Add the root node for the scene. */
121 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 121 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
122 122
123 /* Add the camera. */ 123 /* Add the camera. */
124 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 124 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
125 evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0); 125 evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0);
126 126
127 camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 127 camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
128 evas_canvas3d_node_camera_set(camera_node, camera); 128 evas_canvas3d_node_camera_set(camera_node, camera);
129 evas_canvas3d_node_member_add(root_node, camera_node); 129 evas_canvas3d_node_member_add(root_node, camera_node);
130 evas_canvas3d_node_position_set(camera_node, 200.0, 0.0, 40.0); 130 evas_canvas3d_node_position_set(camera_node, 200.0, 0.0, 40.0);
@@ -136,7 +136,7 @@ main(void)
136 evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0); 136 evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0);
137 evas_canvas3d_light_directional_set(light, EINA_TRUE); 137 evas_canvas3d_light_directional_set(light, EINA_TRUE);
138 138
139 light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 139 light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
140 evas_canvas3d_node_light_set(light_node, light); 140 evas_canvas3d_node_light_set(light_node, light);
141 evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0); 141 evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0);
142 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 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)
169 efl_file_set(mesh2, output_model_path, NULL); 169 efl_file_set(mesh2, output_model_path, NULL);
170 evas_canvas3d_mesh_shader_mode_set(mesh2, EVAS_CANVAS3D_SHADER_MODE_PHONG); 170 evas_canvas3d_mesh_shader_mode_set(mesh2, EVAS_CANVAS3D_SHADER_MODE_PHONG);
171 171
172 mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 172 mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
173 173
174 evas_canvas3d_node_member_add(root_node, mesh_node); 174 evas_canvas3d_node_member_add(root_node, mesh_node);
175 evas_canvas3d_node_mesh_add(mesh_node, mesh); 175 evas_canvas3d_node_mesh_add(mesh_node, mesh);
176 evas_canvas3d_node_position_set(mesh_node, 0.0, -40.0, 0.0); 176 evas_canvas3d_node_position_set(mesh_node, 0.0, -40.0, 0.0);
177 177
178 mesh_node2 = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 178 mesh_node2 = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
179 evas_canvas3d_node_member_add(root_node, mesh_node2); 179 evas_canvas3d_node_member_add(root_node, mesh_node2);
180 evas_canvas3d_node_mesh_add(mesh_node2, mesh2); 180 evas_canvas3d_node_mesh_add(mesh_node2, mesh2);
181 evas_canvas3d_node_position_set(mesh_node2, 0.0, 40.0, 0.0); 181 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 a29521a..25fbc66 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)
88 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); 88 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
89 89
90 data->camera_node = 90 data->camera_node =
91 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 91 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
92 92
93 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 93 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
94 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 7.0); 94 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 7.0);
@@ -106,7 +106,7 @@ _light_setup(Scene_Data *data)
106 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 106 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
107 107
108 data->light_node = 108 data->light_node =
109 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 109 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
110 evas_canvas3d_node_light_set(data->light_node, data->light); 110 evas_canvas3d_node_light_set(data->light_node, data->light);
111 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 111 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
112 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); 112 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)
146 _set_ball(data->mesh1, data->sphere, data->material); 146 _set_ball(data->mesh1, data->sphere, data->material);
147 147
148 data->animation_node = 148 data->animation_node =
149 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 149 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
150 150
151 data->mesh_node = 151 data->mesh_node =
152 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 152 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
153 153
154 evas_canvas3d_node_member_add(data->animation_node, data->mesh_node); 154 evas_canvas3d_node_member_add(data->animation_node, data->mesh_node);
155 evas_canvas3d_node_member_add(data->root_node, data->animation_node); 155 evas_canvas3d_node_member_add(data->root_node, data->animation_node);
@@ -157,7 +157,7 @@ _mesh_setup(Scene_Data *data)
157 evas_canvas3d_node_position_set(data->mesh_node, 0.0, 0.0, 3.0); 157 evas_canvas3d_node_position_set(data->mesh_node, 0.0, 0.0, 3.0);
158 158
159 data->mesh_node1 = 159 data->mesh_node1 =
160 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 160 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
161 161
162 evas_canvas3d_node_member_add(data->root_node, data->mesh_node1); 162 evas_canvas3d_node_member_add(data->root_node, data->mesh_node1);
163 evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1); 163 evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1);
@@ -178,7 +178,7 @@ _scene_setup(Scene_Data *data)
178 evas_canvas3d_scene_background_color_set(data->scene, FOG_COLOR, 1); 178 evas_canvas3d_scene_background_color_set(data->scene, FOG_COLOR, 1);
179 179
180 data->root_node = 180 data->root_node =
181 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 181 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
182 182
183 _camera_setup(data); 183 _camera_setup(data);
184 _light_setup(data); 184 _light_setup(data);
diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c
index a7d2c2e..a107cd1 100644
--- a/src/examples/evas/evas-3d-frustum.c
+++ b/src/examples/evas/evas-3d-frustum.c
@@ -280,7 +280,7 @@ static void
280_camera_setup(Scene_Data *data) 280_camera_setup(Scene_Data *data)
281{ 281{
282 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 282 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
283 data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 283 data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
284 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 284 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
285 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 300.0); 285 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 300.0);
286 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); 286 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)
298 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); 298 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
299 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 299 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
300 300
301 data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 301 data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
302 evas_canvas3d_node_light_set(data->light_node, data->light); 302 evas_canvas3d_node_light_set(data->light_node, data->light);
303 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 200.0); 303 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 200.0);
304 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); 304 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)
339 evas_canvas3d_mesh_frame_material_set(data->mesh_sphere, 0, data->material); 339 evas_canvas3d_mesh_frame_material_set(data->mesh_sphere, 0, data->material);
340 340
341 data->mesh_node = 341 data->mesh_node =
342 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 342 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
343 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 343 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
344 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh_aabb); 344 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh_aabb);
345} 345}
@@ -376,13 +376,13 @@ _scene_setup(Scene_Data *data)
376{ 376{
377 data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 377 data->scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
378 378
379 data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 379 data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
380 380
381 _light_setup(data); 381 _light_setup(data);
382 _mesh_setup_model(data); 382 _mesh_setup_model(data);
383 _camera_setup(data); 383 _camera_setup(data);
384 384
385 data->mesh_node_model = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 385 data->mesh_node_model = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
386 evas_canvas3d_node_position_set(data->mesh_node_model, obj_x, obj_y, obj_z); 386 evas_canvas3d_node_position_set(data->mesh_node_model, obj_x, obj_y, obj_z);
387 evas_canvas3d_node_orientation_angle_axis_set(data->mesh_node_model, -90, 1.0, 0.0, 0.0); 387 evas_canvas3d_node_orientation_angle_axis_set(data->mesh_node_model, -90, 1.0, 0.0, 0.0);
388 evas_canvas3d_node_scale_set(data->mesh_node_model, obj_sc_x, obj_sc_y, obj_sc_z); 388 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 96d85bb..0b00cac 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)
260 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); 260 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
261 261
262 data->camera_node = 262 data->camera_node =
263 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 263 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
264 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 264 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
265 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); 265 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
266 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); 266 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)
276 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 276 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
277 277
278 data->light_node = 278 data->light_node =
279 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 279 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
280 evas_canvas3d_node_light_set(data->light_node, data->light); 280 evas_canvas3d_node_light_set(data->light_node, data->light);
281 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 281 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
282 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); 282 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)
354 MODEL_MESH_INIT(blender_test_sonic, sonic_test, DIFFUSE) 354 MODEL_MESH_INIT(blender_test_sonic, sonic_test, DIFFUSE)
355 355
356 data->mesh_node = 356 data->mesh_node =
357 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 357 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
358 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 358 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
359 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh_sphere); 359 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh_sphere);
360 evas_canvas3d_node_scale_set(data->mesh_node, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE); 360 evas_canvas3d_node_scale_set(data->mesh_node, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE);
@@ -372,14 +372,14 @@ _mesh_setup(Scene_Data *data)
372 _print_result(data->mesh_sphere_ch, data->mesh_blender_test_sphere); 372 _print_result(data->mesh_sphere_ch, data->mesh_blender_test_sphere);
373 373
374 data->mesh_node_convex_hull = 374 data->mesh_node_convex_hull =
375 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 375 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
376 evas_canvas3d_node_member_add(data->root_node, data->mesh_node_convex_hull); 376 evas_canvas3d_node_member_add(data->root_node, data->mesh_node_convex_hull);
377 evas_canvas3d_node_position_set(data->mesh_node_convex_hull, 0.0, 0.0, 0.0); 377 evas_canvas3d_node_position_set(data->mesh_node_convex_hull, 0.0, 0.0, 0.0);
378 evas_canvas3d_node_scale_set(data->mesh_node_convex_hull, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE); 378 evas_canvas3d_node_scale_set(data->mesh_node_convex_hull, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE);
379 evas_canvas3d_node_mesh_add(data->mesh_node_convex_hull, data->mesh_sphere_ch); 379 evas_canvas3d_node_mesh_add(data->mesh_node_convex_hull, data->mesh_sphere_ch);
380 380
381 data->mesh_node_blender = 381 data->mesh_node_blender =
382 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 382 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
383 evas_canvas3d_node_member_add(data->root_node, data->mesh_node_blender); 383 evas_canvas3d_node_member_add(data->root_node, data->mesh_node_blender);
384 evas_canvas3d_node_position_set(data->mesh_node_blender, -3.0, 0.0, 0.0); 384 evas_canvas3d_node_position_set(data->mesh_node_blender, -3.0, 0.0, 0.0);
385 evas_canvas3d_node_scale_set(data->mesh_node_blender, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE); 385 evas_canvas3d_node_scale_set(data->mesh_node_blender, SCALE_SPHERE, SCALE_SPHERE, SCALE_SPHERE);
@@ -394,7 +394,7 @@ _scene_setup(Scene_Data *data)
394 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); 394 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
395 395
396 data->root_node = 396 data->root_node =
397 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 397 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
398 398
399 _camera_setup(data); 399 _camera_setup(data);
400 _light_setup(data); 400 _light_setup(data);
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index 875cc46..4203b8a 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -94,14 +94,14 @@ main(void)
94 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 94 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
95 95
96 /* Add the root node for the scene. */ 96 /* Add the root node for the scene. */
97 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 97 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
98 98
99 /* Add the camera. */ 99 /* Add the camera. */
100 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 100 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
101 evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0); 101 evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0);
102 102
103 camera_node = 103 camera_node =
104 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 104 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
105 evas_canvas3d_node_camera_set(camera_node, camera); 105 evas_canvas3d_node_camera_set(camera_node, camera);
106 evas_canvas3d_node_member_add(root_node, camera_node); 106 evas_canvas3d_node_member_add(root_node, camera_node);
107 evas_canvas3d_node_position_set(camera_node, 100.0, 0.0, 20.0); 107 evas_canvas3d_node_position_set(camera_node, 100.0, 0.0, 20.0);
@@ -114,7 +114,7 @@ main(void)
114 evas_canvas3d_light_directional_set(light, EINA_TRUE); 114 evas_canvas3d_light_directional_set(light, EINA_TRUE);
115 115
116 light_node = 116 light_node =
117 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 117 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
118 evas_canvas3d_node_light_set(light_node, light); 118 evas_canvas3d_node_light_set(light_node, light);
119 evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0); 119 evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0);
120 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); 120 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)
142 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); 142 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
143 evas_canvas3d_material_shininess_set(material, 50.0); 143 evas_canvas3d_material_shininess_set(material, 50.0);
144 144
145 mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 145 mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
146 evas_canvas3d_node_member_add(root_node, mesh_node); 146 evas_canvas3d_node_member_add(root_node, mesh_node);
147 evas_canvas3d_node_mesh_add(mesh_node, mesh); 147 evas_canvas3d_node_mesh_add(mesh_node, mesh);
148 148
diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c
index 2c04dec..2c8269b 100644
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -36,7 +36,7 @@
36 efl_file_mmap_set(mesh_##extention, extention##_file, NULL); \ 36 efl_file_mmap_set(mesh_##extention, extention##_file, NULL); \
37 evas_canvas3d_mesh_frame_material_set(mesh_##extention, 0, material); \ 37 evas_canvas3d_mesh_frame_material_set(mesh_##extention, 0, material); \
38 evas_canvas3d_mesh_shader_mode_set(mesh_##extention, EVAS_CANVAS3D_SHADER_MODE_PHONG); \ 38 evas_canvas3d_mesh_shader_mode_set(mesh_##extention, EVAS_CANVAS3D_SHADER_MODE_PHONG); \
39 node_##extention = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ 39 node_##extention = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); \
40 evas_canvas3d_node_member_add(root_node, node_##extention); \ 40 evas_canvas3d_node_member_add(root_node, node_##extention); \
41 evas_canvas3d_node_mesh_add(node_##extention, mesh_##extention); \ 41 evas_canvas3d_node_mesh_add(node_##extention, mesh_##extention); \
42 evas_canvas3d_node_position_set(node_##extention, initial_node_data[number * 10], \ 42 evas_canvas3d_node_position_set(node_##extention, initial_node_data[number * 10], \
@@ -184,14 +184,14 @@ main(void)
184 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 184 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
185 185
186 /* Add the root node for the scene. */ 186 /* Add the root node for the scene. */
187 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 187 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
188 188
189 /* Add the camera. */ 189 /* Add the camera. */
190 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 190 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
191 evas_canvas3d_camera_projection_perspective_set(camera, 10.0, 1.0, 1.0, 500.0); 191 evas_canvas3d_camera_projection_perspective_set(camera, 10.0, 1.0, 1.0, 500.0);
192 192
193 camera_node = 193 camera_node =
194 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 194 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
195 evas_canvas3d_node_camera_set(camera_node, camera); 195 evas_canvas3d_node_camera_set(camera_node, camera);
196 evas_canvas3d_node_member_add(root_node, camera_node); 196 evas_canvas3d_node_member_add(root_node, camera_node);
197 evas_canvas3d_node_position_set(camera_node, 0.0, 0.0, 100.0); 197 evas_canvas3d_node_position_set(camera_node, 0.0, 0.0, 100.0);
@@ -204,7 +204,7 @@ main(void)
204 evas_canvas3d_light_directional_set(light, EINA_TRUE); 204 evas_canvas3d_light_directional_set(light, EINA_TRUE);
205 205
206 light_node = 206 light_node =
207 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 207 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
208 evas_canvas3d_node_light_set(light_node, light); 208 evas_canvas3d_node_light_set(light_node, light);
209 evas_canvas3d_node_position_set(light_node, 1.0, 0.0, 100.0); 209 evas_canvas3d_node_position_set(light_node, 1.0, 0.0, 100.0);
210 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); 210 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 aaac77c..ea3874d 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -49,7 +49,7 @@
49 efl_file_set(mesh[num], full_file_path, NULL); \ 49 efl_file_set(mesh[num], full_file_path, NULL); \
50 evas_canvas3d_mesh_frame_material_set(mesh[num], 0, name_of_material); \ 50 evas_canvas3d_mesh_frame_material_set(mesh[num], 0, name_of_material); \
51 evas_canvas3d_mesh_shader_mode_set(mesh[num], shade_mode); \ 51 evas_canvas3d_mesh_shader_mode_set(mesh[num], shade_mode); \
52 mesh_node[num] = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ 52 mesh_node[num] = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); \
53 evas_canvas3d_node_member_add(root_node, mesh_node[num]); \ 53 evas_canvas3d_node_member_add(root_node, mesh_node[num]); \
54 evas_canvas3d_node_mesh_add(mesh_node[num], mesh[num]); \ 54 evas_canvas3d_node_mesh_add(mesh_node[num], mesh[num]); \
55 evas_canvas3d_node_position_set(mesh_node[num], 0, Y, Z); \ 55 evas_canvas3d_node_position_set(mesh_node[num], 0, Y, Z); \
@@ -160,14 +160,14 @@ main(void)
160 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 160 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
161 161
162 /* Add the root node for the scene. */ 162 /* Add the root node for the scene. */
163 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 163 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
164 164
165 /* Add the camera. */ 165 /* Add the camera. */
166 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 166 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
167 evas_canvas3d_camera_projection_perspective_set(camera, 20.0, 1.0, 1.0, 500.0); 167 evas_canvas3d_camera_projection_perspective_set(camera, 20.0, 1.0, 1.0, 500.0);
168 168
169 camera_node = 169 camera_node =
170 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 170 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
171 evas_canvas3d_node_camera_set(camera_node, camera); 171 evas_canvas3d_node_camera_set(camera_node, camera);
172 evas_canvas3d_node_member_add(root_node, camera_node); 172 evas_canvas3d_node_member_add(root_node, camera_node);
173 evas_canvas3d_node_position_set(camera_node, 100.0, 0.0, 0.0); 173 evas_canvas3d_node_position_set(camera_node, 100.0, 0.0, 0.0);
@@ -180,7 +180,7 @@ main(void)
180 evas_canvas3d_light_directional_set(light, EINA_TRUE); 180 evas_canvas3d_light_directional_set(light, EINA_TRUE);
181 181
182 light_node = 182 light_node =
183 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 183 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
184 evas_canvas3d_node_light_set(light_node, light); 184 evas_canvas3d_node_light_set(light_node, light);
185 evas_canvas3d_node_position_set(light_node, 10.0, 0.0, 0.0); 185 evas_canvas3d_node_position_set(light_node, 10.0, 0.0, 0.0);
186 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); 186 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 ac9b7a4..7175546 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)
108 108
109 evas_canvas3d_camera_projection_perspective_set(data->camera, 30.0, 1.0, 2.0, 50.0); 109 evas_canvas3d_camera_projection_perspective_set(data->camera, 30.0, 1.0, 2.0, 50.0);
110 110
111 data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 111 data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
112 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 112 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
113 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); 113 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
114 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); 114 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)
123 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); 123 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
124 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 124 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
125 125
126 data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 126 data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
127 evas_canvas3d_node_light_set(data->light_node, data->light); 127 evas_canvas3d_node_light_set(data->light_node, data->light);
128 evas_canvas3d_node_position_set(data->light_node, -20.0, 20.0, 50.0); 128 evas_canvas3d_node_position_set(data->light_node, -20.0, 20.0, 50.0);
129 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); 129 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)
191 191
192 evas_canvas3d_mesh_frame_material_set(data->mesh, 100, data->material_wood); 192 evas_canvas3d_mesh_frame_material_set(data->mesh, 100, data->material_wood);
193 193
194 data->mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 194 data->mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
195 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 195 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
196 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 196 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
197 evas_canvas3d_node_scale_set(data->mesh_node, 3, 3, 3); 197 evas_canvas3d_node_scale_set(data->mesh_node, 3, 3, 3);
@@ -204,7 +204,7 @@ _scene_setup(Scene_Data *data)
204 evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); 204 evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
205 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); 205 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
206 206
207 data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 207 data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
208 208
209 _camera_setup(data); 209 _camera_setup(data);
210 _light_setup(data); 210 _light_setup(data);
diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index 71608de..4ecf9c6 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -120,14 +120,14 @@ main(void)
120 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 120 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
121 121
122 /* Add the root node for the scene. */ 122 /* Add the root node for the scene. */
123 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 123 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
124 124
125 /* Add the camera. */ 125 /* Add the camera. */
126 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 126 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
127 evas_canvas3d_camera_projection_perspective_set(camera, 30.0, 1.0, 1.0, 100.0); 127 evas_canvas3d_camera_projection_perspective_set(camera, 30.0, 1.0, 1.0, 100.0);
128 128
129 camera_node = 129 camera_node =
130 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 130 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
131 evas_canvas3d_node_camera_set(camera_node, camera); 131 evas_canvas3d_node_camera_set(camera_node, camera);
132 evas_canvas3d_node_position_set(camera_node, 0.0, 0.0, 2.5); 132 evas_canvas3d_node_position_set(camera_node, 0.0, 0.0, 2.5);
133 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); 133 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)
154 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); 154 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
155 evas_canvas3d_material_shininess_set(material, 50.0); 155 evas_canvas3d_material_shininess_set(material, 50.0);
156 156
157 mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 157 mesh_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
158 158
159 evas_canvas3d_node_member_add(root_node, mesh_node); 159 evas_canvas3d_node_member_add(root_node, mesh_node);
160 evas_canvas3d_node_mesh_add(mesh_node, mesh); 160 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 842be8e..4e6de36 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -133,13 +133,13 @@ main(void)
133 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 133 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
134 134
135 /* Add the root node for the scene. */ 135 /* Add the root node for the scene. */
136 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 136 root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
137 137
138 /* Add the camera. */ 138 /* Add the camera. */
139 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 139 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
140 evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0); 140 evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 500.0);
141 141
142 camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 142 camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
143 evas_canvas3d_node_camera_set(camera_node, camera); 143 evas_canvas3d_node_camera_set(camera_node, camera);
144 evas_canvas3d_node_member_add(root_node, camera_node); 144 evas_canvas3d_node_member_add(root_node, camera_node);
145 evas_canvas3d_node_position_set(camera_node, 15.0, 0.0, 0.0); 145 evas_canvas3d_node_position_set(camera_node, 15.0, 0.0, 0.0);
@@ -151,7 +151,7 @@ main(void)
151 evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0); 151 evas_canvas3d_light_specular_set(light, 1.0, 1.0, 1.0, 1.0);
152 evas_canvas3d_light_directional_set(light, EINA_TRUE); 152 evas_canvas3d_light_directional_set(light, EINA_TRUE);
153 153
154 light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 154 light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
155 evas_canvas3d_node_light_set(light_node, light); 155 evas_canvas3d_node_light_set(light_node, light);
156 evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0); 156 evas_canvas3d_node_position_set(light_node, 1000.0, 0.0, 1000.0);
157 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); 157 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)
196 evas_canvas3d_mesh_shader_mode_set(mesh[i], draw_mode[(i % 8)]); 196 evas_canvas3d_mesh_shader_mode_set(mesh[i], draw_mode[(i % 8)]);
197 } 197 }
198 198
199 mesh_node[i] = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 199 mesh_node[i] = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
200 evas_canvas3d_node_member_add(root_node, mesh_node[i]); 200 evas_canvas3d_node_member_add(root_node, mesh_node[i]);
201 evas_canvas3d_node_mesh_add(mesh_node[i], mesh[i]); 201 evas_canvas3d_node_mesh_add(mesh_node[i], mesh[i]);
202 evas_canvas3d_node_position_set(mesh_node[i], 0, ((i % 4) * 4) + ((i / 16) * 1) - 6.5, (((i % 16) / 4) * 4) - 6); 202 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 5d62ff7..9edbfb2 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)
120 evas_canvas3d_camera_projection_perspective_set(data->camera, 30.0, 1.0, 2.0, 50.0); 120 evas_canvas3d_camera_projection_perspective_set(data->camera, 30.0, 1.0, 2.0, 50.0);
121 121
122 data->camera_node = 122 data->camera_node =
123 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 123 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
124 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 124 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
125 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 5.0); 125 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 5.0);
126 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); 126 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)
136 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 136 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
137 137
138 data->light_node = 138 data->light_node =
139 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 139 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
140 evas_canvas3d_node_light_set(data->light_node, data->light); 140 evas_canvas3d_node_light_set(data->light_node, data->light);
141 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 141 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
142 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); 142 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)
173 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); 173 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
174 174
175 data->mesh_node = 175 data->mesh_node =
176 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 176 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
177 177
178 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 178 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
179 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 179 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
@@ -187,7 +187,7 @@ _scene_setup(Scene_Data *data)
187 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); 187 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
188 188
189 data->root_node = 189 data->root_node =
190 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 190 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
191 191
192 _camera_setup(data); 192 _camera_setup(data);
193 _light_setup(data); 193 _light_setup(data);
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 7288bfd..2b0f7e9 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)
209 209
210 _body_material_set(sphere, 1, 0.0, 0.0); 210 _body_material_set(sphere, 1, 0.0, 0.0);
211 211
212 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)); 212 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));
213 evas_canvas3d_node_mesh_add(sphere->node, sphere->mesh); 213 evas_canvas3d_node_mesh_add(sphere->node, sphere->mesh);
214} 214}
215 215
@@ -226,7 +226,7 @@ _cone_setup(Body_3D *cone)
226 _body_material_set(cone, 0.8, 0.5, 0.5); 226 _body_material_set(cone, 0.8, 0.5, 0.5);
227 227
228 cone->node = 228 cone->node =
229 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 229 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
230 evas_canvas3d_node_mesh_add(cone->node, cone->mesh); 230 evas_canvas3d_node_mesh_add(cone->node, cone->mesh);
231 evas_canvas3d_node_orientation_angle_axis_set(cone->node, -90.0, 1.0, 0.0, 0.0); 231 evas_canvas3d_node_orientation_angle_axis_set(cone->node, -90.0, 1.0, 0.0, 0.0);
232 evas_canvas3d_node_position_set(cone->node, -4.0, 0.0, -3.0); 232 evas_canvas3d_node_position_set(cone->node, -4.0, 0.0, -3.0);
@@ -245,7 +245,7 @@ _cylinder_setup(Body_3D *cylinder)
245 _body_material_set(cylinder, 0.0, 0.0, 1.0); 245 _body_material_set(cylinder, 0.0, 0.0, 1.0);
246 246
247 cylinder->node = 247 cylinder->node =
248 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 248 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
249 evas_canvas3d_node_mesh_add(cylinder->node, cylinder->mesh); 249 evas_canvas3d_node_mesh_add(cylinder->node, cylinder->mesh);
250 evas_canvas3d_node_orientation_angle_axis_set(cylinder->node, -90.0, 1.0, 0.0, 0.0); 250 evas_canvas3d_node_orientation_angle_axis_set(cylinder->node, -90.0, 1.0, 0.0, 0.0);
251 evas_canvas3d_node_position_set(cylinder->node, -2.0, 3.0, 1.0); 251 evas_canvas3d_node_position_set(cylinder->node, -2.0, 3.0, 1.0);
@@ -293,7 +293,7 @@ _fence_setup(Body_3D *fence)
293 evas_canvas3d_mesh_alpha_test_enable_set(fence->mesh, EINA_TRUE); 293 evas_canvas3d_mesh_alpha_test_enable_set(fence->mesh, EINA_TRUE);
294 evas_canvas3d_mesh_shader_mode_set(fence->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP); 294 evas_canvas3d_mesh_shader_mode_set(fence->mesh, EVAS_CANVAS3D_SHADER_MODE_NORMAL_MAP);
295 fence->node = 295 fence->node =
296 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 296 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
297 evas_canvas3d_node_mesh_add(fence->node, fence->mesh); 297 evas_canvas3d_node_mesh_add(fence->node, fence->mesh);
298 evas_canvas3d_node_orientation_angle_axis_set(fence->node, -90.0, 1.0, 0.0, 0.0); 298 evas_canvas3d_node_orientation_angle_axis_set(fence->node, -90.0, 1.0, 0.0, 0.0);
299 evas_canvas3d_node_scale_set(fence->node, 10.0, 10.0, 5.0); 299 evas_canvas3d_node_scale_set(fence->node, 10.0, 10.0, 5.0);
@@ -312,7 +312,7 @@ _square_setup(Body_3D *square)
312 _body_material_set(square, 0.4, 0.4, 0.4); 312 _body_material_set(square, 0.4, 0.4, 0.4);
313 313
314 square->node = 314 square->node =
315 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 315 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
316 evas_canvas3d_node_mesh_add(square->node, square->mesh); 316 evas_canvas3d_node_mesh_add(square->node, square->mesh);
317 evas_canvas3d_node_position_set(square->node, 0.0, -1.0, 0.0); 317 evas_canvas3d_node_position_set(square->node, 0.0, -1.0, 0.0);
318 evas_canvas3d_node_scale_set(square->node, 30.0, 30.0, 30.0); 318 evas_canvas3d_node_scale_set(square->node, 30.0, 30.0, 30.0);
@@ -330,7 +330,7 @@ _box_setup(Body_3D *box)
330 330
331 _body_material_set(box, 0, 1, 0); 331 _body_material_set(box, 0, 1, 0);
332 332
333 box->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 333 box->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
334 evas_canvas3d_node_mesh_add(box->node, box->mesh); 334 evas_canvas3d_node_mesh_add(box->node, box->mesh);
335 evas_canvas3d_node_position_set(box->node, 3.0, 0.0, -3.0); 335 evas_canvas3d_node_position_set(box->node, 3.0, 0.0, -3.0);
336} 336}
@@ -358,7 +358,7 @@ _model_setup(Body_3D *model)
358 evas_canvas3d_mesh_shader_mode_set(model->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG); 358 evas_canvas3d_mesh_shader_mode_set(model->mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
359 359
360 model->node = 360 model->node =
361 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 361 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
362 evas_canvas3d_node_mesh_add(model->node, model->mesh); 362 evas_canvas3d_node_mesh_add(model->node, model->mesh);
363 evas_canvas3d_node_scale_set(model->node, 0.1, 0.1, 0.1); 363 evas_canvas3d_node_scale_set(model->node, 0.1, 0.1, 0.1);
364 evas_canvas3d_node_orientation_angle_axis_set(model->node, 120.0, -0.577, -0.577, -0.577); 364 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)
389 evas_canvas3d_mesh_blending_enable_set(data->billboard.mesh, EINA_TRUE); 389 evas_canvas3d_mesh_blending_enable_set(data->billboard.mesh, EINA_TRUE);
390 evas_canvas3d_mesh_blending_func_set(data->billboard.mesh, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA); 390 evas_canvas3d_mesh_blending_func_set(data->billboard.mesh, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA);
391 391
392 data->billboard.node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 392 data->billboard.node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
393 evas_canvas3d_node_mesh_add(data->billboard.node, data->billboard.mesh); 393 evas_canvas3d_node_mesh_add(data->billboard.node, data->billboard.mesh);
394 evas_canvas3d_node_position_set(data->billboard.node, 0.0, 2.0, 0.0); 394 evas_canvas3d_node_position_set(data->billboard.node, 0.0, 2.0, 0.0);
395 evas_canvas3d_node_scale_set(data->billboard.node, 2.2, 4.6, 4.0); 395 evas_canvas3d_node_scale_set(data->billboard.node, 2.2, 4.6, 4.0);
@@ -401,12 +401,12 @@ static void
401_camera_setup(Scene_Data *data) 401_camera_setup(Scene_Data *data)
402{ 402{
403 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 403 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
404 data->mediator = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 404 data->mediator = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
405 405
406 evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 2.0, 100.0); 406 evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 2.0, 100.0);
407 407
408 data->camera_node = 408 data->camera_node =
409 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 409 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
410 410
411 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 411 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
412 412
@@ -429,7 +429,7 @@ _light_setup(Scene_Data *data)
429 evas_canvas3d_light_projection_perspective_set(data->light, 40.0, 1.0, 2.0, 1000.0); 429 evas_canvas3d_light_projection_perspective_set(data->light, 40.0, 1.0, 2.0, 1000.0);
430 430
431 data->light_node = 431 data->light_node =
432 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 432 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
433 evas_canvas3d_node_light_set(data->light_node, data->light); 433 evas_canvas3d_node_light_set(data->light_node, data->light);
434 evas_canvas3d_node_position_set(data->light_node, 50.0, 50.0, 70.0); 434 evas_canvas3d_node_position_set(data->light_node, 50.0, 50.0, 70.0);
435 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); 435 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)
447 evas_canvas3d_scene_background_color_set(data->scene, BG_COLOR, 1); 447 evas_canvas3d_scene_background_color_set(data->scene, BG_COLOR, 1);
448 448
449 data->root_node = 449 data->root_node =
450 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 450 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
451 451
452 452
453 _camera_setup(data); 453 _camera_setup(data);
diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c
index 49d723c..6e803ec 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)
116 116
117 data->camera_node = 117 data->camera_node =
118 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, 118 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas,
119 evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 119 evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
120 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 120 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
121 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 300.0); 121 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 300.0);
122 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, 122 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)
134 134
135 data->light_node = 135 data->light_node =
136 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, 136 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas,
137 evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 137 evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
138 evas_canvas3d_node_light_set(data->light_node, data->light); 138 evas_canvas3d_node_light_set(data->light_node, data->light);
139 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 300.0); 139 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 300.0);
140 evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, 140 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)
160 160
161 data->lod_mesh_node1 = 161 data->lod_mesh_node1 =
162 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, 162 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas,
163 evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 163 evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
164 evas_canvas3d_node_position_set(data->lod_mesh_node1, 2.0, 0.0, 0.0); 164 evas_canvas3d_node_position_set(data->lod_mesh_node1, 2.0, 0.0, 0.0);
165 165
166 data->lod_mesh_node2 = 166 data->lod_mesh_node2 =
167 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, 167 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas,
168 evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 168 evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
169 169
170 data->complex_node = 170 data->complex_node =
171 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, 171 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas,
172 evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 172 evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
173 evas_canvas3d_node_scale_set(data->complex_node, 30.0, 30.0, 30.0); 173 evas_canvas3d_node_scale_set(data->complex_node, 30.0, 30.0, 30.0);
174 174
175 /* Setup mesh. One model, two meshes object with dufferent lod distances.*/ 175 /* Setup mesh. One model, two meshes object with dufferent lod distances.*/
@@ -209,7 +209,7 @@ _scene_setup(Scene_Data *data)
209 209
210 data->root_node = 210 data->root_node =
211 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, 211 efl_add(EVAS_CANVAS3D_NODE_CLASS, evas,
212 evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 212 evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
213 213
214 _camera_setup(data); 214 _camera_setup(data);
215 _light_setup(data); 215 _light_setup(data);
diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c
index d7d641a..17bf3f0 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)
104 root = efl_add(EFL_VG_CONTAINER_CLASS, NULL); 104 root = efl_add(EFL_VG_CONTAINER_CLASS, NULL);
105 //evas_vg_node_transformation_set(root, &matrix); 105 //evas_vg_node_transformation_set(root, &matrix);
106 106
107 Efl_VG *bg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "bg")); 107 Efl_VG *bg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "bg"));
108 evas_vg_shape_shape_append_rect(bg, 0, 0 , vg_w, vg_h, 0, 0); 108 evas_vg_shape_shape_append_rect(bg, 0, 0 , vg_w, vg_h, 0, 0);
109 evas_vg_node_origin_set(bg, 0,0); 109 evas_vg_node_origin_set(bg, 0,0);
110 evas_vg_shape_stroke_width_set(bg, 1.0); 110 evas_vg_shape_stroke_width_set(bg, 1.0);
111 evas_vg_node_color_set(bg, 80, 80, 80, 80); 111 evas_vg_node_color_set(bg, 80, 80, 80, 80);
112 112
113 Efl_VG *shape = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "shape")); 113 Efl_VG *shape = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "shape"));
114 Efl_VG *rgradient = efl_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(efl_self, "rgradient")); 114 Efl_VG *rgradient = efl_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(efl_added, "rgradient"));
115 Efl_VG *lgradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(efl_self, "lgradient")); 115 Efl_VG *lgradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(efl_added, "lgradient"));
116 116
117 evas_vg_shape_shape_append_arc(shape, 0, 0, 100, 100, 25, 330); 117 evas_vg_shape_shape_append_arc(shape, 0, 0, 100, 100, 25, 330);
118 118
@@ -153,7 +153,7 @@ vector_set(int x, int y, int w, int h)
153 evas_vg_node_color_set(shape, 0, 0, 255, 255); 153 evas_vg_node_color_set(shape, 0, 0, 255, 255);
154 evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 128); 154 evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 128);
155 155
156 Efl_VG *rect = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "rect")); 156 Efl_VG *rect = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "rect"));
157 evas_vg_shape_shape_append_rect(rect, 0, 0, 100, 100, 0, 0); 157 evas_vg_shape_shape_append_rect(rect, 0, 0, 100, 100, 0, 0);
158 evas_vg_node_origin_set(rect, 100, 100); 158 evas_vg_node_origin_set(rect, 100, 100);
159 evas_vg_shape_fill_set(rect, lgradient); 159 evas_vg_shape_fill_set(rect, lgradient);
@@ -161,7 +161,7 @@ vector_set(int x, int y, int w, int h)
161 evas_vg_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND); 161 evas_vg_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND);
162 evas_vg_shape_stroke_color_set(rect, 255, 255, 255, 255); 162 evas_vg_shape_stroke_color_set(rect, 255, 255, 255, 255);
163 163
164 Efl_VG *rect1 = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "rect1")); 164 Efl_VG *rect1 = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "rect1"));
165 evas_vg_shape_shape_append_rect(rect1, 0, 0, 70, 70, 0, 0); 165 evas_vg_shape_shape_append_rect(rect1, 0, 0, 70, 70, 0, 0);
166 evas_vg_node_origin_set(rect1, 50, 70); 166 evas_vg_node_origin_set(rect1, 50, 70);
167 evas_vg_shape_stroke_scale_set(rect1, 2); 167 evas_vg_shape_stroke_scale_set(rect1, 2);
@@ -169,7 +169,7 @@ vector_set(int x, int y, int w, int h)
169 evas_vg_shape_stroke_join_set(rect1, EFL_GFX_JOIN_ROUND); 169 evas_vg_shape_stroke_join_set(rect1, EFL_GFX_JOIN_ROUND);
170 evas_vg_shape_stroke_color_set(rect1, 0, 100, 80, 100); 170 evas_vg_shape_stroke_color_set(rect1, 0, 100, 80, 100);
171 171
172 Efl_VG *circle = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "circle")); 172 Efl_VG *circle = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "circle"));
173 evas_vg_shape_shape_append_arc(circle, 0, 0, 250, 100, 30, 300); 173 evas_vg_shape_shape_append_arc(circle, 0, 0, 250, 100, 30, 300);
174 evas_vg_shape_fill_set(circle, lgradient); 174 evas_vg_shape_fill_set(circle, lgradient);
175 //evas_vg_node_transformation_set(&matrix), 175 //evas_vg_node_transformation_set(&matrix),
@@ -177,27 +177,27 @@ vector_set(int x, int y, int w, int h)
177 evas_vg_node_color_set(circle, 50, 0, 0, 50); 177 evas_vg_node_color_set(circle, 50, 0, 0, 50);
178 178
179 // Foreground 179 // Foreground
180 Efl_VG *fg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "fg")); 180 Efl_VG *fg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "fg"));
181 evas_vg_shape_shape_append_rect(fg, 0, 0, vg_w, vg_h, 0, 0); 181 evas_vg_shape_shape_append_rect(fg, 0, 0, vg_w, vg_h, 0, 0);
182 evas_vg_node_origin_set(fg, 0, 0); 182 evas_vg_node_origin_set(fg, 0, 0);
183 evas_vg_shape_stroke_width_set(fg, 5.0); 183 evas_vg_shape_stroke_width_set(fg, 5.0);
184 evas_vg_shape_stroke_join_set(fg, EFL_GFX_JOIN_ROUND); 184 evas_vg_shape_stroke_join_set(fg, EFL_GFX_JOIN_ROUND);
185 evas_vg_shape_stroke_color_set(fg, 70, 70, 0, 70); 185 evas_vg_shape_stroke_color_set(fg, 70, 70, 0, 70);
186 186
187 Efl_VG *tst = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "tst")); 187 Efl_VG *tst = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "tst"));
188 evas_vg_shape_shape_append_rect(tst, 50, 25, 200, 200, 3, 5); 188 evas_vg_shape_shape_append_rect(tst, 50, 25, 200, 200, 3, 5);
189 evas_vg_node_color_set(tst, 0, 0, 200, 200); 189 evas_vg_node_color_set(tst, 0, 0, 200, 200);
190 evas_vg_shape_stroke_width_set(tst, 2); 190 evas_vg_shape_stroke_width_set(tst, 2);
191 evas_vg_shape_stroke_color_set(tst, 255, 0, 0, 255); 191 evas_vg_shape_stroke_color_set(tst, 255, 0, 0, 255);
192 192
193 Efl_VG *vc = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "vc")); 193 Efl_VG *vc = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "vc"));
194 evas_vg_shape_shape_append_circle(vc, 100, 100, 23); 194 evas_vg_shape_shape_append_circle(vc, 100, 100, 23);
195 evas_vg_node_color_set(vc, 0, 200, 0, 255); 195 evas_vg_node_color_set(vc, 0, 200, 0, 255);
196 evas_vg_shape_stroke_width_set(vc, 4); 196 evas_vg_shape_stroke_width_set(vc, 4);
197 evas_vg_shape_stroke_color_set(vc, 255, 0, 0, 255); 197 evas_vg_shape_stroke_color_set(vc, 255, 0, 0, 255);
198 198
199 beginning = efl_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(efl_self, root)); 199 beginning = efl_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(efl_added, root));
200 end = efl_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(efl_self, root)); 200 end = efl_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(efl_added, root));
201 201
202 circle = efl_vg_container_child_get(end, "circle"); 202 circle = efl_vg_container_child_get(end, "circle");
203 efl_vg_transformation_set(circle, &matrix); 203 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 3907f66..5c3dfaf 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)
29 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 29 data->camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
30 evas_canvas3d_camera_projection_perspective_set(data->camera, 65.0, 1.0, 1.0, 300.0); 30 evas_canvas3d_camera_projection_perspective_set(data->camera, 65.0, 1.0, 1.0, 300.0);
31 31
32 data->mediator_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 32 data->mediator_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
33 data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 33 data->camera_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
34 34
35 evas_canvas3d_node_member_add(data->root_node, data->mediator_node); 35 evas_canvas3d_node_member_add(data->root_node, data->mediator_node);
36 evas_canvas3d_node_member_add(data->mediator_node, data->camera_node); 36 evas_canvas3d_node_member_add(data->mediator_node, data->camera_node);
@@ -50,7 +50,7 @@ _light_setup(Scene_Data *data)
50 evas_canvas3d_light_specular_set(data->light, 0.2, 0.2, 0.2, 1.0); 50 evas_canvas3d_light_specular_set(data->light, 0.2, 0.2, 0.2, 1.0);
51 evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 200.0); 51 evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 200.0);
52 52
53 data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 53 data->light_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
54 54
55 evas_canvas3d_node_light_set(data->light_node, data->light); 55 evas_canvas3d_node_light_set(data->light_node, data->light);
56 evas_canvas3d_node_position_set(data->light_node, -30.0, 70.0, 0.0); 56 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 91d1563..7c1282a 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
144 144
145 145
146#define SETUP_MESH_NODE(Name) \ 146#define SETUP_MESH_NODE(Name) \
147 data->mesh_node_##Name = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ 147 data->mesh_node_##Name = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH)); \
148 \ 148 \
149 evas_canvas3d_node_mesh_add(data->mesh_node_##Name, data->mesh_##Name); 149 evas_canvas3d_node_mesh_add(data->mesh_node_##Name, data->mesh_##Name);
150 150
diff --git a/src/examples/evas/shooter/evas-3d-shooter.c b/src/examples/evas/shooter/evas-3d-shooter.c
index 1aa3223..9fc7bb8 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)
1004 evas_canvas3d_scene_size_set(global_scene, WIDTH, HEIGHT); 1004 evas_canvas3d_scene_size_set(global_scene, WIDTH, HEIGHT);
1005 evas_canvas3d_scene_background_color_set(global_scene, 0.5, 0.5, 0.9, 0.0); 1005 evas_canvas3d_scene_background_color_set(global_scene, 0.5, 0.5, 0.9, 0.0);
1006 1006
1007 data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 1007 data->root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
1008 1008
1009 _camera_setup(data); 1009 _camera_setup(data);
1010 _light_setup(data); 1010 _light_setup(data);
@@ -1069,7 +1069,7 @@ _scene_setup(Scene_Data *data)
1069 } 1069 }
1070 } 1070 }
1071 1071
1072 data->carp_mediator_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 1072 data->carp_mediator_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
1073 1073
1074 evas_canvas3d_node_member_add(data->carp_mediator_node, data->mesh_node_carpet); 1074 evas_canvas3d_node_member_add(data->carp_mediator_node, data->mesh_node_carpet);
1075 1075
diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
index e1616ce..6cf7e59 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,
68 const void *data) 68 const void *data)
69{ 69{
70 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 70 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
71 Ecore_Exe *ret = efl_add(MY_CLASS, NULL, ecore_obj_exe_command_set(efl_self, exe_cmd, flags)); 71 Ecore_Exe *ret = efl_add(MY_CLASS, NULL, ecore_obj_exe_command_set(efl_added, exe_cmd, flags));
72 if (ret) 72 if (ret)
73 { 73 {
74 Ecore_Exe_Data *pd = efl_data_scope_get(ret, MY_CLASS); 74 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 ad70d87..851d6fe 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
3008 3008
3009 t->job_is = EINA_FALSE; 3009 t->job_is = EINA_FALSE;
3010 t->u.timer = efl_add(EFL_LOOP_TIMER_CLASS, obj, 3010 t->u.timer = efl_add(EFL_LOOP_TIMER_CLASS, obj,
3011 efl_loop_timer_interval_set(efl_self, time), 3011 efl_loop_timer_interval_set(efl_added, time),
3012 efl_event_callback_array_add(efl_self, timeout(), t)); 3012 efl_event_callback_array_add(efl_added, timeout(), t));
3013 3013
3014 if (!t->u.timer) goto on_error; 3014 if (!t->u.timer) goto on_error;
3015 3015
diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c
index 320b427..5942616 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,
237 const void *data) 237 const void *data)
238{ 238{
239 Ecore_Poller *poller; 239 Ecore_Poller *poller;
240 poller = efl_add(MY_CLASS, _ecore_parent, ecore_poller_constructor(efl_self, type, interval, func, data)); 240 poller = efl_add(MY_CLASS, _ecore_parent, ecore_poller_constructor(efl_added, type, interval, func, data));
241 return poller; 241 return poller;
242} 242}
243 243
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 46efa8a..e83c7e3 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -191,9 +191,9 @@ ecore_timer_add(double in,
191 legacy->func = func; 191 legacy->func = func;
192 legacy->data = data; 192 legacy->data = data;
193 timer = efl_add(MY_CLASS, ecore_main_loop_get(), 193 timer = efl_add(MY_CLASS, ecore_main_loop_get(),
194 efl_event_callback_array_add(efl_self, legacy_timer(), legacy), 194 efl_event_callback_array_add(efl_added, legacy_timer(), legacy),
195 efl_key_data_set(efl_self, "_legacy", legacy), 195 efl_key_data_set(efl_added, "_legacy", legacy),
196 efl_loop_timer_interval_set(efl_self, in)); 196 efl_loop_timer_interval_set(efl_added, in));
197 197
198 return timer; 198 return timer;
199} 199}
@@ -213,10 +213,10 @@ ecore_timer_loop_add(double in,
213 legacy->func = func; 213 legacy->func = func;
214 legacy->data = data; 214 legacy->data = data;
215 timer = efl_add(MY_CLASS, ecore_main_loop_get(), 215 timer = efl_add(MY_CLASS, ecore_main_loop_get(),
216 efl_event_callback_array_add(efl_self, legacy_timer(), legacy), 216 efl_event_callback_array_add(efl_added, legacy_timer(), legacy),
217 efl_key_data_set(efl_self, "_legacy", legacy), 217 efl_key_data_set(efl_added, "_legacy", legacy),
218 efl_loop_timer_loop_reset(efl_self), 218 efl_loop_timer_loop_reset(efl_added),
219 efl_loop_timer_interval_set(efl_self, in)); 219 efl_loop_timer_interval_set(efl_added, in));
220 220
221 return timer; 221 return timer;
222} 222}
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 8340c3d..161434a 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
305 if (!name || !done_cb) 305 if (!name || !done_cb)
306 return EINA_FALSE; 306 return EINA_FALSE;
307 307
308 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)); 308 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));
309 309
310 lk = malloc(sizeof (Ecore_Con_Lookup)); 310 lk = malloc(sizeof (Ecore_Con_Lookup));
311 if (!lk) 311 if (!lk)
@@ -359,7 +359,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
359 359
360 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */ 360 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */
361 /* remote system socket: TCP/IP: [name]:[port] */ 361 /* remote system socket: TCP/IP: [name]:[port] */
362 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)); 362 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));
363 363
364 ecore_con_server_data_set(obj, (void *) data); 364 ecore_con_server_data_set(obj, (void *) data);
365 365
@@ -455,7 +455,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
455 /* local user socket: FILE: ~/.ecore/[name]/[port] */ 455 /* local user socket: FILE: ~/.ecore/[name]/[port] */
456 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */ 456 /* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */
457 /* remote system socket: TCP/IP: [name]:[port] */ 457 /* remote system socket: TCP/IP: [name]:[port] */
458 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)); 458 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));
459 459
460 ecore_con_server_data_set(obj, (void *) data); 460 ecore_con_server_data_set(obj, (void *) data);
461 461
diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c
index 4bf3a48..1cf9954 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)
722 722
723 if (!server) return NULL; 723 if (!server) return NULL;
724 724
725 ece_obj = efl_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(efl_self, server)); 725 ece_obj = efl_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(efl_added, server));
726 726
727 return ece_obj; 727 return ece_obj;
728} 728}
@@ -734,7 +734,7 @@ ecore_con_eet_client_new(Ecore_Con_Server *server)
734 734
735 if (!server) return NULL; 735 if (!server) return NULL;
736 736
737 ece_obj = efl_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(efl_self, server)); 737 ece_obj = efl_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(efl_added, server));
738 738
739 return ece_obj; 739 return ece_obj;
740} 740}
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index 5996c7c..dffbf42 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 *
236ecore_con_url_new(const char *url) 236ecore_con_url_new(const char *url)
237{ 237{
238 Ecore_Con_Url *url_obj; 238 Ecore_Con_Url *url_obj;
239 url_obj = efl_add(EFL_NETWORK_URL_CLASS, NULL, efl_network_url_set(efl_self, url)); 239 url_obj = efl_add(EFL_NETWORK_URL_CLASS, NULL, efl_network_url_set(efl_added, url));
240 240
241 efl_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(), NULL); 241 efl_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(), NULL);
242 242
diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c
index 763f11b..31832f5 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
350 else 350 else
351 { 351 {
352 cm->timer = efl_add(EFL_LOOP_TIMER_CLASS, cm->loop, 352 cm->timer = efl_add(EFL_LOOP_TIMER_CLASS, cm->loop,
353 efl_loop_timer_interval_set(efl_self, seconds), 353 efl_loop_timer_interval_set(efl_added, seconds),
354 efl_event_callback_add(efl_self, EFL_LOOP_TIMER_EVENT_TICK, _efl_net_dialer_http_curlm_timer_do, cm)); 354 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _efl_net_dialer_http_curlm_timer_do, cm));
355 EINA_SAFETY_ON_NULL_RETURN_VAL(cm->timer, -1); 355 EINA_SAFETY_ON_NULL_RETURN_VAL(cm->timer, -1);
356 } 356 }
357 357
diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.c b/src/lib/ecore_con/efl_net_dialer_websocket.c
index 59593b9..cec03e8 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
932 EINA_SAFETY_ON_NULL_RETURN_VAL(o, NULL); 932 EINA_SAFETY_ON_NULL_RETURN_VAL(o, NULL);
933 933
934 pd->http = efl_add(EFL_NET_DIALER_HTTP_CLASS, o, 934 pd->http = efl_add(EFL_NET_DIALER_HTTP_CLASS, o,
935 efl_net_dialer_http_version_set(efl_self, EFL_NET_HTTP_VERSION_V1_1), 935 efl_net_dialer_http_version_set(efl_added, EFL_NET_HTTP_VERSION_V1_1),
936 efl_net_dialer_http_method_set(efl_self, "GET"), 936 efl_net_dialer_http_method_set(efl_added, "GET"),
937 efl_net_dialer_http_primary_mode_set(efl_self, EFL_NET_DIALER_HTTP_PRIMARY_MODE_UPLOAD), 937 efl_net_dialer_http_primary_mode_set(efl_added, EFL_NET_DIALER_HTTP_PRIMARY_MODE_UPLOAD),
938 efl_event_callback_array_add(efl_self, _efl_net_dialer_websocket_http_cbs(), o)); 938 efl_event_callback_array_add(efl_added, _efl_net_dialer_websocket_http_cbs(), o));
939 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->http, NULL); 939 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->http, NULL);
940 940
941 return o; 941 return o;
@@ -1483,8 +1483,8 @@ _efl_net_dialer_websocket_close_request(Eo *o, Efl_Net_Dialer_Websocket_Data *pd
1483 else 1483 else
1484 { 1484 {
1485 pd->close_timer = efl_add(EFL_LOOP_TIMER_CLASS, efl_loop_user_loop_get(o), 1485 pd->close_timer = efl_add(EFL_LOOP_TIMER_CLASS, efl_loop_user_loop_get(o),
1486 efl_loop_timer_interval_set(efl_self, 2.0), 1486 efl_loop_timer_interval_set(efl_added, 2.0),
1487 efl_event_callback_add(efl_self, EFL_LOOP_TIMER_EVENT_TICK, _efl_net_dialer_websocket_close_request_timeout, o)); 1487 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _efl_net_dialer_websocket_close_request_timeout, o));
1488 } 1488 }
1489 efl_io_writer_can_write_set(o, EINA_FALSE); 1489 efl_io_writer_can_write_set(o, EINA_FALSE);
1490 1490
diff --git a/src/lib/ecore_con/efl_net_server_tcp.c b/src/lib/ecore_con/efl_net_server_tcp.c
index 104b913..9b556f5 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
161_efl_net_server_tcp_efl_net_server_fd_client_add(Eo *o, void *pd EINA_UNUSED, int client_fd) 161_efl_net_server_tcp_efl_net_server_fd_client_add(Eo *o, void *pd EINA_UNUSED, int client_fd)
162{ 162{
163 Eo *client = efl_add(EFL_NET_SOCKET_TCP_CLASS, o, 163 Eo *client = efl_add(EFL_NET_SOCKET_TCP_CLASS, o,
164 efl_event_callback_array_add(efl_self, _efl_net_server_tcp_client_cbs(), o), 164 efl_event_callback_array_add(efl_added, _efl_net_server_tcp_client_cbs(), o),
165 efl_loop_fd_set(efl_self, client_fd)); 165 efl_loop_fd_set(efl_added, client_fd));
166 if (!client) 166 if (!client)
167 { 167 {
168 ERR("could not create client object fd=%d", client_fd); 168 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 64bc1c5..b21f7ab 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,
63 const Efl_Class *type) 63 const Efl_Class *type)
64{ 64{
65 if (type == ECTOR_RENDERER_SHAPE_MIXIN) 65 if (type == ECTOR_RENDERER_SHAPE_MIXIN)
66 return efl_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); 66 return efl_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_added, obj));
67 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN) 67 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN)
68 return efl_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); 68 return efl_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_added, obj));
69 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN) 69 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN)
70 return efl_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); 70 return efl_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_added, obj));
71 71
72 ERR("Couldn't find class for type: %s\n", efl_class_name_get(type)); 72 ERR("Couldn't find class for type: %s\n", efl_class_name_get(type));
73 return NULL; 73 return NULL;
diff --git a/src/lib/ector/gl/ector_gl_surface.c b/src/lib/ector/gl/ector_gl_surface.c
index 54bdb9f..a0ec655 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,
45 const Efl_Class *type) 45 const Efl_Class *type)
46{ 46{
47 if (type == ECTOR_RENDERER_SHAPE_MIXIN) 47 if (type == ECTOR_RENDERER_SHAPE_MIXIN)
48 return efl_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); 48 return efl_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_added, obj));
49 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN) 49 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN)
50 return efl_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); 50 return efl_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_added, obj));
51 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN) 51 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN)
52 return efl_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); 52 return efl_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_added, obj));
53 53
54 ERR("Couldn't find class for type: %s\n", efl_class_name_get(type)); 54 ERR("Couldn't find class for type: %s\n", efl_class_name_get(type));
55 return NULL; 55 return NULL;
diff --git a/src/lib/ector/software/ector_software_surface.c b/src/lib/ector/software/ector_software_surface.c
index ad504c4..f1492a2 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,
16 const Efl_Class *type) 16 const Efl_Class *type)
17{ 17{
18 if (type == ECTOR_RENDERER_SHAPE_MIXIN) 18 if (type == ECTOR_RENDERER_SHAPE_MIXIN)
19 return efl_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); 19 return efl_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_added, obj));
20 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN) 20 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN)
21 return efl_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); 21 return efl_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_added, obj));
22 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN) 22 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN)
23 return efl_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); 23 return efl_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_added, obj));
24 else if (type == ECTOR_RENDERER_BUFFER_MIXIN) 24 else if (type == ECTOR_RENDERER_BUFFER_MIXIN)
25 return efl_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(efl_self, obj)); 25 return efl_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(efl_added, obj));
26 ERR("Couldn't find class for type: %s\n", efl_class_name_get(type)); 26 ERR("Couldn't find class for type: %s\n", efl_class_name_get(type));
27 return NULL; 27 return NULL;
28} 28}
diff --git a/src/lib/edje/edje_containers.c b/src/lib/edje/edje_containers.c
index ab90ddb..6aae0ad 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
88 _ ## type ## _proxy = NULL; \ 88 _ ## type ## _proxy = NULL; \
89 } \ 89 } \
90 return efl_add(TYPE ## _CLASS, ed->obj, \ 90 return efl_add(TYPE ## _CLASS, ed->obj, \
91 _edje_real_part_set(efl_self, ed, rp, rp->part->name)); \ 91 _edje_real_part_set(efl_added, ed, rp, rp->part->name)); \
92 } \ 92 } \
93 \ 93 \
94 if (EINA_UNLIKELY(pd->temp)) \ 94 if (EINA_UNLIKELY(pd->temp)) \
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 085c3c7..4048a8d 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
847 Evas_Canvas3D_Material *material = NULL; 847 Evas_Canvas3D_Material *material = NULL;
848 Edje_Part_Description_Mesh_Node *pd_mesh_node; 848 Edje_Part_Description_Mesh_Node *pd_mesh_node;
849 849
850 rp->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); 850 rp->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_MESH));
851 851
852 mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, ed->base->evas); 852 mesh = efl_add(EVAS_CANVAS3D_MESH_CLASS, ed->base->evas);
853 evas_canvas3d_node_mesh_add(rp->node, mesh); 853 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
880 { 880 {
881 Evas_Canvas3D_Light *light = NULL; 881 Evas_Canvas3D_Light *light = NULL;
882 882
883 rp->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 883 rp->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
884 light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, ed->base->evas); 884 light = efl_add(EVAS_CANVAS3D_LIGHT_CLASS, ed->base->evas);
885 evas_canvas3d_node_light_set(rp->node, light); 885 evas_canvas3d_node_light_set(rp->node, light);
886 886
@@ -892,7 +892,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
892 { 892 {
893 Evas_Canvas3D_Camera *camera = NULL; 893 Evas_Canvas3D_Camera *camera = NULL;
894 894
895 rp->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 895 rp->node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
896 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, ed->base->evas); 896 camera = efl_add(EVAS_CANVAS3D_CAMERA_CLASS, ed->base->evas);
897 evas_canvas3d_node_camera_set(rp->node, camera); 897 evas_canvas3d_node_camera_set(rp->node, camera);
898 898
@@ -2710,7 +2710,7 @@ edje_3d_object_add(Evas_Object *obj, Eo **root_node, Eo *scene)
2710 2710
2711 if (*root_node == NULL) 2711 if (*root_node == NULL)
2712 *root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, 2712 *root_node = efl_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas,
2713 evas_canvas3d_node_constructor(efl_self, EVAS_CANVAS3D_NODE_TYPE_NODE)); 2713 evas_canvas3d_node_constructor(efl_added, EVAS_CANVAS3D_NODE_TYPE_NODE));
2714 2714
2715 if (scene == NULL) 2715 if (scene == NULL)
2716 scene = efl_add(EVAS_CANVAS3D_SCENE_CLASS, ed->base->evas); 2716 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 b9590ed..06f030f 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
199 eet_data->vio.tell = eet_snd_file_tell; 199 eet_data->vio.tell = eet_snd_file_tell;
200 eet_data->offset = 0; 200 eet_data->offset = 0;
201 201
202 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)); 202 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));
203 if (!out) 203 if (!out)
204 { 204 {
205#if HAVE_COREAUDIO 205#if HAVE_COREAUDIO
206 out = efl_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL); 206 out = efl_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
207#elif HAVE_PULSE 207#elif HAVE_PULSE
208 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)); 208 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));
209#endif 209#endif
210 if (out) outs++; 210 if (out) outs++;
211 } 211 }
@@ -277,7 +277,7 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
277#if HAVE_COREAUDIO 277#if HAVE_COREAUDIO
278 out = efl_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL); 278 out = efl_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
279#elif HAVE_PULSE 279#elif HAVE_PULSE
280 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)); 280 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));
281#endif 281#endif
282 if (out) outs++; 282 if (out) outs++;
283 } 283 }
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index a7ab949..40663f8 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)
171 eina_stringshare_del(spath); 171 eina_stringshare_del(spath);
172 } 172 }
173 173
174 cevt.child = efl_add_ref(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(efl_self, evt->filename)); 174 cevt.child = efl_add_ref(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(efl_added, evt->filename));
175 priv->children_list = eina_list_append(priv->children_list, cevt.child); 175 priv->children_list = eina_list_append(priv->children_list, cevt.child);
176 cevt.index = eina_list_count(priv->children_list); 176 cevt.index = eina_list_count(priv->children_list);
177 177
@@ -497,7 +497,7 @@ _eio_main_children_load_cb(void *data, Eio_File *handler EINA_UNUSED, const Eina
497 Eio_Model_Data *priv = data; 497 Eio_Model_Data *priv = data;
498 EINA_SAFETY_ON_NULL_RETURN(priv); 498 EINA_SAFETY_ON_NULL_RETURN(priv);
499 499
500 child = efl_add_ref(MY_CLASS, priv->obj, eio_model_path_set(efl_self, info->path)); 500 child = efl_add_ref(MY_CLASS, priv->obj, eio_model_path_set(efl_added, info->path));
501 eina_spinlock_take(&priv->filter_lock); 501 eina_spinlock_take(&priv->filter_lock);
502 if (priv->filter_cb) 502 if (priv->filter_cb)
503 eio_model_children_filter_set(child, priv->filter_cb, priv->filter_userdata); 503 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)
704 char *path = ecore_file_dir_get(priv->path); 704 char *path = ecore_file_dir_get(priv->path);
705 if (path != NULL && strcmp(priv->path, "/") != 0) 705 if (path != NULL && strcmp(priv->path, "/") != 0)
706 { 706 {
707 model = efl_add(MY_CLASS, NULL, eio_model_path_set(efl_self, path)); 707 model = efl_add(MY_CLASS, NULL, eio_model_path_set(efl_added, path));
708 } 708 }
709 else 709 else
710 model = NULL; 710 model = NULL;
diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index 465673a..aee061e 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,
333 { 333 {
334 DBG("(%p): bus = %s", pd->obj, bus); 334 DBG("(%p): bus = %s", pd->obj, bus);
335 335
336 Eo *child = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_connection_constructor(efl_self, pd->connection, bus, "/")); 336 Eo *child = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_connection_constructor(efl_added, pd->connection, bus, "/"));
337 337
338 pd->children_list = eina_list_append(pd->children_list, child); 338 pd->children_list = eina_list_append(pd->children_list, child);
339 } 339 }
diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c
index 4de2400..2baf940 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
517 WRN("(%p) Creating child: bus = %s, path = %s, interface = %s", pd->obj, pd->bus, current_path, interface->name); 517 WRN("(%p) Creating child: bus = %s, path = %s, interface = %s", pd->obj, pd->bus, current_path, interface->name);
518 518
519 // TODO: increment reference to keep 'interface' in memory 519 // TODO: increment reference to keep 'interface' in memory
520 child = efl_add_ref(ELDBUS_MODEL_PROXY_CLASS, NULL, eldbus_model_proxy_constructor(efl_self, object, interface)); 520 child = efl_add_ref(ELDBUS_MODEL_PROXY_CLASS, NULL, eldbus_model_proxy_constructor(efl_added, object, interface));
521 521
522 pd->children_list = eina_list_append(pd->children_list, child); 522 pd->children_list = eina_list_append(pd->children_list, child);
523 } 523 }
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 54eb6c6..bc249ab 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)
296 INF("(%p) Creating method child: bus = %s, path = %s, method = %s::%s", 296 INF("(%p) Creating method child: bus = %s, path = %s, method = %s::%s",
297 pd->obj, bus, path, interface_name, method_name); 297 pd->obj, bus, path, interface_name, method_name);
298 298
299 child = efl_add(ELDBUS_MODEL_METHOD_CLASS, NULL, eldbus_model_method_constructor(efl_self, pd->proxy, method)); 299 child = efl_add(ELDBUS_MODEL_METHOD_CLASS, NULL, eldbus_model_method_constructor(efl_added, pd->proxy, method));
300 300
301 pd->children_list = eina_list_append(pd->children_list, child); 301 pd->children_list = eina_list_append(pd->children_list, child);
302 } 302 }
@@ -331,7 +331,7 @@ _eldbus_model_proxy_create_signals_children(Eldbus_Model_Proxy_Data *pd)
331 DBG("(%p) Creating signal child: bus = %s, path = %s, signal = %s::%s", 331 DBG("(%p) Creating signal child: bus = %s, path = %s, signal = %s::%s",
332 pd->obj, bus, path, interface_name, signal_name); 332 pd->obj, bus, path, interface_name, signal_name);
333 333
334 child = efl_add(ELDBUS_MODEL_SIGNAL_CLASS, NULL, eldbus_model_signal_constructor(efl_self, pd->proxy, signal)); 334 child = efl_add(ELDBUS_MODEL_SIGNAL_CLASS, NULL, eldbus_model_signal_constructor(efl_added, pd->proxy, signal));
335 335
336 pd->children_list = eina_list_append(pd->children_list, child); 336 pd->children_list = eina_list_append(pd->children_list, child);
337 } 337 }
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 6995260..1f2cbbf 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)
4885{ 4885{
4886 Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); 4886 Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
4887 return efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, (Eo *) obj, 4887 return efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, (Eo *) obj,
4888 efl_canvas_text_cursor_text_object_set(efl_self, text_obj)); 4888 efl_canvas_text_cursor_text_object_set(efl_added, text_obj));
4889} 4889}
4890 4890
4891static void 4891static void
@@ -5246,9 +5246,9 @@ _anchors_create(Eo *obj, Efl_Ui_Text_Data *sd)
5246 _anchors_clear(obj, sd); 5246 _anchors_clear(obj, sd);
5247 5247
5248 start = efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, obj, 5248 start = efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, obj,
5249 efl_canvas_text_cursor_text_object_set(efl_self, text_obj)); 5249 efl_canvas_text_cursor_text_object_set(efl_added, text_obj));
5250 end = efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, obj, 5250 end = efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, obj,
5251 efl_canvas_text_cursor_text_object_set(efl_self, text_obj)); 5251 efl_canvas_text_cursor_text_object_set(efl_added, text_obj));
5252 5252
5253 /* Retrieve all annotations in the text. */ 5253 /* Retrieve all annotations in the text. */
5254 efl_canvas_text_cursor_paragraph_first(start); 5254 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 7751ee8..a86f998 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,
4003 const char *name, 4003 const char *name,
4004 Elm_Win_Type type) 4004 Elm_Win_Type type)
4005{ 4005{
4006 Evas_Object *obj = efl_add(MY_CLASS, parent, efl_ui_win_name_set(efl_self, name), efl_ui_win_type_set(efl_self, type)); 4006 Evas_Object *obj = efl_add(MY_CLASS, parent, efl_ui_win_name_set(efl_added, name), efl_ui_win_type_set(efl_added, type));
4007 return obj; 4007 return obj;
4008} 4008}
4009 4009
4010EAPI Evas_Object * 4010EAPI Evas_Object *
4011elm_win_fake_add(Ecore_Evas *ee) 4011elm_win_fake_add(Ecore_Evas *ee)
4012{ 4012{
4013 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)); 4013 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));
4014} 4014}
4015 4015
4016static void 4016static void
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 218ffe0..f1c72e1 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
1259{ 1259{
1260 Eo *eo_item; 1260 Eo *eo_item;
1261 1261
1262 eo_item = efl_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(efl_self, func, data)); 1262 eo_item = efl_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(efl_added, func, data));
1263 if (!eo_item) return NULL; 1263 if (!eo_item) return NULL;
1264 1264
1265 ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item); 1265 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
1352{ 1352{
1353 Eo *eo_item; 1353 Eo *eo_item;
1354 1354
1355 eo_item = efl_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(efl_self, func, data)); 1355 eo_item = efl_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(efl_added, func, data));
1356 if (!eo_item) return NULL; 1356 if (!eo_item) return NULL;
1357 1357
1358 ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item); 1358 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 799c0bd..1f87d75 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)
1296 if (!sd->model || efl_isa(sd->model, EIO_MODEL_CLASS)) 1296 if (!sd->model || efl_isa(sd->model, EIO_MODEL_CLASS))
1297 { 1297 {
1298 Eio_Model *model = efl_add(EIO_MODEL_CLASS, NULL, 1298 Eio_Model *model = efl_add(EIO_MODEL_CLASS, NULL,
1299 eio_model_path_set(efl_self, eina_environment_home_get())); 1299 eio_model_path_set(efl_added, eina_environment_home_get()));
1300 _populate(fs, model, NULL, NULL); 1300 _populate(fs, model, NULL, NULL);
1301 efl_unref(model); 1301 efl_unref(model);
1302 } 1302 }
@@ -2308,7 +2308,7 @@ elm_fileselector_path_set(Evas_Object *obj,
2308void 2308void
2309_elm_fileselector_path_set_internal(Evas_Object *obj, const char *_path) 2309_elm_fileselector_path_set_internal(Evas_Object *obj, const char *_path)
2310{ 2310{
2311 Eio_Model *model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, _path)); 2311 Eio_Model *model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, _path));
2312 if (!model) 2312 if (!model)
2313 { 2313 {
2314 ERR("Efl.Model allocation error"); 2314 ERR("Efl.Model allocation error");
@@ -2528,7 +2528,7 @@ elm_fileselector_selected_set(Evas_Object *obj,
2528 2528
2529 if (ecore_file_is_dir(path)) 2529 if (ecore_file_is_dir(path))
2530 { 2530 {
2531 model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path)); 2531 model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, path));
2532 if (!model) 2532 if (!model)
2533 { 2533 {
2534 ERR("Efl.Model allocation error"); 2534 ERR("Efl.Model allocation error");
@@ -2546,7 +2546,7 @@ elm_fileselector_selected_set(Evas_Object *obj,
2546 goto clean_up; 2546 goto clean_up;
2547 } 2547 }
2548 2548
2549 model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path)); 2549 model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, path));
2550 if (!model) 2550 if (!model)
2551 { 2551 {
2552 ERR("Efl.Model allocation error"); 2552 ERR("Efl.Model allocation error");
@@ -2554,7 +2554,7 @@ elm_fileselector_selected_set(Evas_Object *obj,
2554 } 2554 }
2555 2555
2556 dir = ecore_file_dir_get(path); 2556 dir = ecore_file_dir_get(path);
2557 parent = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, dir)); 2557 parent = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, dir));
2558 if (parent) 2558 if (parent)
2559 { 2559 {
2560 _schedule_populate(obj, sd, parent, model); 2560 _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 a234861..3e90749 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
215 if (path) priv->fsd.path = eina_stringshare_add(path); 215 if (path) priv->fsd.path = eina_stringshare_add(path);
216 else priv->fsd.path = eina_stringshare_add("/"); 216 else priv->fsd.path = eina_stringshare_add("/");
217 217
218 priv->fsd.model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, priv->fsd.path)); 218 priv->fsd.model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, priv->fsd.path));
219 219
220 priv->fsd.expandable = _elm_config->fileselector_expand_enable; 220 priv->fsd.expandable = _elm_config->fileselector_expand_enable;
221 priv->inwin_mode = _elm_config->inwin_dialogs_enable; 221 priv->inwin_mode = _elm_config->inwin_dialogs_enable;
@@ -314,7 +314,7 @@ _elm_fileselector_button_path_set_internal(Evas_Object *obj, const char *path)
314{ 314{
315 ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN(obj, sd); 315 ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN(obj, sd);
316 316
317 Efl_Model *model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path)); 317 Efl_Model *model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, path));
318 if (!model) 318 if (!model)
319 { 319 {
320 ERR("Efl.Model allocation error"); 320 ERR("Efl.Model allocation error");
diff --git a/src/lib/elementary/elm_app_client.c b/src/lib/elementary/elm_app_client.c
index 03eb85d..ab4df1b 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
39 if (view) 39 if (view)
40 continue; 40 continue;
41 41
42 view = efl_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(efl_self, obj_path)); 42 view = efl_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(efl_added, obj_path));
43 eina_hash_add(data->views, obj_path, view); 43 eina_hash_add(data->views, obj_path, view);
44 if (!loading_list) 44 if (!loading_list)
45 efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view); 45 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)
213 view = eina_hash_find(cdata->views, view_path); 213 view = eina_hash_find(cdata->views, view_path);
214 if (!view) 214 if (!view)
215 { 215 {
216 view = efl_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(efl_self, view_path)); 216 view = efl_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(efl_added, view_path));
217 eina_hash_add(cdata->views, view_path, view); 217 eina_hash_add(cdata->views, view_path, view);
218 efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view); 218 efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
219 } 219 }
diff --git a/src/lib/elementary/elm_app_server.c b/src/lib/elementary/elm_app_server.c
index cb853dd..744a433 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,
254 new_events = elm_app_server_view_props_new_events_get(view_eet_props); 254 new_events = elm_app_server_view_props_new_events_get(view_eet_props);
255 progress = elm_app_server_view_props_progress_get(view_eet_props); 255 progress = elm_app_server_view_props_progress_get(view_eet_props);
256 256
257 view = efl_add(ELM_APP_SERVER_VIEW_CLASS, obj, elm_app_server_view_id_set(efl_self, view_id)); 257 view = efl_add(ELM_APP_SERVER_VIEW_CLASS, obj, elm_app_server_view_id_set(efl_added, view_id));
258 if (!view) 258 if (!view)
259 continue; 259 continue;
260 260
diff --git a/src/lib/elementary/elm_code_diff_widget.c b/src/lib/elementary/elm_code_diff_widget.c
index 118e98e..eec32ee 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)
95 // left side of diff 95 // left side of diff
96 wcode1 = elm_code_create(); 96 wcode1 = elm_code_create();
97 elm_code_parser_standard_add(wcode1, ELM_CODE_PARSER_STANDARD_DIFF); 97 elm_code_parser_standard_add(wcode1, ELM_CODE_PARSER_STANDARD_DIFF);
98 widget_left = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, wcode1)); 98 widget_left = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_added, wcode1));
99 99
100 evas_object_size_hint_weight_set(widget_left, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 100 evas_object_size_hint_weight_set(widget_left, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
101 evas_object_size_hint_align_set(widget_left, EVAS_HINT_FILL, EVAS_HINT_FILL); 101 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)
106 // right side of diff 106 // right side of diff
107 wcode2 = elm_code_create(); 107 wcode2 = elm_code_create();
108 elm_code_parser_standard_add(wcode2, ELM_CODE_PARSER_STANDARD_DIFF); 108 elm_code_parser_standard_add(wcode2, ELM_CODE_PARSER_STANDARD_DIFF);
109 widget_right = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_self, wcode2)); 109 widget_right = efl_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(efl_added, wcode2));
110 110
111 evas_object_size_hint_weight_set(widget_right, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 111 evas_object_size_hint_weight_set(widget_right, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
112 evas_object_size_hint_align_set(widget_right, EVAS_HINT_FILL, EVAS_HINT_FILL); 112 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 f757319..0aadfb6 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)
60{ 60{
61 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 61 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
62 Evas_Object *obj = NULL; 62 Evas_Object *obj = NULL;
63 obj = efl_add(MY_CLASS, parent, elm_obj_code_widget_code_set(efl_self, code)); 63 obj = efl_add(MY_CLASS, parent, elm_obj_code_widget_code_set(efl_added, code));
64 return obj; 64 return obj;
65} 65}
66 66
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index 0bf9029..ff98a27 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -338,7 +338,7 @@ EAPI Evas_Object *
338elm_glview_add(Evas_Object *parent) 338elm_glview_add(Evas_Object *parent)
339{ 339{
340 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 340 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
341 Evas_Object *obj = efl_add(MY_CLASS, parent, elm_obj_glview_version_constructor(efl_self, EVAS_GL_GLES_2_X)); 341 Evas_Object *obj = efl_add(MY_CLASS, parent, elm_obj_glview_version_constructor(efl_added, EVAS_GL_GLES_2_X));
342 return obj; 342 return obj;
343} 343}
344 344
@@ -346,7 +346,7 @@ EAPI Evas_Object *
346elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Version version) 346elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Version version)