summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-15 15:30:32 +0000
committerTom Hacohen <tom@stosb.com>2016-03-15 15:30:32 +0000
commitd8f76f5fb61082a69caf20c90c1ed6e036b1cc78 (patch)
tree4e9d2ede499b621c55ecb68b92496e1999d7ef13 /legacy
parentcaa7039b2ca2078a46e1490183b362bac806328b (diff)
Change elm according to the renaming of the eo_add() current object.
Diffstat (limited to 'legacy')
-rw-r--r--legacy/elementary/src/bin/test_application_server.c4
-rw-r--r--legacy/elementary/src/bin/test_task_switcher.c2
-rw-r--r--legacy/elementary/src/examples/evas3d_map_example.c10
-rw-r--r--legacy/elementary/src/examples/evas3d_object_on_button_example.c8
-rw-r--r--legacy/elementary/src/examples/evas3d_scene_on_button_example.c8
-rw-r--r--legacy/elementary/src/examples/filemvc.c8
-rw-r--r--legacy/elementary/src/examples/fileviewlist.c4
-rw-r--r--legacy/elementary/src/examples/performance/graphical.c12
-rw-r--r--legacy/elementary/src/examples/sphere_hunter/evas_3d_sphere_hunter.c12
-rw-r--r--legacy/elementary/src/lib/elc_ctxpopup.c4
-rw-r--r--legacy/elementary/src/lib/elm_app_client.c4
-rw-r--r--legacy/elementary/src/lib/elm_app_server.c2
-rw-r--r--legacy/elementary/src/lib/elm_glview.c4
-rw-r--r--legacy/elementary/src/lib/elm_win.c4
14 files changed, 43 insertions, 43 deletions
diff --git a/legacy/elementary/src/bin/test_application_server.c b/legacy/elementary/src/bin/test_application_server.c
index 1272ff6195..d05d74e3ea 100644
--- a/legacy/elementary/src/bin/test_application_server.c
+++ b/legacy/elementary/src/bin/test_application_server.c
@@ -100,7 +100,7 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED,
100 return NULL; 100 return NULL;
101 } 101 }
102 102
103 view = eo_add(ELM_APP_SERVER_VIEW_CLASS, app_server, elm_app_server_view_id_set(eoid, NULL)); 103 view = eo_add(ELM_APP_SERVER_VIEW_CLASS, app_server, elm_app_server_view_id_set(eo_self, NULL));
104 104
105 id = elm_app_server_view_id_get(view); 105 id = elm_app_server_view_id_get(view);
106 pkg = elm_app_server_package_get(app_server); 106 pkg = elm_app_server_package_get(app_server);
@@ -141,7 +141,7 @@ test_application_server_common(const char *pkg)
141 Elm_App_Server_View *view; 141 Elm_App_Server_View *view;
142 Elm_App_Server *server; 142 Elm_App_Server *server;
143 143
144 server = eo_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(eoid, pkg, _create_view_cb)); 144 server = eo_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(eo_self, pkg, _create_view_cb));
145 elm_app_server_title_set(server, pkg); 145 elm_app_server_title_set(server, pkg);
146 views_iter = elm_app_server_views_get(server); 146 views_iter = elm_app_server_views_get(server);
147 eo_event_callback_add(server, ELM_APP_SERVER_EVENT_TERMINATE, _terminate_cb, NULL); 147 eo_event_callback_add(server, ELM_APP_SERVER_EVENT_TERMINATE, _terminate_cb, NULL);
diff --git a/legacy/elementary/src/bin/test_task_switcher.c b/legacy/elementary/src/bin/test_task_switcher.c
index 1c2b441dd8..fae686edef 100644
--- a/legacy/elementary/src/bin/test_task_switcher.c
+++ b/legacy/elementary/src/bin/test_task_switcher.c
@@ -303,7 +303,7 @@ _app_open(const char *package)
303 return; 303 return;
304 } 304 }
305 305
306 app = eo_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(eoid, package)); 306 app = eo_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(eo_self, package));
307 eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, _view_list_update_cb, table); 307 eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, _view_list_update_cb, table);
308 eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_CREATED, _view_list_update_cb, table); 308 eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_CREATED, _view_list_update_cb, table);
309 eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_DELETED, _view_list_update_cb, table); 309 eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_DELETED, _view_list_update_cb, table);
diff --git a/legacy/elementary/src/examples/evas3d_map_example.c b/legacy/elementary/src/examples/evas3d_map_example.c
index ca584527a2..eefa029a8b 100644
--- a/legacy/elementary/src/examples/evas3d_map_example.c
+++ b/legacy/elementary/src/examples/evas3d_map_example.c
@@ -881,7 +881,7 @@ skybox_setup(void)
881 evas_canvas3d_material_color_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0); 881 evas_canvas3d_material_color_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0);
882 evas_canvas3d_material_shininess_set(skybox_material, 50.0); 882 evas_canvas3d_material_shininess_set(skybox_material, 50.0);
883 883
884 skybox_mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 884 skybox_mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
885 evas_canvas3d_node_member_add(root_node, skybox_mesh_node); 885 evas_canvas3d_node_member_add(root_node, skybox_mesh_node);
886 evas_canvas3d_node_mesh_add(skybox_mesh_node, skybox_mesh); 886 evas_canvas3d_node_mesh_add(skybox_mesh_node, skybox_mesh);
887 evas_canvas3d_mesh_shade_mode_set(skybox_mesh, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); 887 evas_canvas3d_mesh_shade_mode_set(skybox_mesh, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
@@ -940,7 +940,7 @@ camera_setup(void)
940 camera_right_vec.y = 0.0; 940 camera_right_vec.y = 0.0;
941 camera_right_vec.z = 0.0; 941 camera_right_vec.z = 0.0;
942 942
943 camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 943 camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
944 evas_canvas3d_node_camera_set(camera_node, camera); 944 evas_canvas3d_node_camera_set(camera_node, camera);
945 evas_canvas3d_node_position_set(camera_node, camera_pos.x, camera_pos.y, camera_pos.z); 945 evas_canvas3d_node_position_set(camera_node, camera_pos.x, camera_pos.y, camera_pos.z);
946 evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z); 946 evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z);
@@ -955,7 +955,7 @@ light_setup(void)
955 evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0); 955 evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0);
956 evas_canvas3d_light_specular_set(light, 0.2, 0.2, 0.2, 1.0); 956 evas_canvas3d_light_specular_set(light, 0.2, 0.2, 0.2, 1.0);
957 957
958 light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 958 light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
959 evas_canvas3d_node_light_set(light_node, light); 959 evas_canvas3d_node_light_set(light_node, light);
960 evas_canvas3d_node_position_set(light_node, 0.0, 0.0, MAX_CAMERA_DISTANCE); 960 evas_canvas3d_node_position_set(light_node, 0.0, 0.0, MAX_CAMERA_DISTANCE);
961 evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 961 evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -1001,7 +1001,7 @@ mesh_setup(void)
1001 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0); 1001 evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0);
1002 evas_canvas3d_material_shininess_set(material, 50.0); 1002 evas_canvas3d_material_shininess_set(material, 50.0);
1003 1003
1004 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 1004 mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
1005 evas_canvas3d_node_member_add(root_node, mesh_node); 1005 evas_canvas3d_node_member_add(root_node, mesh_node);
1006 evas_canvas3d_node_mesh_add(mesh_node, mesh); 1006 evas_canvas3d_node_mesh_add(mesh_node, mesh);
1007 evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP); 1007 evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP);
@@ -1169,7 +1169,7 @@ elm_main(int argc, char **argv)
1169 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 1169 scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
1170 1170
1171 /* Add a root node for the scene. */ 1171 /* Add a root node for the scene. */
1172 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 1172 root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
1173 1173
1174 skybox_setup(); 1174 skybox_setup();
1175 texture_source_setup(); 1175 texture_source_setup();
diff --git a/legacy/elementary/src/examples/evas3d_object_on_button_example.c b/legacy/elementary/src/examples/evas3d_object_on_button_example.c
index eb06dc01a3..4aff42eb87 100644
--- a/legacy/elementary/src/examples/evas3d_object_on_button_example.c
+++ b/legacy/elementary/src/examples/evas3d_object_on_button_example.c
@@ -164,7 +164,7 @@ _camera_setup(Scene_Data *data)
164 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0); 164 evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0);
165 165
166 data->camera_node = 166 data->camera_node =
167 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 167 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
168 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 168 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
169 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 15.0); 169 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 15.0);
170 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1.0, 0.0); 170 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1.0, 0.0);
@@ -180,7 +180,7 @@ _light_setup(Scene_Data *data)
180 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 180 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
181 181
182 data->light_node = 182 data->light_node =
183 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(data->light_node, data->light); 184 evas_canvas3d_node_light_set(data->light_node, data->light);
185 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 185 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
186 evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 186 evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -220,7 +220,7 @@ _mesh_setup(Scene_Data *data)
220 evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE); 220 evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE);
221 221
222 data->mesh_node = 222 data->mesh_node =
223 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 223 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
224 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 224 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
225 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 225 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
226} 226}
@@ -233,7 +233,7 @@ _scene_setup(Scene_Data *data)
233 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); 233 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
234 234
235 data->root_node = 235 data->root_node =
236 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 236 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
237 237
238 _camera_setup(data); 238 _camera_setup(data);
239 _light_setup(data); 239 _light_setup(data);
diff --git a/legacy/elementary/src/examples/evas3d_scene_on_button_example.c b/legacy/elementary/src/examples/evas3d_scene_on_button_example.c
index c7cf82c325..2e1aa5cfa0 100644
--- a/legacy/elementary/src/examples/evas3d_scene_on_button_example.c
+++ b/legacy/elementary/src/examples/evas3d_scene_on_button_example.c
@@ -125,7 +125,7 @@ _camera_setup(Scene_Data *data)
125 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0); 125 evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
126 126
127 data->camera_node = 127 data->camera_node =
128 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 128 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
129 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 129 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
130 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0); 130 evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
131 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 131 evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -141,7 +141,7 @@ _light_setup(Scene_Data *data)
141 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 141 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
142 142
143 data->light_node = 143 data->light_node =
144 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 144 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
145 evas_canvas3d_node_light_set(data->light_node, data->light); 145 evas_canvas3d_node_light_set(data->light_node, data->light);
146 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0); 146 evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
147 evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 147 evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -175,7 +175,7 @@ _mesh_setup(Scene_Data *data)
175 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material); 175 evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
176 176
177 data->mesh_node = 177 data->mesh_node =
178 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 178 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
179 evas_canvas3d_node_member_add(data->root_node, data->mesh_node); 179 evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
180 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh); 180 evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
181} 181}
@@ -188,7 +188,7 @@ _scene_setup(Scene_Data *data)
188 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0); 188 evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
189 189
190 data->root_node = 190 data->root_node =
191 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 191 eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
192 192
193 _camera_setup(data); 193 _camera_setup(data);
194 _light_setup(data); 194 _light_setup(data);
diff --git a/legacy/elementary/src/examples/filemvc.c b/legacy/elementary/src/examples/filemvc.c
index 6ef183e44b..f681e7c9ba 100644
--- a/legacy/elementary/src/examples/filemvc.c
+++ b/legacy/elementary/src/examples/filemvc.c
@@ -71,7 +71,7 @@ _tree_selected_cb(void *data, const Eo_Event *event)
71 71
72 efl_model_property_get(child, "path", &vpath); 72 efl_model_property_get(child, "path", &vpath);
73 eina_value_get(vpath, &path); 73 eina_value_get(vpath, &path);
74 model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eoid, path)); 74 model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, path));
75 efl_model_load(model); 75 efl_model_load(model);
76 elm_view_list_model_set(priv->fileview, model); 76 elm_view_list_model_set(priv->fileview, model);
77 return EINA_TRUE; 77 return EINA_TRUE;
@@ -137,13 +137,13 @@ elm_main(int argc, char **argv)
137 else dirname = EFL_MODEL_TEST_FILENAME_PATH; 137 else dirname = EFL_MODEL_TEST_FILENAME_PATH;
138 138
139 //treemodel 139 //treemodel
140 priv.treemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eoid, dirname)); 140 priv.treemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, dirname));
141 eio_model_children_filter_set(priv.treemodel, _filter_cb, NULL); 141 eio_model_children_filter_set(priv.treemodel, _filter_cb, NULL);
142 efl_model_load(priv.treemodel); 142 efl_model_load(priv.treemodel);
143 143
144 //treeview 144 //treeview
145 genlist = elm_genlist_add(win); 145 genlist = elm_genlist_add(win);
146 priv.treeview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eoid, genlist, ELM_GENLIST_ITEM_TREE, NULL)); 146 priv.treeview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eo_self, genlist, ELM_GENLIST_ITEM_TREE, NULL));
147 elm_view_list_property_connect(priv.treeview, "filename", "elm.text"); 147 elm_view_list_property_connect(priv.treeview, "filename", "elm.text");
148 elm_view_list_property_connect(priv.treeview, "icon", "elm.swallow.icon"); 148 elm_view_list_property_connect(priv.treeview, "icon", "elm.swallow.icon");
149 elm_view_list_model_set(priv.treeview, priv.treemodel); 149 elm_view_list_model_set(priv.treeview, priv.treemodel);
@@ -157,7 +157,7 @@ elm_main(int argc, char **argv)
157 eo_event_callback_add(priv.treeview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _tree_selected_cb, &priv); 157 eo_event_callback_add(priv.treeview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _tree_selected_cb, &priv);
158 //listview 158 //listview
159 genlist = elm_genlist_add(win); 159 genlist = elm_genlist_add(win);
160 priv.fileview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eoid, genlist, ELM_GENLIST_ITEM_NONE, "double_label")); 160 priv.fileview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eo_self, genlist, ELM_GENLIST_ITEM_NONE, "double_label"));
161 elm_view_list_property_connect(priv.fileview, "filename", "elm.text"); 161 elm_view_list_property_connect(priv.fileview, "filename", "elm.text");
162 elm_view_list_property_connect(priv.fileview, "size", "elm.text.sub"); 162 elm_view_list_property_connect(priv.fileview, "size", "elm.text.sub");
163 163
diff --git a/legacy/elementary/src/examples/fileviewlist.c b/legacy/elementary/src/examples/fileviewlist.c
index d91efdb237..4572e9d5d6 100644
--- a/legacy/elementary/src/examples/fileviewlist.c
+++ b/legacy/elementary/src/examples/fileviewlist.c
@@ -55,8 +55,8 @@ elm_main(int argc, char **argv)
55 evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 55 evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
56 evas_object_show(genlist); 56 evas_object_show(genlist);
57 57
58 priv.filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eoid, dirname)); 58 priv.filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, dirname));
59 priv.fileview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eoid, genlist, ELM_GENLIST_ITEM_TREE, "double_label")); 59 priv.fileview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eo_self, genlist, ELM_GENLIST_ITEM_TREE, "double_label"));
60 elm_view_list_model_set(priv.fileview, priv.filemodel); 60 elm_view_list_model_set(priv.fileview, priv.filemodel);
61 efl_model_load(priv.filemodel); 61 efl_model_load(priv.filemodel);
62 evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, &priv); 62 evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, &priv);
diff --git a/legacy/elementary/src/examples/performance/graphical.c b/legacy/elementary/src/examples/performance/graphical.c
index 7884591957..f5aafcf5e6 100644
--- a/legacy/elementary/src/examples/performance/graphical.c
+++ b/legacy/elementary/src/examples/performance/graphical.c
@@ -272,7 +272,7 @@ void _init_bounding()
272 evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh_box, 0, globalGraphical.material_box); 272 evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh_box, 0, globalGraphical.material_box);
273 273
274 globalGraphical.mesh_nodebox = 274 globalGraphical.mesh_nodebox =
275 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eoid, 0, -30.0, 0.0)); 275 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eo_self, 0, -30.0, 0.0));
276 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_nodebox); 276 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_nodebox);
277 evas_canvas3d_node_mesh_add(globalGraphical.mesh_nodebox, globalGraphical.mesh_box); 277 evas_canvas3d_node_mesh_add(globalGraphical.mesh_nodebox, globalGraphical.mesh_box);
278} 278}
@@ -359,7 +359,7 @@ _change_scene_setup()
359 for (i = 0; i < quantity; i++) 359 for (i = 0; i < quantity; i++)
360 { 360 {
361 globalGraphical.mesh_node = 361 globalGraphical.mesh_node =
362 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eoid, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20)); 362 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eo_self, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20));
363 if (globalGraphical.model_path) 363 if (globalGraphical.model_path)
364 evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2); 364 evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2);
365 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node); 365 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node);
@@ -397,14 +397,14 @@ _init_scene(Evas_Object *img)
397 globalGraphical.scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, globalGraphical.evas); 397 globalGraphical.scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, globalGraphical.evas);
398 398
399 /* Add the root node for the scene. */ 399 /* Add the root node for the scene. */
400 globalGraphical.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 400 globalGraphical.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
401 401
402 /* Add the camera. */ 402 /* Add the camera. */
403 globalGraphical.camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, globalGraphical.evas); 403 globalGraphical.camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, globalGraphical.evas);
404 evas_canvas3d_camera_projection_perspective_set(globalGraphical.camera, globalGraphical.angle, 1.0, 2.0, 1000.0); 404 evas_canvas3d_camera_projection_perspective_set(globalGraphical.camera, globalGraphical.angle, 1.0, 2.0, 1000.0);
405 405
406 globalGraphical.camera_node = 406 globalGraphical.camera_node =
407 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 407 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
408 evas_canvas3d_node_camera_set(globalGraphical.camera_node, globalGraphical.camera); 408 evas_canvas3d_node_camera_set(globalGraphical.camera_node, globalGraphical.camera);
409 evas_canvas3d_node_position_set(globalGraphical.camera_node, 0.0, 0.0, 25.0); 409 evas_canvas3d_node_position_set(globalGraphical.camera_node, 0.0, 0.0, 25.0);
410 evas_canvas3d_node_look_at_set(globalGraphical.camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 410 evas_canvas3d_node_look_at_set(globalGraphical.camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -418,7 +418,7 @@ _init_scene(Evas_Object *img)
418 evas_canvas3d_light_spot_cutoff_set(globalGraphical.light, globalGraphical.angle / 15); 418 evas_canvas3d_light_spot_cutoff_set(globalGraphical.light, globalGraphical.angle / 15);
419 419
420 globalGraphical.light_node = 420 globalGraphical.light_node =
421 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 421 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
422 evas_canvas3d_node_light_set(globalGraphical.light_node, globalGraphical.light); 422 evas_canvas3d_node_light_set(globalGraphical.light_node, globalGraphical.light);
423 evas_canvas3d_node_position_set(globalGraphical.light_node, 0.0, 100.0, 1.0); 423 evas_canvas3d_node_position_set(globalGraphical.light_node, 0.0, 100.0, 1.0);
424 evas_canvas3d_node_look_at_set(globalGraphical.light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 424 evas_canvas3d_node_look_at_set(globalGraphical.light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -474,7 +474,7 @@ _init_scene(Evas_Object *img)
474 for (i = 0; i < quantity; i++) 474 for (i = 0; i < quantity; i++)
475 { 475 {
476 globalGraphical.mesh_node = 476 globalGraphical.mesh_node =
477 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eoid, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20)); 477 eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eo_self, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20));
478 if (globalGraphical.model_path) 478 if (globalGraphical.model_path)
479 evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2); 479 evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2);
480 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node); 480 evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node);
diff --git a/legacy/elementary/src/examples/sphere_hunter/evas_3d_sphere_hunter.c b/legacy/elementary/src/examples/sphere_hunter/evas_3d_sphere_hunter.c
index 6de714d173..da6c73cbe8 100644
--- a/legacy/elementary/src/examples/sphere_hunter/evas_3d_sphere_hunter.c
+++ b/legacy/elementary/src/examples/sphere_hunter/evas_3d_sphere_hunter.c
@@ -438,7 +438,7 @@ _camera_setup(Scene_Data *data)
438 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas); 438 data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
439 evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 1.0, 1000.0); 439 evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 1.0, 1000.0);
440 440
441 data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA)); 441 data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
442 evas_canvas3d_node_camera_set(data->camera_node, data->camera); 442 evas_canvas3d_node_camera_set(data->camera_node, data->camera);
443 evas_canvas3d_node_position_set(data->camera_node, 0.0, 40, 70); 443 evas_canvas3d_node_position_set(data->camera_node, 0.0, 40, 70);
444 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); 444 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);
@@ -466,7 +466,7 @@ _light_setup(Scene_Data *data)
466 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0); 466 evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
467 evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 1000.0); 467 evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 1000.0);
468 468
469 data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT)); 469 data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
470 evas_canvas3d_node_light_set(data->light_node, data->light); 470 evas_canvas3d_node_light_set(data->light_node, data->light);
471 evas_canvas3d_node_position_set(data->light_node, 0.1, 25.0, 0.1); 471 evas_canvas3d_node_position_set(data->light_node, 0.1, 25.0, 0.1);
472 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); 472 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);
@@ -508,7 +508,7 @@ _create_bondar(Scene_Data *data, Evas_Real scale_x, Evas_Real scale_y, Evas_Real
508 508
509 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 509 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
510 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 510 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
511 node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 511 node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
512 512
513 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); 513 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
514 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE); 514 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -556,7 +556,7 @@ _create_cubes(Scene_Data *data, Evas_Real r, int count)
556 Eo *node = NULL; 556 Eo *node = NULL;
557 557
558 alpha = d_alpha * i * M_PI / 180; 558 alpha = d_alpha * i * M_PI / 180;
559 node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 559 node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
560 560
561 evas_canvas3d_node_mesh_add(node, data->mesh_cube); 561 evas_canvas3d_node_mesh_add(node, data->mesh_cube);
562 evas_canvas3d_node_position_set(node, r * sin(alpha), 2.0 + (r / 4 * sin(alpha)), r * cos(alpha)); 562 evas_canvas3d_node_position_set(node, r * sin(alpha), 2.0 + (r / 4 * sin(alpha)), r * cos(alpha));
@@ -575,7 +575,7 @@ _mesh_ball_setup(Scene_Data *data)
575 575
576 data->mesh_ball = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas); 576 data->mesh_ball = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
577 data->material_ball = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas); 577 data->material_ball = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
578 data->mesh_node_ball = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH)); 578 data->mesh_node_ball = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
579 579
580 /* Setup material for ball. */ 580 /* Setup material for ball. */
581 evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE); 581 evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
@@ -612,7 +612,7 @@ _scene_setup(Scene_Data *data, Evas_Real r, int count)
612 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas); 612 data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
613 613
614 /* Add the root node for the scene. */ 614 /* Add the root node for the scene. */
615 data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE)); 615 data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
616 616
617 evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT); 617 evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
618 evas_canvas3d_scene_shadows_enable_set(data->scene, EINA_TRUE); 618 evas_canvas3d_scene_shadows_enable_set(data->scene, EINA_TRUE);
diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/legacy/elementary/src/lib/elc_ctxpopup.c
index 68f65d43ca..89bbefae0d 100644
--- a/legacy/elementary/src/lib/elc_ctxpopup.c
+++ b/legacy/elementary/src/lib/elc_ctxpopup.c
@@ -1280,7 +1280,7 @@ _elm_ctxpopup_item_append(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Eva
1280{ 1280{
1281 Eo *eo_item; 1281 Eo *eo_item;
1282 1282
1283 eo_item = eo_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(eoid, func, data)); 1283 eo_item = eo_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(eo_self, func, data));
1284 if (!eo_item) return NULL; 1284 if (!eo_item) return NULL;
1285 1285
1286 ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item); 1286 ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item);
@@ -1374,7 +1374,7 @@ _elm_ctxpopup_item_prepend(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Ev
1374{ 1374{
1375 Eo *eo_item; 1375 Eo *eo_item;
1376 1376
1377 eo_item = eo_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(eoid, func, data)); 1377 eo_item = eo_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(eo_self, func, data));
1378 if (!eo_item) return NULL; 1378 if (!eo_item) return NULL;
1379 1379
1380 ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item); 1380 ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item);
diff --git a/legacy/elementary/src/lib/elm_app_client.c b/legacy/elementary/src/lib/elm_app_client.c
index ba6513d6da..fcdee64c86 100644
--- a/legacy/elementary/src/lib/elm_app_client.c
+++ b/legacy/elementary/src/lib/elm_app_client.c
@@ -37,7 +37,7 @@ _sub_path_process(Elm_App_Client *eo, Eldbus_Message_Iter *obj_iter, Elm_App_Cli
37 if (view) 37 if (view)
38 continue; 38 continue;
39 39
40 view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(eoid, obj_path)); 40 view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(eo_self, obj_path));
41 eina_hash_add(data->views, obj_path, view); 41 eina_hash_add(data->views, obj_path, view);
42 if (!loading_list) 42 if (!loading_list)
43 eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view); 43 eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
@@ -211,7 +211,7 @@ _create_view_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
211 view = eina_hash_find(cdata->views, view_path); 211 view = eina_hash_find(cdata->views, view_path);
212 if (!view) 212 if (!view)
213 { 213 {
214 view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(eoid, view_path)); 214 view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(eo_self, view_path));
215 eina_hash_add(cdata->views, view_path, view); 215 eina_hash_add(cdata->views, view_path, view);
216 eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view); 216 eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
217 } 217 }
diff --git a/legacy/elementary/src/lib/elm_app_server.c b/legacy/elementary/src/lib/elm_app_server.c
index a7483f9389..3db9909f48 100644
--- a/legacy/elementary/src/lib/elm_app_server.c
+++ b/legacy/elementary/src/lib/elm_app_server.c
@@ -255,7 +255,7 @@ _elm_app_server_constructor(Eo *obj, Elm_App_Server_Data *data, const char *pkg,
255 new_events = elm_app_server_view_props_new_events_get(view_eet_props); 255 new_events = elm_app_server_view_props_new_events_get(view_eet_props);
256 progress = elm_app_server_view_props_progress_get(view_eet_props); 256 progress = elm_app_server_view_props_progress_get(view_eet_props);
257 257
258 view = eo_add(ELM_APP_SERVER_VIEW_CLASS, obj, elm_app_server_view_id_set(eoid, view_id)); 258 view = eo_add(ELM_APP_SERVER_VIEW_CLASS, obj, elm_app_server_view_id_set(eo_self, view_id));
259 if (!view) 259 if (!view)
260 continue; 260 continue;
261 261
diff --git a/legacy/elementary/src/lib/elm_glview.c b/legacy/elementary/src/lib/elm_glview.c
index 43d08d534e..bfa801d7f4 100644
--- a/legacy/elementary/src/lib/elm_glview.c
+++ b/legacy/elementary/src/lib/elm_glview.c
@@ -296,7 +296,7 @@ EAPI Evas_Object *
296elm_glview_add(Evas_Object *parent) 296elm_glview_add(Evas_Object *parent)
297{ 297{
298 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 298 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
299 Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_glview_version_constructor(eoid, EVAS_GL_GLES_2_X)); 299 Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_glview_version_constructor(eo_self, EVAS_GL_GLES_2_X));
300 return obj; 300 return obj;
301} 301}
302 302
@@ -304,7 +304,7 @@ EAPI Evas_Object *
304elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Version version) 304elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Version version)
305{ 305{
306 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 306 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
307 Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_glview_version_constructor(eoid, version)); 307 Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_glview_version_constructor(eo_self, version));
308 return obj; 308 return obj;
309} 309}
310 310
diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c
index 70f5392b1e..c7b23daa96 100644
--- a/legacy/elementary/src/lib/elm_win.c
+++ b/legacy/elementary/src/lib/elm_win.c
@@ -3231,14 +3231,14 @@ elm_win_add(Evas_Object *parent,
3231 const char *name, 3231 const char *name,
3232 Elm_Win_Type type) 3232 Elm_Win_Type type)
3233{ 3233{
3234 Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_win_name_set(eoid, name), elm_obj_win_type_set(eoid, type)); 3234 Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_win_name_set(eo_self, name), elm_obj_win_type_set(eo_self, type));
3235 return obj; 3235 return obj;
3236} 3236}
3237 3237
3238EAPI Evas_Object * 3238EAPI Evas_Object *
3239elm_win_fake_add(Ecore_Evas *ee) 3239elm_win_fake_add(Ecore_Evas *ee)
3240{ 3240{
3241 return eo_add(MY_CLASS, NULL, elm_obj_win_fake_canvas_set(eoid, ee), elm_obj_win_name_set(eoid, NULL), elm_obj_win_type_set(eoid, ELM_WIN_FAKE)); 3241 return eo_add(MY_CLASS, NULL, elm_obj_win_fake_canvas_set(eo_self, ee), elm_obj_win_name_set(eo_self, NULL), elm_obj_win_type_set(eo_self, ELM_WIN_FAKE));
3242} 3242}
3243 3243
3244static void 3244static void