summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-15 14:07:52 +0000
committerTom Hacohen <tom@stosb.com>2016-03-15 15:25:54 +0000
commit8706d03b43a59578e9c0965545efbc13f4407cab (patch)
treee9c954901591f42c7c6dddb9763438db04b84215
parentbd2a9015c354073a4bd378d5c5362397f2aee6e4 (diff)
Change the EFL according to the renaming of the eo_add() current object.
-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/eldbus/dbusmodel.c2
-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-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_anim.c4
-rw-r--r--src/lib/ecore/ecore_exe.c2
-rw-r--r--src/lib/ecore/ecore_idle_enterer.c4
-rw-r--r--src/lib/ecore/ecore_idle_exiter.c2
-rw-r--r--src/lib/ecore/ecore_idler.c2
-rw-r--r--src/lib/ecore/ecore_job.c2
-rw-r--r--src/lib/ecore/ecore_poller.c2
-rw-r--r--src/lib/ecore/ecore_timer.c4
-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/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_load.c6
-rw-r--r--src/lib/edje/edje_multisense.c6
-rw-r--r--src/lib/eio/eio_model.c4
-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/evas/canvas/evas_canvas3d_node.c2
-rw-r--r--src/lib/evas/canvas/evas_object_image.c7
-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_animator.c4
-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
-rw-r--r--src/tests/evas/evas_test_image.c2
64 files changed, 181 insertions, 184 deletions
diff --git a/src/examples/ecore/ecore_idler_example.c b/src/examples/ecore/ecore_idler_example.c
index aa749d9a81..8831a4dfc8 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 = eo_add(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(eoid, _idler_cb, &ctxt)); 113// ctxt.idler = eo_add(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(eo_self, _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 e60c20a90d..73a09b38e4 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 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eoid, ECORE_POLLER_CORE, 4, _poller_print_cb, str1)); 51// poller1 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eo_self, ECORE_POLLER_CORE, 4, _poller_print_cb, str1));
52// poller2 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eoid, ECORE_POLLER_CORE, 8, _poller_print_cb, str2)); 52// poller2 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eo_self, ECORE_POLLER_CORE, 8, _poller_print_cb, str2));
53// poller3 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eoid, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3)); 53// poller3 = eo_add(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(eo_self, 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/eldbus/dbusmodel.c b/src/examples/eldbus/dbusmodel.c
index b34799b4c5..3585fad107 100644
--- a/src/examples/eldbus/dbusmodel.c
+++ b/src/examples/eldbus/dbusmodel.c
@@ -102,7 +102,7 @@ main(int argc, char **argv EINA_UNUSED)
102 if (argc > 1) bus = argv[1]; 102 if (argc > 1) bus = argv[1];
103 if (argc > 2) path = argv[2]; 103 if (argc > 2) path = argv[2];
104 104
105 root = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, bus, path)); 105 root = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, bus, path));
106 106
107 eo_event_callback_add(root, EFL_MODEL_BASE_EVENT_LOAD_STATUS, _event_load_status_cb, NULL); 107 eo_event_callback_add(root, EFL_MODEL_BASE_EVENT_LOAD_STATUS, _event_load_status_cb, NULL);
108 efl_model_load(root); 108 efl_model_load(root);
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index a5ef7b1e8d..0ee6dbb9f4 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 = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 145 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
146 146
147 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 147 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
148 148
149 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 149 camera = eo_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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 153 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 165 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 192 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
193 mesh_box_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 193 mesh_box_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
194 194
195 material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 195 material_box = eo_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 862d08de93..55eabffa89 100644
--- a/src/examples/evas/evas-3d-blending.c
+++ b/src/examples/evas/evas-3d-blending.c
@@ -148,7 +148,7 @@ _camera_setup(Scene_Data *data)
148 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); 148 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
149 149
150 data->camera_node = 150 data->camera_node =
151 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 151 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
152 152
153 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 153 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
154 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); 154 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
@@ -166,7 +166,7 @@ _light_setup(Scene_Data *data)
166 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 166 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
167 167
168 data->light_node = 168 data->light_node =
169 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 169 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
170 evas_canvas3d_node_light_set(data->light_node, data->light); 170 evas_canvas3d_node_light_set(data->light_node, data->light);
171 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 171 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
172 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); 172 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);
@@ -215,13 +215,13 @@ _mesh_setup(Scene_Data *data)
215 _set_ball(data->mesh1, data->sphere, data->material1); 215 _set_ball(data->mesh1, data->sphere, data->material1);
216 216
217 data->mesh_node = 217 data->mesh_node =
218 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 218 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
219 219
220 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 220 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
221 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 221 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
222 222
223 data->mesh_node1 = 223 data->mesh_node1 =
224 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 224 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
225 225
226 evas_canvas3d_node_member_add(data->root_node, data->mesh_node1); 226 evas_canvas3d_node_member_add(data->root_node, data->mesh_node1);
227 evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1); 227 evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1);
@@ -243,7 +243,7 @@ _scene_setup(Scene_Data *data)
243 evas_canvas3d_scene_background_color_set(data->scene, 0.5, 0.5, 0.5, 1); 243 evas_canvas3d_scene_background_color_set(data->scene, 0.5, 0.5, 0.5, 1);
244 244
245 data->root_node = 245 data->root_node =
246 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 246 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
247 247
248 _camera_setup(data); 248 _camera_setup(data);
249 _light_setup(data); 249 _light_setup(data);
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index d90e3f54b1..e13f4cca3d 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 = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 275 globalscene.scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
276 276
277 globalscene.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 277 globalscene.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
278 278
279 globalscene.camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 279 globalscene.camera = eo_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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 283 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 295 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 316 m->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 29448d817e..a59851e319 100644
--- a/src/examples/evas/evas-3d-cube-rotate.c
+++ b/src/examples/evas/evas-3d-cube-rotate.c
@@ -151,7 +151,7 @@ _camera_setup(Scene_Data *data)
151 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 151 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
152 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0); 152 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0);
153 153
154 data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 154 data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
155 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 155 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
156 evas_canvas3d_node_position_set(data->camera_node, 3.0, 3.0, 10.0); 156 evas_canvas3d_node_position_set(data->camera_node, 3.0, 3.0, 10.0);
157 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); 157 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);
@@ -168,7 +168,7 @@ _light_setup(Scene_Data *data)
168 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0); 168 evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
169 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 169 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
170 170
171 data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 171 data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
172 172
173 evas_canvas3d_node_light_set(data->light_node, data->light); 173 evas_canvas3d_node_light_set(data->light_node, data->light);
174 evas_canvas3d_node_position_set(data->light_node, 5.0, 5.0, 10.0); 174 evas_canvas3d_node_position_set(data->light_node, 5.0, 5.0, 10.0);
@@ -201,7 +201,7 @@ _mesh_setup(Scene_Data *data)
201 evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 201 evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
202 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); 202 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
203 203
204 data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 204 data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
205 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 205 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
206 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 206 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
207} 207}
@@ -210,7 +210,7 @@ static void
210_scene_setup(Scene_Data *data) 210_scene_setup(Scene_Data *data)
211{ 211{
212 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 212 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
213 data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 213 data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
214 214
215 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); 215 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
216 evas_canvas3d_scene_background_color_set(scene, 0.0, 0.0, 0.0, 0.0); 216 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 9f0707fbcb..50508ab916 100644
--- a/src/examples/evas/evas-3d-cube.c
+++ b/src/examples/evas/evas-3d-cube.c
@@ -138,7 +138,7 @@ _camera_setup(Scene_Data *data)
138 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); 138 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
139 139
140 data->camera_node = 140 data->camera_node =
141 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 141 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
142 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 142 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
143 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); 143 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
144 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); 144 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);
@@ -154,7 +154,7 @@ _light_setup(Scene_Data *data)
154 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 154 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
155 155
156 data->light_node = 156 data->light_node =
157 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 157 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
158 evas_canvas3d_node_light_set(data->light_node, data->light); 158 evas_canvas3d_node_light_set(data->light_node, data->light);
159 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 159 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
160 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); 160 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_frame_material_set(data->mesh, 0, data->material); 188 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
189 189
190 data->mesh_node = 190 data->mesh_node =
191 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 191 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 204 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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-cube2.c b/src/examples/evas/evas-3d-cube2.c
index baa77c0d60..34ed28eea1 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 118 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 134 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP); 188 evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP);
189 189
190 data->mesh_node = 190 data->mesh_node =
191 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 191 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 204 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 5785a0b57b..bae330ccdb 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 = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 118 scene = eo_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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 121 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
122 122
123 /* Add the camera. */ 123 /* Add the camera. */
124 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 124 camera = eo_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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 127 camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 139 light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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_shade_mode_set(mesh2, EVAS_CANVAS3D_SHADE_MODE_PHONG); 170 evas_canvas3d_mesh_shade_mode_set(mesh2, EVAS_CANVAS3D_SHADE_MODE_PHONG);
171 171
172 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 172 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 178 mesh_node2 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 4518dc6b89..a7d17cf5a4 100644
--- a/src/examples/evas/evas-3d-fog.c
+++ b/src/examples/evas/evas-3d-fog.c
@@ -86,7 +86,7 @@ _camera_setup(Scene_Data *data)
86 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); 86 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
87 87
88 data->camera_node = 88 data->camera_node =
89 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 89 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
90 90
91 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 91 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
92 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 7.0); 92 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 7.0);
@@ -104,7 +104,7 @@ _light_setup(Scene_Data *data)
104 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 104 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
105 105
106 data->light_node = 106 data->light_node =
107 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 107 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
108 evas_canvas3d_node_light_set(data->light_node, data->light); 108 evas_canvas3d_node_light_set(data->light_node, data->light);
109 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 109 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
110 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); 110 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);
@@ -144,10 +144,10 @@ _mesh_setup(Scene_Data *data)
144 _set_ball(data->mesh1, data->sphere, data->material); 144 _set_ball(data->mesh1, data->sphere, data->material);
145 145
146 data->animation_node = 146 data->animation_node =
147 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 147 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
148 148
149 data->mesh_node = 149 data->mesh_node =
150 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 150 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
151 151
152 evas_canvas3d_node_member_add(data->animation_node, data->mesh_node); 152 evas_canvas3d_node_member_add(data->animation_node, data->mesh_node);
153 evas_canvas3d_node_member_add(data->root_node, data->animation_node); 153 evas_canvas3d_node_member_add(data->root_node, data->animation_node);
@@ -155,7 +155,7 @@ _mesh_setup(Scene_Data *data)
155 evas_canvas3d_node_position_set(data->mesh_node, 0.0, 0.0, 3.0); 155 evas_canvas3d_node_position_set(data->mesh_node, 0.0, 0.0, 3.0);
156 156
157 data->mesh_node1 = 157 data->mesh_node1 =
158 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 158 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
159 159
160 evas_canvas3d_node_member_add(data->root_node, data->mesh_node1); 160 evas_canvas3d_node_member_add(data->root_node, data->mesh_node1);
161 evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1); 161 evas_canvas3d_node_mesh_add(data->mesh_node1, data->mesh1);
@@ -176,7 +176,7 @@ _scene_setup(Scene_Data *data)
176 evas_canvas3d_scene_background_color_set(data->scene, FOG_COLOR, 1); 176 evas_canvas3d_scene_background_color_set(data->scene, FOG_COLOR, 1);
177 177
178 data->root_node = 178 data->root_node =
179 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 179 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
180 180
181 _camera_setup(data); 181 _camera_setup(data);
182 _light_setup(data); 182 _light_setup(data);
diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c
index b0d1733bcc..062a8cd6e9 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 = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 282 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
283 data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 283 data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 301 data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 342 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 377 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
378 378
379 data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 379 data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 385 data->mesh_node_model = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 f65ad13962..ba4bbe0019 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 263 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 279 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 357 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 375 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 382 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 397 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 b3ea48e3e9..a57decae6a 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 = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 94 scene = eo_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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 97 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
98 98
99 /* Add the camera. */ 99 /* Add the camera. */
100 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 100 camera = eo_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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 104 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 117 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 145 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 ec48336492..d51b1f9b15 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_shade_mode_set(mesh_##extention, EVAS_CANVAS3D_SHADE_MODE_PHONG); \ 38 evas_canvas3d_mesh_shade_mode_set(mesh_##extention, EVAS_CANVAS3D_SHADE_MODE_PHONG); \
39 node_##extention = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ 39 node_##extention = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 184 scene = eo_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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 187 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
188 188
189 /* Add the camera. */ 189 /* Add the camera. */
190 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 190 camera = eo_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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 194 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 207 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 e3a94fc365..1b68ff9fcf 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_shade_mode_set(mesh[num], shade_mode); \ 51 evas_canvas3d_mesh_shade_mode_set(mesh[num], shade_mode); \
52 mesh_node[num] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ 52 mesh_node[num] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 160 scene = eo_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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 163 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
164 164
165 /* Add the camera. */ 165 /* Add the camera. */
166 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 166 camera = eo_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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 170 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 183 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 0d770b7c31..061e8527cf 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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 111 data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 126 data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 194 data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 207 data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 a328b712ed..21d4116df1 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -135,14 +135,14 @@ main(void)
135 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 135 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
136 136
137 /* Add the root node for the scene. */ 137 /* Add the root node for the scene. */
138 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 138 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
139 139
140 /* Add the camera. */ 140 /* Add the camera. */
141 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 141 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
142 evas_canvas3d_camera_projection_perspective_set(camera, 30.0, 1.0, 1.0, 100.0); 142 evas_canvas3d_camera_projection_perspective_set(camera, 30.0, 1.0, 1.0, 100.0);
143 143
144 camera_node = 144 camera_node =
145 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 145 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
146 evas_canvas3d_node_camera_set(camera_node, camera); 146 evas_canvas3d_node_camera_set(camera_node, camera);
147 evas_canvas3d_node_position_set(camera_node, 0.0, 0.0, 2.5); 147 evas_canvas3d_node_position_set(camera_node, 0.0, 0.0, 2.5);
148 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); 148 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);
@@ -169,7 +169,7 @@ main(void)
169 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0); 169 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
170 evas_canvas3d_material_shininess_set(material, 50.0); 170 evas_canvas3d_material_shininess_set(material, 50.0);
171 171
172 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 172 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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);
diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index acde5654ef..8ec3233680 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 = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 133 scene = eo_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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 136 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
137 137
138 /* Add the camera. */ 138 /* Add the camera. */
139 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 139 camera = eo_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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 142 camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 154 light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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_shade_mode_set(mesh[i], draw_mode[(i % 8)]); 196 evas_canvas3d_mesh_shade_mode_set(mesh[i], draw_mode[(i % 8)]);
197 } 197 }
198 198
199 mesh_node[i] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 199 mesh_node[i] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 246d8c3cf8..0ae5693a58 100644
--- a/src/examples/evas/evas-3d-proxy.c
+++ b/src/examples/evas/evas-3d-proxy.c
@@ -104,7 +104,7 @@ _camera_setup(Scene_Data *data)
104 evas_canvas3d_camera_projection_perspective_set(data->camera, 30.0, 1.0, 2.0, 50.0); 104 evas_canvas3d_camera_projection_perspective_set(data->camera, 30.0, 1.0, 2.0, 50.0);
105 105
106 data->camera_node = 106 data->camera_node =
107 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 107 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
108 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 108 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
109 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 5.0); 109 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 5.0);
110 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); 110 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);
@@ -120,7 +120,7 @@ _light_setup(Scene_Data *data)
120 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 120 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
121 121
122 data->light_node = 122 data->light_node =
123 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 123 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
124 evas_canvas3d_node_light_set(data->light_node, data->light); 124 evas_canvas3d_node_light_set(data->light_node, data->light);
125 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 125 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
126 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); 126 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);
@@ -157,7 +157,7 @@ _mesh_setup(Scene_Data *data)
157 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); 157 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
158 158
159 data->mesh_node = 159 data->mesh_node =
160 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 160 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
161 161
162 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 162 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
163 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 163 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
@@ -171,7 +171,7 @@ _scene_setup(Scene_Data *data)
171 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); 171 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
172 172
173 data->root_node = 173 data->root_node =
174 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 174 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
175 175
176 _camera_setup(data); 176 _camera_setup(data);
177 _light_setup(data); 177 _light_setup(data);
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index c9aefbd133..4497308b52 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -200,7 +200,7 @@ _sphere_setup(Body_3D *sphere)
200 200
201 _body_material_set(sphere, 1, 0.0, 0.0); 201 _body_material_set(sphere, 1, 0.0, 0.0);
202 202
203 sphere->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eoid, 3.0, 3.0, 0.0)); 203 sphere->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eo_self, 3.0, 3.0, 0.0));
204 evas_canvas3d_node_mesh_add(sphere->node, sphere->mesh); 204 evas_canvas3d_node_mesh_add(sphere->node, sphere->mesh);
205} 205}
206 206
@@ -217,7 +217,7 @@ _cone_setup(Body_3D *cone)
217 _body_material_set(cone, 0.8, 0.5, 0.5); 217 _body_material_set(cone, 0.8, 0.5, 0.5);
218 218
219 cone->node = 219 cone->node =
220 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 220 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
221 evas_canvas3d_node_mesh_add(cone->node, cone->mesh); 221 evas_canvas3d_node_mesh_add(cone->node, cone->mesh);
222 evas_canvas3d_node_orientation_angle_axis_set(cone->node, -90.0, 1.0, 0.0, 0.0); 222 evas_canvas3d_node_orientation_angle_axis_set(cone->node, -90.0, 1.0, 0.0, 0.0);
223 evas_canvas3d_node_position_set(cone->node, -4.0, 0.0, -3.0); 223 evas_canvas3d_node_position_set(cone->node, -4.0, 0.0, -3.0);
@@ -236,7 +236,7 @@ _cylinder_setup(Body_3D *cylinder)
236 _body_material_set(cylinder, 0.0, 0.0, 1.0); 236 _body_material_set(cylinder, 0.0, 0.0, 1.0);
237 237
238 cylinder->node = 238 cylinder->node =
239 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 239 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
240 evas_canvas3d_node_mesh_add(cylinder->node, cylinder->mesh); 240 evas_canvas3d_node_mesh_add(cylinder->node, cylinder->mesh);
241 evas_canvas3d_node_orientation_angle_axis_set(cylinder->node, -90.0, 1.0, 0.0, 0.0); 241 evas_canvas3d_node_orientation_angle_axis_set(cylinder->node, -90.0, 1.0, 0.0, 0.0);
242 evas_canvas3d_node_position_set(cylinder->node, -2.0, 3.0, 1.0); 242 evas_canvas3d_node_position_set(cylinder->node, -2.0, 3.0, 1.0);
@@ -284,7 +284,7 @@ _fence_setup(Body_3D *fence)
284 evas_canvas3d_mesh_alpha_test_enable_set(fence->mesh, EINA_TRUE); 284 evas_canvas3d_mesh_alpha_test_enable_set(fence->mesh, EINA_TRUE);
285 evas_canvas3d_mesh_shade_mode_set(fence->mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP); 285 evas_canvas3d_mesh_shade_mode_set(fence->mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP);
286 fence->node = 286 fence->node =
287 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 287 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
288 evas_canvas3d_node_mesh_add(fence->node, fence->mesh); 288 evas_canvas3d_node_mesh_add(fence->node, fence->mesh);
289 evas_canvas3d_node_orientation_angle_axis_set(fence->node, -90.0, 1.0, 0.0, 0.0); 289 evas_canvas3d_node_orientation_angle_axis_set(fence->node, -90.0, 1.0, 0.0, 0.0);
290 evas_canvas3d_node_scale_set(fence->node, 10.0, 10.0, 5.0); 290 evas_canvas3d_node_scale_set(fence->node, 10.0, 10.0, 5.0);
@@ -303,7 +303,7 @@ _square_setup(Body_3D *square)
303 _body_material_set(square, 0.4, 0.4, 0.4); 303 _body_material_set(square, 0.4, 0.4, 0.4);
304 304
305 square->node = 305 square->node =
306 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 306 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
307 evas_canvas3d_node_mesh_add(square->node, square->mesh); 307 evas_canvas3d_node_mesh_add(square->node, square->mesh);
308 evas_canvas3d_node_position_set(square->node, 0.0, -1.0, 0.0); 308 evas_canvas3d_node_position_set(square->node, 0.0, -1.0, 0.0);
309 evas_canvas3d_node_scale_set(square->node, 30.0, 30.0, 30.0); 309 evas_canvas3d_node_scale_set(square->node, 30.0, 30.0, 30.0);
@@ -321,7 +321,7 @@ _box_setup(Body_3D *box)
321 321
322 _body_material_set(box, 0, 1, 0); 322 _body_material_set(box, 0, 1, 0);
323 323
324 box->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 324 box->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
325 evas_canvas3d_node_mesh_add(box->node, box->mesh); 325 evas_canvas3d_node_mesh_add(box->node, box->mesh);
326 evas_canvas3d_node_position_set(box->node, 3.0, 0.0, -3.0); 326 evas_canvas3d_node_position_set(box->node, 3.0, 0.0, -3.0);
327} 327}
@@ -349,7 +349,7 @@ _model_setup(Body_3D *model)
349 evas_canvas3d_mesh_shade_mode_set(model->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG); 349 evas_canvas3d_mesh_shade_mode_set(model->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
350 350
351 model->node = 351 model->node =
352 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 352 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
353 evas_canvas3d_node_mesh_add(model->node, model->mesh); 353 evas_canvas3d_node_mesh_add(model->node, model->mesh);
354 evas_canvas3d_node_scale_set(model->node, 0.1, 0.1, 0.1); 354 evas_canvas3d_node_scale_set(model->node, 0.1, 0.1, 0.1);
355 evas_canvas3d_node_orientation_angle_axis_set(model->node, 120.0, -0.577, -0.577, -0.577); 355 evas_canvas3d_node_orientation_angle_axis_set(model->node, 120.0, -0.577, -0.577, -0.577);
@@ -380,7 +380,7 @@ _billboard_setup(Scene_Data *data)
380 evas_canvas3d_mesh_blending_enable_set(data->billboard.mesh, EINA_TRUE); 380 evas_canvas3d_mesh_blending_enable_set(data->billboard.mesh, EINA_TRUE);
381 evas_canvas3d_mesh_blending_func_set(data->billboard.mesh, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA); 381 evas_canvas3d_mesh_blending_func_set(data->billboard.mesh, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA);
382 382
383 data->billboard.node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 383 data->billboard.node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
384 evas_canvas3d_node_mesh_add(data->billboard.node, data->billboard.mesh); 384 evas_canvas3d_node_mesh_add(data->billboard.node, data->billboard.mesh);
385 evas_canvas3d_node_position_set(data->billboard.node, 0.0, 2.0, 0.0); 385 evas_canvas3d_node_position_set(data->billboard.node, 0.0, 2.0, 0.0);
386 evas_canvas3d_node_scale_set(data->billboard.node, 2.2, 4.6, 4.0); 386 evas_canvas3d_node_scale_set(data->billboard.node, 2.2, 4.6, 4.0);
@@ -392,12 +392,12 @@ static void
392_camera_setup(Scene_Data *data) 392_camera_setup(Scene_Data *data)
393{ 393{
394 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 394 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
395 data->mediator = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 395 data->mediator = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
396 396
397 evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 2.0, 100.0); 397 evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 2.0, 100.0);
398 398
399 data->camera_node = 399 data->camera_node =
400 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 400 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
401 401
402 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 402 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
403 403
@@ -420,7 +420,7 @@ _light_setup(Scene_Data *data)
420 evas_canvas3d_light_projection_perspective_set(data->light, 40.0, 1.0, 2.0, 1000.0); 420 evas_canvas3d_light_projection_perspective_set(data->light, 40.0, 1.0, 2.0, 1000.0);
421 421
422 data->light_node = 422 data->light_node =
423 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 423 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
424 evas_canvas3d_node_light_set(data->light_node, data->light); 424 evas_canvas3d_node_light_set(data->light_node, data->light);
425 evas_canvas3d_node_position_set(data->light_node, 50.0, 50.0, 70.0); 425 evas_canvas3d_node_position_set(data->light_node, 50.0, 50.0, 70.0);
426 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); 426 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);
@@ -438,7 +438,7 @@ _scene_setup(Scene_Data *data)
438 evas_canvas3d_scene_background_color_set(data->scene, BG_COLOR, 1); 438 evas_canvas3d_scene_background_color_set(data->scene, BG_COLOR, 1);
439 439
440 data->root_node = 440 data->root_node =
441 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 441 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
442 442
443 443
444 _camera_setup(data); 444 _camera_setup(data);
diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c
index 2c0c7026b0..329e7a7b94 100644
--- a/src/examples/evas/evas-vg-simple.c
+++ b/src/examples/evas/evas-vg-simple.c
@@ -449,15 +449,15 @@ vector_set(int x, int y, int w, int h)
449 root = evas_object_vg_root_node_get(d.vg); 449 root = evas_object_vg_root_node_get(d.vg);
450 //evas_vg_node_transformation_set(root, &matrix); 450 //evas_vg_node_transformation_set(root, &matrix);
451 451
452 Efl_VG *bg = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "bg")); 452 Efl_VG *bg = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "bg"));
453 _rect_add(bg, 0, 0 , vg_w, vg_h); 453 _rect_add(bg, 0, 0 , vg_w, vg_h);
454 evas_vg_node_origin_set(bg, 0,0); 454 evas_vg_node_origin_set(bg, 0,0);
455 evas_vg_shape_stroke_width_set(bg, 1.0); 455 evas_vg_shape_stroke_width_set(bg, 1.0);
456 evas_vg_node_color_set(bg, 80, 80, 80, 80); 456 evas_vg_node_color_set(bg, 80, 80, 80, 80);
457 457
458 Efl_VG *shape = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "shape")); 458 Efl_VG *shape = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "shape"));
459 Efl_VG *rgradient = eo_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(eoid, "rgradient")); 459 Efl_VG *rgradient = eo_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(eo_self, "rgradient"));
460 Efl_VG *lgradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(eoid, "lgradient")); 460 Efl_VG *lgradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(eo_self, "lgradient"));
461 461
462 _arcto(shape, 0, 0, 100, 100, 25, 330); 462 _arcto(shape, 0, 0, 100, 100, 25, 330);
463 463
@@ -498,7 +498,7 @@ vector_set(int x, int y, int w, int h)
498 evas_vg_node_color_set(shape, 0, 0, 255, 255); 498 evas_vg_node_color_set(shape, 0, 0, 255, 255);
499 evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 128); 499 evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 128);
500 500
501 Efl_VG *rect = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "rect")); 501 Efl_VG *rect = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "rect"));
502 _rect_add(rect, 0, 0, 100, 100); 502 _rect_add(rect, 0, 0, 100, 100);
503 evas_vg_node_origin_set(rect, 100, 100); 503 evas_vg_node_origin_set(rect, 100, 100);
504 evas_vg_shape_fill_set(rect, lgradient); 504 evas_vg_shape_fill_set(rect, lgradient);
@@ -506,7 +506,7 @@ vector_set(int x, int y, int w, int h)
506 evas_vg_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND); 506 evas_vg_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND);
507 evas_vg_shape_stroke_color_set(rect, 255, 255, 255, 255); 507 evas_vg_shape_stroke_color_set(rect, 255, 255, 255, 255);
508 508
509 Efl_VG *rect1 = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "rect1")); 509 Efl_VG *rect1 = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "rect1"));
510 _rect_add(rect1, 0, 0, 70, 70); 510 _rect_add(rect1, 0, 0, 70, 70);
511 evas_vg_node_origin_set(rect1, 50, 70); 511 evas_vg_node_origin_set(rect1, 50, 70);
512 evas_vg_shape_stroke_scale_set(rect1, 2); 512 evas_vg_shape_stroke_scale_set(rect1, 2);
@@ -514,7 +514,7 @@ vector_set(int x, int y, int w, int h)
514 evas_vg_shape_stroke_join_set(rect1, EFL_GFX_JOIN_ROUND); 514 evas_vg_shape_stroke_join_set(rect1, EFL_GFX_JOIN_ROUND);
515 evas_vg_shape_stroke_color_set(rect1, 0, 100, 80, 100); 515 evas_vg_shape_stroke_color_set(rect1, 0, 100, 80, 100);
516 516
517 Efl_VG *circle = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "circle")); 517 Efl_VG *circle = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "circle"));
518 _arcto(circle, 0, 0, 250, 100, 30, 300); 518 _arcto(circle, 0, 0, 250, 100, 30, 300);
519 evas_vg_shape_fill_set(circle, lgradient); 519 evas_vg_shape_fill_set(circle, lgradient);
520 //evas_vg_node_transformation_set(&matrix), 520 //evas_vg_node_transformation_set(&matrix),
@@ -522,27 +522,27 @@ vector_set(int x, int y, int w, int h)
522 evas_vg_node_color_set(circle, 50, 0, 0, 50); 522 evas_vg_node_color_set(circle, 50, 0, 0, 50);
523 523
524 // Foreground 524 // Foreground
525 Efl_VG *fg = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "fg")); 525 Efl_VG *fg = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "fg"));
526 _rect_add(fg, 0, 0, vg_w, vg_h); 526 _rect_add(fg, 0, 0, vg_w, vg_h);
527 evas_vg_node_origin_set(fg, 0, 0); 527 evas_vg_node_origin_set(fg, 0, 0);
528 evas_vg_shape_stroke_width_set(fg, 5.0); 528 evas_vg_shape_stroke_width_set(fg, 5.0);
529 evas_vg_shape_stroke_join_set(fg, EFL_GFX_JOIN_ROUND); 529 evas_vg_shape_stroke_join_set(fg, EFL_GFX_JOIN_ROUND);
530 evas_vg_shape_stroke_color_set(fg, 70, 70, 0, 70); 530 evas_vg_shape_stroke_color_set(fg, 70, 70, 0, 70);
531 531
532 Efl_VG *tst = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "tst")); 532 Efl_VG *tst = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "tst"));
533 evas_vg_shape_shape_append_rect(tst, 50, 25, 200, 200, 3, 5); 533 evas_vg_shape_shape_append_rect(tst, 50, 25, 200, 200, 3, 5);
534 evas_vg_node_color_set(tst, 0, 0, 200, 200); 534 evas_vg_node_color_set(tst, 0, 0, 200, 200);
535 evas_vg_shape_stroke_width_set(tst, 2); 535 evas_vg_shape_stroke_width_set(tst, 2);
536 evas_vg_shape_stroke_color_set(tst, 255, 0, 0, 255); 536 evas_vg_shape_stroke_color_set(tst, 255, 0, 0, 255);
537 537
538 Efl_VG *vc = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eoid, "vc")); 538 Efl_VG *vc = eo_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(eo_self, "vc"));
539 evas_vg_shape_shape_append_circle(vc, 100, 100, 23); 539 evas_vg_shape_shape_append_circle(vc, 100, 100, 23);
540 evas_vg_node_color_set(vc, 0, 200, 0, 255); 540 evas_vg_node_color_set(vc, 0, 200, 0, 255);
541 evas_vg_shape_stroke_width_set(vc, 4); 541 evas_vg_shape_stroke_width_set(vc, 4);
542 evas_vg_shape_stroke_color_set(vc, 255, 0, 0, 255); 542 evas_vg_shape_stroke_color_set(vc, 255, 0, 0, 255);
543 543
544 beginning = eo_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(eoid, root)); 544 beginning = eo_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(eo_self, root));
545 end = eo_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(eoid, root)); 545 end = eo_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(eo_self, root));
546 546
547 circle = efl_vg_container_child_get(end, "circle"); 547 circle = efl_vg_container_child_get(end, "circle");
548 efl_vg_transformation_set(circle, &matrix); 548 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 ee608ba2f9..62b36f85a5 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 = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 29 data->camera = eo_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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 32 data->mediator_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
33 data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 33 data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 53 data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 cae6417ea2..ca8521720a 100644
--- a/src/examples/evas/shooter/evas-3d-shooter-macros.h
+++ b/src/examples/evas/shooter/evas-3d-shooter-macros.h
@@ -147,7 +147,7 @@ typedef struct _vec2
147 147
148 148
149#define SETUP_MESH_NODE(Name) \ 149#define SETUP_MESH_NODE(Name) \
150 data->mesh_node_##Name = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); \ 150 data->mesh_node_##Name = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH)); \
151 \ 151 \
152 evas_canvas3d_node_mesh_add(data->mesh_node_##Name, data->mesh_##Name); 152 evas_canvas3d_node_mesh_add(data->mesh_node_##Name, data->mesh_##Name);
153 153
diff --git a/src/examples/evas/shooter/evas-3d-shooter.c b/src/examples/evas/shooter/evas-3d-shooter.c
index 9fcb47a2fd..c7f549c77b 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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 1007 data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 1072 data->carp_mediator_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, 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_anim.c b/src/lib/ecore/ecore_anim.c
index d54e92f315..5e5e034043 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -372,7 +372,7 @@ ecore_animator_add(Ecore_Task_Cb func,
372{ 372{
373 Ecore_Animator *animator = NULL; 373 Ecore_Animator *animator = NULL;
374 374
375 animator = eo_add(MY_CLASS, _ecore_parent, ecore_animator_constructor(eoid, func, data)); 375 animator = eo_add(MY_CLASS, _ecore_parent, ecore_animator_constructor(eo_self, func, data));
376 return animator; 376 return animator;
377} 377}
378 378
@@ -388,7 +388,7 @@ ecore_animator_timeline_add(double runtime,
388 const void *data) 388 const void *data)
389{ 389{
390 Ecore_Animator *animator; 390 Ecore_Animator *animator;
391 animator = eo_add(MY_CLASS, _ecore_parent, ecore_animator_timeline_constructor(eoid, runtime, func, data)); 391 animator = eo_add(MY_CLASS, _ecore_parent, ecore_animator_timeline_constructor(eo_self, runtime, func, data));
392 return animator; 392 return animator;
393} 393}
394 394
diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
index 75c577b67f..97d5c16033 100644
--- a/src/lib/ecore/ecore_exe.c
+++ b/src/lib/ecore/ecore_exe.c
@@ -67,7 +67,7 @@ ecore_exe_pipe_run(const char *exe_cmd,
67 Ecore_Exe_Flags flags, 67 Ecore_Exe_Flags flags,
68 const void *data) 68 const void *data)
69{ 69{
70 Ecore_Exe *ret = eo_add(MY_CLASS, NULL, ecore_obj_exe_command_set(eoid, exe_cmd, flags)); 70 Ecore_Exe *ret = eo_add(MY_CLASS, NULL, ecore_obj_exe_command_set(eo_self, exe_cmd, flags));
71 if (ret) 71 if (ret)
72 { 72 {
73 Ecore_Exe_Data *pd = eo_data_scope_get(ret, MY_CLASS); 73 Ecore_Exe_Data *pd = eo_data_scope_get(ret, MY_CLASS);
diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c
index a7cbfa5704..2acf290255 100644
--- a/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -61,7 +61,7 @@ ecore_idle_enterer_add(Ecore_Task_Cb func,
61 const void *data) 61 const void *data)
62{ 62{
63 Ecore_Idle_Enterer *ie = NULL; 63 Ecore_Idle_Enterer *ie = NULL;
64 ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_after_constructor(eoid, func, data)); 64 ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_after_constructor(eo_self, func, data));
65 return ie; 65 return ie;
66} 66}
67 67
@@ -78,7 +78,7 @@ ecore_idle_enterer_before_add(Ecore_Task_Cb func,
78 const void *data) 78 const void *data)
79{ 79{
80 Ecore_Idle_Enterer *ie = NULL; 80 Ecore_Idle_Enterer *ie = NULL;
81 ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_before_constructor(eoid, func, data)); 81 ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_before_constructor(eo_self, func, data));
82 return ie; 82 return ie;
83} 83}
84 84
diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c
index 5074b13009..7956370757 100644
--- a/src/lib/ecore/ecore_idle_exiter.c
+++ b/src/lib/ecore/ecore_idle_exiter.c
@@ -37,7 +37,7 @@ ecore_idle_exiter_add(Ecore_Task_Cb func,
37 const void *data) 37 const void *data)
38{ 38{
39 Ecore_Idle_Exiter *ie = NULL; 39 Ecore_Idle_Exiter *ie = NULL;
40 ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_exiter_constructor(eoid, func, data)); 40 ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_exiter_constructor(eo_self, func, data));
41 return ie; 41 return ie;
42} 42}
43 43
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index f68d424488..54f08cf921 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -35,7 +35,7 @@ EAPI Ecore_Idler *
35ecore_idler_add(Ecore_Task_Cb func, 35ecore_idler_add(Ecore_Task_Cb func,
36 const void *data) 36 const void *data)
37{ 37{
38 return eo_add(MY_CLASS, _ecore_parent, ecore_idler_constructor(eoid, func, data)); 38 return eo_add(MY_CLASS, _ecore_parent, ecore_idler_constructor(eo_self, func, data));
39} 39}
40 40
41EOLIAN static void 41EOLIAN static void
diff --git a/src/lib/ecore/ecore_job.c b/src/lib/ecore/ecore_job.c
index 1f459c7940..91e634f0fc 100644
--- a/src/lib/ecore/ecore_job.c
+++ b/src/lib/ecore/ecore_job.c
@@ -49,7 +49,7 @@ EAPI Ecore_Job *
49ecore_job_add(Ecore_Cb func, 49ecore_job_add(Ecore_Cb func,
50 const void *data) 50 const void *data)
51{ 51{
52 Ecore_Job *job = eo_add(MY_CLASS, _ecore_parent, ecore_job_constructor(eoid, func, data)); 52 Ecore_Job *job = eo_add(MY_CLASS, _ecore_parent, ecore_job_constructor(eo_self, func, data));
53 return job; 53 return job;
54} 54}
55 55
diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c
index 79f2a78f0b..3279979f71 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 = eo_add(MY_CLASS, _ecore_parent, ecore_poller_constructor(eoid, type, interval, func, data)); 240 poller = eo_add(MY_CLASS, _ecore_parent, ecore_poller_constructor(eo_self, 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 7343a7f726..89823e2a1f 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -93,7 +93,7 @@ ecore_timer_add(double in,
93 Ecore_Timer *timer = NULL; 93 Ecore_Timer *timer = NULL;
94 94
95 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 95 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
96 timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(eoid, in, func, data)); 96 timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(eo_self, in, func, data));
97 return timer; 97 return timer;
98} 98}
99 99
@@ -357,7 +357,7 @@ _ecore_timer_loop_add(double in,
357 const void *data) 357 const void *data)
358{ 358{
359 Ecore_Timer *timer = NULL; 359 Ecore_Timer *timer = NULL;
360 timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(eoid, in, func, data)); 360 timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(eo_self, in, func, data));
361 361
362 return timer; 362 return timer;
363} 363}
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index ba1a575fad..4bca0437e5 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -305,7 +305,7 @@ _efl_network_base_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const ch
305 if (!name || !done_cb) 305 if (!name || !done_cb)
306 return EINA_FALSE; 306 return EINA_FALSE;
307 307
308 obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eoid, ECORE_CON_REMOTE_TCP), efl_network_server_name_set(eoid, name), efl_network_base_port_set(eoid, 1025)); 308 obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eo_self, ECORE_CON_REMOTE_TCP), efl_network_server_name_set(eo_self, name), efl_network_base_port_set(eo_self, 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 = eo_add(EFL_NETWORK_SERVER_CLASS, NULL, efl_network_server_connection_type_set(eoid, compl_type), efl_network_server_name_set(eoid, name), efl_network_base_port_set(eoid, port)); 362 obj = eo_add(EFL_NETWORK_SERVER_CLASS, NULL, efl_network_server_connection_type_set(eo_self, compl_type), efl_network_server_name_set(eo_self, name), efl_network_base_port_set(eo_self, 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 = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eoid, compl_type), efl_network_server_name_set(eoid, name), efl_network_base_port_set(eoid, port)); 458 obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL, efl_network_server_connection_type_set(eo_self, compl_type), efl_network_server_name_set(eo_self, name), efl_network_base_port_set(eo_self, 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 59a5b211c4..4812d577ba 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 = eo_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(eoid, server)); 725 ece_obj = eo_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(eo_self, 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 = eo_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(eoid, server)); 737 ece_obj = eo_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(eo_self, 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 000bf4d016..21f0193fea 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -225,7 +225,7 @@ EAPI Ecore_Con_Url *
225ecore_con_url_new(const char *url) 225ecore_con_url_new(const char *url)
226{ 226{
227 Ecore_Con_Url *url_obj; 227 Ecore_Con_Url *url_obj;
228 url_obj = eo_add(EFL_NETWORK_URL_CLASS, NULL, efl_network_url_set(eoid, url)); 228 url_obj = eo_add(EFL_NETWORK_URL_CLASS, NULL, efl_network_url_set(eo_self, url));
229 229
230 eo_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(), NULL); 230 eo_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(), NULL);
231 231
diff --git a/src/lib/ector/cairo/ector_cairo_surface.c b/src/lib/ector/cairo/ector_cairo_surface.c
index efb0e84ab0..ae737e6d5a 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_generic_surface_renderer_factory_new(Eo *obj,
63 const Eo_Class *type) 63 const Eo_Class *type)
64{ 64{
65 if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN) 65 if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN)
66 return eo_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); 66 return eo_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
67 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN) 67 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN)
68 return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); 68 return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
69 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN) 69 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN)
70 return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); 70 return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
71 71
72 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); 72 ERR("Couldn't find class for type: %s\n", eo_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 2ad665306b..9e8d73681d 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_generic_surface_renderer_factory_new(Eo *obj,
45 const Eo_Class *type) 45 const Eo_Class *type)
46{ 46{
47 if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN) 47 if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN)
48 return eo_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); 48 return eo_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
49 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN) 49 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN)
50 return eo_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); 50 return eo_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
51 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN) 51 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN)
52 return eo_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); 52 return eo_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
53 53
54 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); 54 ERR("Couldn't find class for type: %s\n", eo_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 f67b1947d2..821f7911f7 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_generic_surface_renderer_factory_new(Eo *obj,
16 const Eo_Class *type) 16 const Eo_Class *type)
17{ 17{
18 if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN) 18 if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN)
19 return eo_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); 19 return eo_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
20 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN) 20 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN)
21 return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); 21 return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
22 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN) 22 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN)
23 return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); 23 return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
24 else if (type == ECTOR_RENDERER_GENERIC_BUFFER_MIXIN) 24 else if (type == ECTOR_RENDERER_GENERIC_BUFFER_MIXIN)
25 return eo_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(eoid, obj)); 25 return eo_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
26 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); 26 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type));
27 return NULL; 27 return NULL;
28} 28}
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index ba164b75f4..87553ecda4 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -793,7 +793,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
793 Evas_Canvas3D_Material *material = NULL; 793 Evas_Canvas3D_Material *material = NULL;
794 Edje_Part_Description_Mesh_Node *pd_mesh_node; 794 Edje_Part_Description_Mesh_Node *pd_mesh_node;
795 795
796 rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 796 rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
797 797
798 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, ed->base->evas); 798 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, ed->base->evas);
799 evas_canvas3d_node_mesh_add(rp->node, mesh); 799 evas_canvas3d_node_mesh_add(rp->node, mesh);
@@ -826,7 +826,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
826 { 826 {
827 Evas_Canvas3D_Light *light = NULL; 827 Evas_Canvas3D_Light *light = NULL;
828 828
829 rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 829 rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
830 light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, ed->base->evas); 830 light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, ed->base->evas);
831 evas_canvas3d_node_light_set(rp->node, light); 831 evas_canvas3d_node_light_set(rp->node, light);
832 832
@@ -838,7 +838,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
838 { 838 {
839 Evas_Canvas3D_Camera *camera = NULL; 839 Evas_Canvas3D_Camera *camera = NULL;
840 840
841 rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 841 rp->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, ed->base->evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
842 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, ed->base->evas); 842 camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, ed->base->evas);
843 evas_canvas3d_node_camera_set(rp->node, camera); 843 evas_canvas3d_node_camera_set(rp->node, camera);
844 844
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index df981573f0..a43dad8854 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -202,13 +202,13 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
202 eet_data->vio.tell = eet_snd_file_tell; 202 eet_data->vio.tell = eet_snd_file_tell;
203 eet_data->offset = 0; 203 eet_data->offset = 0;
204 204
205 in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL, ecore_audio_obj_name_set(eoid, snd_id_str), ecore_audio_obj_in_speed_set(eoid, speed), ecore_audio_obj_vio_set(eoid, &eet_data->vio, eet_data, _free), eo_event_callback_add(eoid, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL)); 205 in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL, ecore_audio_obj_name_set(eo_self, snd_id_str), ecore_audio_obj_in_speed_set(eo_self, speed), ecore_audio_obj_vio_set(eo_self, &eet_data->vio, eet_data, _free), eo_event_callback_add(eo_self, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
206 if (!out) 206 if (!out)
207 { 207 {
208#if HAVE_COREAUDIO 208#if HAVE_COREAUDIO
209 out = eo_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL); 209 out = eo_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
210#elif HAVE_PULSE 210#elif HAVE_PULSE
211 out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, eo_event_callback_add(eoid, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL)); 211 out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, eo_event_callback_add(eo_self, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
212#endif 212#endif
213 if (out) outs++; 213 if (out) outs++;
214 } 214 }
@@ -280,7 +280,7 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
280#if HAVE_COREAUDIO 280#if HAVE_COREAUDIO
281 out = eo_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL); 281 out = eo_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
282#elif HAVE_PULSE 282#elif HAVE_PULSE
283 out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, eo_event_callback_add(eoid, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL)); 283 out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, eo_event_callback_add(eo_self, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
284#endif 284#endif
285 if (out) outs++; 285 if (out) outs++;
286 } 286 }
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index 1d96750cc3..6d5dba46f5 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -147,7 +147,7 @@ _efl_model_evt_added_ecore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void
147 Efl_Model_Children_Event cevt; 147 Efl_Model_Children_Event cevt;
148 Eina_Value path; 148 Eina_Value path;
149 149
150 cevt.child = eo_add_ref(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(eoid, evt->filename)); 150 cevt.child = eo_add_ref(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(eo_self, evt->filename));
151 priv->children_list = eina_list_append(priv->children_list, cevt.child); 151 priv->children_list = eina_list_append(priv->children_list, cevt.child);
152 cevt.index = eina_list_count(priv->children_list); 152 cevt.index = eina_list_count(priv->children_list);
153 153
@@ -407,7 +407,7 @@ _eio_main_children_load_cb(void *data, Eio_File *handler EINA_UNUSED, const Eina
407 Eio_Model_Data *priv = data; 407 Eio_Model_Data *priv = data;
408 EINA_SAFETY_ON_NULL_RETURN(priv); 408 EINA_SAFETY_ON_NULL_RETURN(priv);
409 409
410 child = eo_add(MY_CLASS, NULL, eio_model_path_set(eoid, info->path)); 410 child = eo_add(MY_CLASS, NULL, eio_model_path_set(eo_self, info->path));
411 eina_spinlock_take(&priv->filter_lock); 411 eina_spinlock_take(&priv->filter_lock);
412 if (priv->filter_cb) 412 if (priv->filter_cb)
413 eio_model_children_filter_set(child, priv->filter_cb, priv->filter_userdata); 413 eio_model_children_filter_set(child, priv->filter_cb, priv->filter_userdata);
diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index ebd758be2b..e8f93fe8d2 100644
--- a/src/lib/eldbus/eldbus_model_connection.c
+++ b/src/lib/eldbus/eldbus_model_connection.c
@@ -345,7 +345,7 @@ _eldbus_model_connection_names_list_cb(void *data,
345 { 345 {
346 DBG("(%p): bus = %s", pd->obj, bus); 346 DBG("(%p): bus = %s", pd->obj, bus);
347 347
348 Eo *child = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_connection_constructor(eoid, pd->connection, bus, "/")); 348 Eo *child = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_connection_constructor(eo_self, pd->connection, bus, "/"));
349 349
350 pd->children_list = eina_list_append(pd->children_list, child); 350 pd->children_list = eina_list_append(pd->children_list, child);
351 } 351 }
diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c
index 240d657e77..e1462b789e 100644
--- a/src/lib/eldbus/eldbus_model_object.c
+++ b/src/lib/eldbus/eldbus_model_object.c
@@ -532,7 +532,7 @@ _eldbus_model_object_create_children(Eldbus_Model_Object_Data *pd, Eldbus_Object
532 WRN("(%p) Creating child: bus = %s, path = %s, interface = %s", pd->obj, pd->bus, current_path, interface->name); 532 WRN("(%p) Creating child: bus = %s, path = %s, interface = %s", pd->obj, pd->bus, current_path, interface->name);
533 533
534 // TODO: increment reference to keep 'interface' in memory 534 // TODO: increment reference to keep 'interface' in memory
535 child = eo_add_ref(ELDBUS_MODEL_PROXY_CLASS, NULL, eldbus_model_proxy_constructor(eoid, object, interface)); 535 child = eo_add_ref(ELDBUS_MODEL_PROXY_CLASS, NULL, eldbus_model_proxy_constructor(eo_self, object, interface));
536 536
537 pd->children_list = eina_list_append(pd->children_list, child); 537 pd->children_list = eina_list_append(pd->children_list, child);
538 } 538 }
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 2e660f4116..9196e4b995 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -325,7 +325,7 @@ _eldbus_model_proxy_create_methods_children(Eldbus_Model_Proxy_Data *pd)
325 325
326 INF("(%p) Creating method child: bus = %s, path = %s, method = %s::%s", pd->obj, bus, path, interface_name, method_name); 326 INF("(%p) Creating method child: bus = %s, path = %s, method = %s::%s", pd->obj, bus, path, interface_name, method_name);
327 327
328 child = eo_add(ELDBUS_MODEL_METHOD_CLASS, NULL, eldbus_model_method_constructor(eoid, pd->proxy, method)); 328 child = eo_add(ELDBUS_MODEL_METHOD_CLASS, NULL, eldbus_model_method_constructor(eo_self, pd->proxy, method));
329 329
330 pd->children_list = eina_list_append(pd->children_list, child); 330 pd->children_list = eina_list_append(pd->children_list, child);
331 } 331 }
@@ -359,7 +359,7 @@ _eldbus_model_proxy_create_signals_children(Eldbus_Model_Proxy_Data *pd)
359 359
360 DBG("(%p) Creating signal child: bus = %s, path = %s, signal = %s::%s", pd->obj, bus, path, interface_name, signal_name); 360 DBG("(%p) Creating signal child: bus = %s, path = %s, signal = %s::%s", pd->obj, bus, path, interface_name, signal_name);
361 361
362 child = eo_add(ELDBUS_MODEL_SIGNAL_CLASS, NULL, eldbus_model_signal_constructor(eoid, pd->proxy, signal)); 362 child = eo_add(ELDBUS_MODEL_SIGNAL_CLASS, NULL, eldbus_model_signal_constructor(eo_self, pd->proxy, signal));
363 363
364 pd->children_list = eina_list_append(pd->children_list, child); 364 pd->children_list = eina_list_append(pd->children_list, child);
365 } 365 }
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index 5e0944d929..54f4f07b73 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -1012,7 +1012,7 @@ evas_canvas3d_node_add(Evas *e, Evas_Canvas3D_Node_Type type)
1012 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 1012 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
1013 return NULL; 1013 return NULL;
1014 MAGIC_CHECK_END(); 1014 MAGIC_CHECK_END();
1015 Evas_Object *eo_obj = eo_add(MY_CLASS, e, evas_canvas3d_node_constructor(eoid, type)); 1015 Evas_Object *eo_obj = eo_add(MY_CLASS, e, evas_canvas3d_node_constructor(eo_self, type));
1016 return eo_obj; 1016 return eo_obj;
1017} 1017}
1018 1018
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 9e69a4e481..8b78241cdb 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -4301,17 +4301,14 @@ EAPI Evas_Object *
4301evas_object_image_add(Evas *eo_e) 4301evas_object_image_add(Evas *eo_e)
4302{ 4302{
4303 EINA_SAFETY_ON_FALSE_RETURN_VAL(eo_isa(eo_e, EVAS_CANVAS_CLASS), NULL); 4303 EINA_SAFETY_ON_FALSE_RETURN_VAL(eo_isa(eo_e, EVAS_CANVAS_CLASS), NULL);
4304 return eo_add(EVAS_IMAGE_CLASS, eo_e, 4304 return eo_add(EVAS_IMAGE_CLASS, eo_e, efl_gfx_fill_filled_set(eo_self, EINA_FALSE), evas_obj_legacy_ctor(eo_self));
4305 efl_gfx_fill_filled_set(eoid, EINA_FALSE),
4306 evas_obj_legacy_ctor(eoid));
4307} 4305}
4308 4306
4309EAPI Evas_Object * 4307EAPI Evas_Object *
4310evas_object_image_filled_add(Evas *eo_e) 4308evas_object_image_filled_add(Evas *eo_e)
4311{ 4309{
4312 EINA_SAFETY_ON_FALSE_RETURN_VAL(eo_isa(eo_e, EVAS_CANVAS_CLASS), NULL); 4310 EINA_SAFETY_ON_FALSE_RETURN_VAL(eo_isa(eo_e, EVAS_CANVAS_CLASS), NULL);
4313 return eo_add(EVAS_IMAGE_CLASS, eo_e, 4311 return eo_add(EVAS_IMAGE_CLASS, eo_e, evas_obj_legacy_ctor(eo_self));
4314 evas_obj_legacy_ctor(eoid));
4315} 4312}
4316 4313
4317EAPI void 4314EAPI void
diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c
index 7d766a55da..c7ca580df6 100644
--- a/src/lib/evas/canvas/evas_vg_container.c
+++ b/src/lib/evas/canvas/evas_vg_container.c
@@ -155,7 +155,7 @@ _efl_vg_container_efl_vg_base_dup(Eo *obj,
155 { 155 {
156 // By setting parent, we automatically reference 156 // By setting parent, we automatically reference
157 // this new object as a child of obj. Magic at work ! 157 // this new object as a child of obj. Magic at work !
158 (void) eo_add_ref(eo_class_get(child), obj, efl_vg_dup(eoid, child)); 158 (void) eo_add_ref(eo_class_get(child), obj, efl_vg_dup(eo_self, child));
159 } 159 }
160} 160}
161 161
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index 3a80b63594..c5eff086be 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -778,7 +778,7 @@ _efl_vg_base_dup(Eo *obj, Efl_VG_Base_Data *pd, const Efl_VG_Base *from)
778 _efl_vg_clean_object(&pd->mask); 778 _efl_vg_clean_object(&pd->mask);
779 if (fromd->mask) 779 if (fromd->mask)
780 { 780 {
781 pd->mask = eo_add(eo_class_get(fromd->mask), obj, efl_vg_dup(eoid, pd->mask)); 781 pd->mask = eo_add(eo_class_get(fromd->mask), obj, efl_vg_dup(eo_self, pd->mask));
782 } 782 }
783 783
784 pd->x = fromd->x; 784 pd->x = fromd->x;
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 312953a46f..fe2c902331 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -232,17 +232,17 @@ _efl_vg_shape_efl_vg_base_dup(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, const
232 232
233 if (fromd->fill) 233 if (fromd->fill)
234 { 234 {
235 fill = eo_add(eo_class_get(fromd->fill), parent, efl_vg_dup(eoid, fromd->fill)); 235 fill = eo_add(eo_class_get(fromd->fill), parent, efl_vg_dup(eo_self, fromd->fill));
236 } 236 }
237 237
238 if (fromd->stroke.fill) 238 if (fromd->stroke.fill)
239 { 239 {
240 stroke_fill = eo_add(eo_class_get(fromd->stroke.fill), parent, efl_vg_dup(eoid, fromd->stroke.fill)); 240 stroke_fill = eo_add(eo_class_get(fromd->stroke.fill), parent, efl_vg_dup(eo_self, fromd->stroke.fill));
241 } 241 }
242 242
243 if (fromd->stroke.marker) 243 if (fromd->stroke.marker)
244 { 244 {
245 stroke_marker = eo_add(eo_class_get(fromd->stroke.marker), parent, efl_vg_dup(eoid, fromd->stroke.marker)); 245 stroke_marker = eo_add(eo_class_get(fromd->stroke.marker), parent, efl_vg_dup(eo_self, fromd->stroke.marker));
246 } 246 }
247 247
248 efl_vg_shape_fill_set(obj, fill); 248 efl_vg_shape_fill_set(obj, fill);
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 11f9581ac7..a672e81c1a 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -2503,13 +2503,13 @@ eng_ector_buffer_wrap(void *data EINA_UNUSED, Evas *evas, void *engine_image, Ei
2503 { 2503 {
2504 RGBA_Image *im = engine_image; 2504 RGBA_Image *im = engine_image;
2505 2505
2506 buf = eo_add(EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eoid, evas, im)); 2506 buf = eo_add(EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eo_self, evas, im));
2507 } 2507 }
2508 else 2508 else
2509 { 2509 {
2510 Evas_GL_Image *im = engine_image; 2510 Evas_GL_Image *im = engine_image;
2511 2511
2512 buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eoid, evas, im)); 2512 buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eo_self, evas, im));
2513 } 2513 }
2514 return buf; 2514 return buf;
2515} 2515}
@@ -2570,7 +2570,7 @@ eng_ector_buffer_new(void *data, Evas *evas, void *pixels,
2570 2570
2571 gc = re->window_gl_context_get(re->software.ob); 2571 gc = re->window_gl_context_get(re->software.ob);
2572 im = evas_gl_common_image_surface_new(gc, iw, ih, EINA_TRUE); 2572 im = evas_gl_common_image_surface_new(gc, iw, ih, EINA_TRUE);
2573 buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eoid, evas, im)); 2573 buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eo_self, evas, im));
2574 im->references--; 2574 im->references--;
2575 } 2575 }
2576 return buf; 2576 return buf;
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index c28872cf0b..8b02bf7739 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -3785,7 +3785,7 @@ eng_ector_buffer_wrap(void *data EINA_UNUSED, Evas *e, void *engine_image, Eina_
3785 3785
3786 if (!ie) return NULL; 3786 if (!ie) return NULL;
3787 3787
3788 buf = eo_add(EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, evas_ector_buffer_engine_image_set(eoid, e, ie)); 3788 buf = eo_add(EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, evas_ector_buffer_engine_image_set(eo_self, e, ie));
3789 3789
3790 return buf; 3790 return buf;
3791} 3791}
@@ -3804,7 +3804,7 @@ eng_ector_buffer_new(void *data EINA_UNUSED, Evas *evas, void *pixels,
3804 3804
3805 if ((flags & (ECTOR_BUFFER_FLAG_RENDERABLE | ECTOR_BUFFER_FLAG_DRAWABLE)) == 0) 3805 if ((flags & (ECTOR_BUFFER_FLAG_RENDERABLE | ECTOR_BUFFER_FLAG_DRAWABLE)) == 0)
3806 { 3806 {
3807 buf = eo_add(ECTOR_SOFTWARE_BUFFER_CLASS, evas, ector_buffer_pixels_set(eoid, pixels, width, height, stride, cspace, writeable, l, r, t, b)); 3807 buf = eo_add(ECTOR_SOFTWARE_BUFFER_CLASS, evas, ector_buffer_pixels_set(eo_self, pixels, width, height, stride, cspace, writeable, l, r, t, b));
3808 } 3808 }
3809 else 3809 else
3810 { 3810 {
diff --git a/src/tests/ecore/ecore_test_animator.c b/src/tests/ecore/ecore_test_animator.c
index e2f17bcd9c..c4487e79e7 100644
--- a/src/tests/ecore/ecore_test_animator.c
+++ b/src/tests/ecore/ecore_test_animator.c
@@ -30,7 +30,7 @@ START_TEST(ecore_test_animators)
30 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n"); 30 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
31 31
32 ecore_animator_frametime_set(interval1); 32 ecore_animator_frametime_set(interval1);
33 animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(eoid, 1, _anim_cb, &interval1)); 33 animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(eo_self, 1, _anim_cb, &interval1));
34 34
35 fail_if(!animator); 35 fail_if(!animator);
36 36
@@ -38,7 +38,7 @@ START_TEST(ecore_test_animators)
38 38
39 ecore_animator_frametime_set(interval2); 39 ecore_animator_frametime_set(interval2);
40 prev = 0; 40 prev = 0;
41 animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(eoid, 1, _anim_cb, &interval2)); 41 animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(eo_self, 1, _anim_cb, &interval2));
42 fail_if(!animator); 42 fail_if(!animator);
43 43
44 ecore_main_loop_begin(); 44 ecore_main_loop_begin();
diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c
index 5873d7ab83..dc89c6f14a 100644
--- a/src/tests/eio/eio_model_test_file.c
+++ b/src/tests/eio/eio_model_test_file.c
@@ -165,7 +165,7 @@ START_TEST(eio_model_test_test_file)
165 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n"); 165 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
166 fail_if(!eio_init(), "ERROR: Cannot init EIO!\n"); 166 fail_if(!eio_init(), "ERROR: Cannot init EIO!\n");
167 167
168 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eoid, EFL_MODEL_TEST_FILENAME_PATH)); 168 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, EFL_MODEL_TEST_FILENAME_PATH));
169 fail_if(!filemodel, "ERROR: Cannot init model!\n"); 169 fail_if(!filemodel, "ERROR: Cannot init model!\n");
170 170
171 eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_LOAD_STATUS, _load_status_cb, NULL); 171 eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_LOAD_STATUS, _load_status_cb, NULL);
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index b718edd137..dd92ef0a51 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -125,7 +125,7 @@ START_TEST(eio_model_test_test_monitor_add)
125 125
126 tmpdir = eina_environment_tmp_get(); 126 tmpdir = eina_environment_tmp_get();
127 127
128 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eoid, tmpdir)); 128 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, tmpdir));
129 fail_if(!filemodel, "ERROR: Cannot init model!\n"); 129 fail_if(!filemodel, "ERROR: Cannot init model!\n");
130 130
131 eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_CHILD_ADDED, _children_added_cb, NULL); 131 eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_CHILD_ADDED, _children_added_cb, NULL);
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index 5439217e46..b89f1e9ac9 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -123,7 +123,7 @@ check_property(Eo *object, const char *property_name, const char *expected_value
123Eo * 123Eo *
124create_connection(void) 124create_connection(void)
125{ 125{
126 Eo *connection = eo_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, NULL, eldbus_model_connection_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE)); 126 Eo *connection = eo_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, NULL, eldbus_model_connection_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE));
127 ck_assert_ptr_ne(NULL, connection); 127 ck_assert_ptr_ne(NULL, connection);
128 return connection; 128 return connection;
129} 129}
@@ -139,7 +139,7 @@ create_and_load_connection(void)
139Eo * 139Eo *
140create_object(void) 140create_object(void)
141{ 141{
142 Eo *object = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH)); 142 Eo *object = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH));
143 ck_assert_ptr_ne(NULL, object); 143 ck_assert_ptr_ne(NULL, object);
144 return object; 144 return object;
145} 145}
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_method.c b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
index 51ed4afc34..1c78995ab4 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_method.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
@@ -29,7 +29,7 @@ _setup(void)
29 29
30 fake_server = fake_server_start(&fake_server_data); 30 fake_server = fake_server_start(&fake_server_data);
31 31
32 fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); 32 fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
33 ck_assert_ptr_ne(NULL, fake_server_object); 33 ck_assert_ptr_ne(NULL, fake_server_object);
34 34
35 efl_model_load_and_wait_for_load_status(fake_server_object, EFL_MODEL_LOAD_STATUS_LOADED); 35 efl_model_load_and_wait_for_load_status(fake_server_object, EFL_MODEL_LOAD_STATUS_LOADED);
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
index 7c3187430e..8cbfe45250 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
@@ -27,7 +27,7 @@ _setup(void)
27 27
28 fake_server = fake_server_start(&fake_server_data); 28 fake_server = fake_server_start(&fake_server_data);
29 29
30 fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); 30 fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
31 ck_assert_ptr_ne(NULL, fake_server_object); 31 ck_assert_ptr_ne(NULL, fake_server_object);
32 32
33 efl_model_load_and_wait_for_load_status(fake_server_object, EFL_MODEL_LOAD_STATUS_LOADED); 33 efl_model_load_and_wait_for_load_status(fake_server_object, EFL_MODEL_LOAD_STATUS_LOADED);
diff --git a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
index 09ef4cc9ca..ec62822c3a 100644
--- a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
+++ b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
@@ -33,7 +33,7 @@ _setup(void)
33 }; 33 };
34 fake_server = fake_server_start(&fake_server_data); 34 fake_server = fake_server_start(&fake_server_data);
35 35
36 fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); 36 fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
37 ck_assert_ptr_ne(NULL, fake_server_object); 37 ck_assert_ptr_ne(NULL, fake_server_object);
38 38
39 efl_model_load_and_wait_for_load_status(fake_server_object, EFL_MODEL_LOAD_STATUS_LOADED); 39 efl_model_load_and_wait_for_load_status(fake_server_object, EFL_MODEL_LOAD_STATUS_LOADED);
diff --git a/src/tests/eo/constructors/constructors_main.c b/src/tests/eo/constructors/constructors_main.c
index 5844e46624..45cd50dfb9 100644
--- a/src/tests/eo/constructors/constructors_main.c
+++ b/src/tests/eo/constructors/constructors_main.c
@@ -76,14 +76,14 @@ main(int argc, char *argv[])
76 fail_if(a != 0); 76 fail_if(a != 0);
77 77
78 my_init_count = 0; 78 my_init_count = 0;
79 obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eoid, 7)); 79 obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eo_self, 7));
80 fail_if(!obj); 80 fail_if(!obj);
81 fail_if(my_init_count != 2); 81 fail_if(my_init_count != 2);
82 a = simple_a_get(obj); 82 a = simple_a_get(obj);
83 fail_if(a != 7); 83 fail_if(a != 7);
84 84
85 my_init_count = 0; 85 my_init_count = 0;
86 obj = eo_add(SIMPLE_CLASS, NULL, simple_b_set(eoid, 6), simple_a_set(eoid, -1), b = simple_b_get(eoid)); 86 obj = eo_add(SIMPLE_CLASS, NULL, simple_b_set(eo_self, 6), simple_a_set(eo_self, -1), b = simple_b_get(eo_self));
87 fail_if(obj); 87 fail_if(obj);
88 fail_if(b != 6); 88 fail_if(b != 6);
89 fail_if(my_init_count != 0); 89 fail_if(my_init_count != 0);
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 2960902715..0a9b74c7d5 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -798,24 +798,24 @@ START_TEST(eo_add_do_and_custom)
798 Eo *obj = NULL; 798 Eo *obj = NULL;
799 eo_init(); 799 eo_init();
800 800
801 obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(eoid)); 801 obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(eo_self));
802 fail_if(!obj); 802 fail_if(!obj);
803 eo_unref(obj); 803 eo_unref(obj);
804 804
805 obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eoid, 7)); 805 obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eo_self, 7));
806 fail_if(!obj); 806 fail_if(!obj);
807 pd = eo_data_scope_get(obj, SIMPLE_CLASS); 807 pd = eo_data_scope_get(obj, SIMPLE_CLASS);
808 fail_if(pd->a != 7); 808 fail_if(pd->a != 7);
809 eo_unref(obj); 809 eo_unref(obj);
810 810
811 obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(eoid), simple_a_set(eoid, 7)); 811 obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(eo_self), simple_a_set(eo_self, 7));
812 fail_if(!obj); 812 fail_if(!obj);
813 pd = eo_data_scope_get(obj, SIMPLE_CLASS); 813 pd = eo_data_scope_get(obj, SIMPLE_CLASS);
814 fail_if(pd->a != 7); 814 fail_if(pd->a != 7);
815 eo_unref(obj); 815 eo_unref(obj);
816 816
817 Eina_Bool finalized; 817 Eina_Bool finalized;
818 obj = eo_add(SIMPLE_CLASS, NULL, finalized = eo_finalized_get(eoid)); 818 obj = eo_add(SIMPLE_CLASS, NULL, finalized = eo_finalized_get(eo_self));
819 fail_if(finalized); 819 fail_if(finalized);
820 820
821 finalized = eo_finalized_get(obj); 821 finalized = eo_finalized_get(obj);
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index b25b00b672..3f2231d88d 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -94,7 +94,7 @@ _thread_job(void *data, Eina_Thread t EINA_UNUSED)
94 fail_if(EINA_LOCK_SUCCEED != eina_spinlock_take(&locks[0])); 94 fail_if(EINA_LOCK_SUCCEED != eina_spinlock_take(&locks[0]));
95 } 95 }
96 96
97 obj = eo_add(THREAD_TEST_CLASS, NULL, thread_test_constructor(eoid, v)); 97 obj = eo_add(THREAD_TEST_CLASS, NULL, thread_test_constructor(eo_self, v));
98 98
99 thread_test_try_swap_stack(obj); 99 thread_test_try_swap_stack(obj);
100 v = thread_test_v_get(obj); 100 v = thread_test_v_get(obj);
diff --git a/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c b/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c
index 1740e61466..3ad0631a21 100644
--- a/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c
+++ b/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c
@@ -132,7 +132,7 @@ _constructor_method_class_classoutmethod1(Eo* obj EINA_UNUSED, Constructor_Metho
132{ 132{
133 fprintf(stderr, "classoutmethod1\n"); 133 fprintf(stderr, "classoutmethod1\n");
134 fflush(stderr); 134 fflush(stderr);
135 return eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eoid, one), constructor_method_class_constructor2(eoid, two)); 135 return eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eo_self, one), constructor_method_class_constructor2(eo_self, two));
136} 136}
137 137
138EOLIAN static void 138EOLIAN static void
@@ -140,7 +140,7 @@ _constructor_method_class_classoutmethod2(Eo* obj EINA_UNUSED, Constructor_Metho
140{ 140{
141 fprintf(stderr, "classoutmethod2\n"); 141 fprintf(stderr, "classoutmethod2\n");
142 fflush(stderr); 142 fflush(stderr);
143 *out_class = eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eoid, one), constructor_method_class_constructor2(eoid, two)); 143 *out_class = eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eo_self, one), constructor_method_class_constructor2(eo_self, two));
144} 144}
145 145
146 146
diff --git a/src/tests/evas/evas_test_image.c b/src/tests/evas/evas_test_image.c
index 0f7514c3a0..39a923bf1d 100644
--- a/src/tests/evas/evas_test_image.c
+++ b/src/tests/evas/evas_test_image.c
@@ -646,7 +646,7 @@ START_TEST(evas_object_image_defaults)
646 eo_del(o); 646 eo_del(o);
647 647
648 /* test eo defaults */ 648 /* test eo defaults */
649 eo_add(&o, EVAS_IMAGE_CLASS, e); 649 o = eo_add(EVAS_IMAGE_CLASS, e);
650 fail_if(!efl_gfx_fill_filled_get(o)); 650 fail_if(!efl_gfx_fill_filled_get(o));
651 eo_del(o); 651 eo_del(o);
652 652