summaryrefslogtreecommitdiff
path: root/src/modules/evas/model_savers
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-15 14:44:41 +0100
committerTom Hacohen <tom@stosb.com>2016-08-15 15:07:42 +0100
commite65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree7ecaf136e45470635889191aded2b47057720a98 /src/modules/evas/model_savers
parent35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff)
Eo: Finish the renaming of Eo to the EFL.
This renames all the rest of the API to the EFL namespace except for Eo_Event that will follow soon. Obviously breaks both API and ABI.
Diffstat (limited to 'src/modules/evas/model_savers')
-rw-r--r--src/modules/evas/model_savers/eet/evas_model_save_eet.c4
-rw-r--r--src/modules/evas/model_savers/obj/evas_model_save_obj.c4
-rw-r--r--src/modules/evas/model_savers/ply/evas_model_save_ply.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/evas/model_savers/eet/evas_model_save_eet.c b/src/modules/evas/model_savers/eet/evas_model_save_eet.c
index 89c7c89d26..23b396db41 100644
--- a/src/modules/evas/model_savers/eet/evas_model_save_eet.c
+++ b/src/modules/evas/model_savers/eet/evas_model_save_eet.c
@@ -71,7 +71,7 @@ _set_material_to_eet_file_from_mesh(Evas_Canvas3D_Mesh_Eet *eet_mesh,
71{ 71{
72 int i; 72 int i;
73 Evas_Canvas3D_Material_Data *material = 73 Evas_Canvas3D_Material_Data *material =
74 eo_data_scope_get(f->material, EVAS_CANVAS3D_MATERIAL_CLASS); 74 efl_data_scope_get(f->material, EVAS_CANVAS3D_MATERIAL_CLASS);
75 Evas_Canvas3D_Material_Eet *saved_materials = 75 Evas_Canvas3D_Material_Eet *saved_materials =
76 malloc(sizeof(Evas_Canvas3D_Material_Eet)); 76 malloc(sizeof(Evas_Canvas3D_Material_Eet));
77 Evas_Canvas3D_Color_Eet *saved_colors = 77 Evas_Canvas3D_Color_Eet *saved_colors =
@@ -146,7 +146,7 @@ evas_model_save_file_eet(const Evas_Canvas3D_Mesh *mesh,
146 const char *file, 146 const char *file,
147 Evas_Canvas3D_Mesh_Frame *f) 147 Evas_Canvas3D_Mesh_Frame *f)
148{ 148{
149 Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); 149 Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
150 Eet_File *ef; 150 Eet_File *ef;
151 Evas_Canvas3D_Mesh_Eet* eet_mesh = malloc(sizeof(Evas_Canvas3D_Mesh_Eet)); 151 Evas_Canvas3D_Mesh_Eet* eet_mesh = malloc(sizeof(Evas_Canvas3D_Mesh_Eet));
152 Evas_Canvas3D_Header_Eet* eet_header = malloc(sizeof(Evas_Canvas3D_Header_Eet)); 152 Evas_Canvas3D_Header_Eet* eet_header = malloc(sizeof(Evas_Canvas3D_Header_Eet));
diff --git a/src/modules/evas/model_savers/obj/evas_model_save_obj.c b/src/modules/evas/model_savers/obj/evas_model_save_obj.c
index 2b5db86800..7ecc4b7f75 100644
--- a/src/modules/evas/model_savers/obj/evas_model_save_obj.c
+++ b/src/modules/evas/model_savers/obj/evas_model_save_obj.c
@@ -234,8 +234,8 @@ evas_model_save_file_obj(const Evas_Canvas3D_Mesh *mesh,
234 eina_str_join(_mtl_file_name, len + 1, '.', _without_extention, "mtl"); 234 eina_str_join(_mtl_file_name, len + 1, '.', _without_extention, "mtl");
235 free(_without_extention); 235 free(_without_extention);
236 236
237 Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); 237 Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
238 mat = eo_data_scope_get(f->material, EVAS_CANVAS3D_MATERIAL_CLASS); 238 mat = efl_data_scope_get(f->material, EVAS_CANVAS3D_MATERIAL_CLASS);
239 239
240 if (mat != NULL) _save_material(pd, _mtl_file_name, mat); 240 if (mat != NULL) _save_material(pd, _mtl_file_name, mat);
241 _save_mesh(pd, _obj_file_name, _mtl_file_name, f); 241 _save_mesh(pd, _obj_file_name, _mtl_file_name, f);
diff --git a/src/modules/evas/model_savers/ply/evas_model_save_ply.c b/src/modules/evas/model_savers/ply/evas_model_save_ply.c
index 8da8f741ea..a805baaa05 100644
--- a/src/modules/evas/model_savers/ply/evas_model_save_ply.c
+++ b/src/modules/evas/model_savers/ply/evas_model_save_ply.c
@@ -71,7 +71,7 @@ evas_model_save_file_ply(const Evas_Canvas3D_Mesh *mesh,
71 Evas_Model_Load_Save_Header header; 71 Evas_Model_Load_Save_Header header;
72 Evas_Model_Load_Save_Data data; 72 Evas_Model_Load_Save_Data data;
73 73
74 Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); 74 Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
75 if (!evas_model_save_header_from_mesh(pd, f, &header)) return; 75 if (!evas_model_save_header_from_mesh(pd, f, &header)) return;
76 evas_model_save_data_from_mesh(pd, f, header, &data); 76 evas_model_save_data_from_mesh(pd, f, header, &data);
77 77