summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2015-06-25 12:17:58 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2015-06-25 12:18:43 +0100
commitc709f1dca20b058a9ca76a181add200fe25a8a09 (patch)
treeff60bfeb4c0316f18544948f9e9bf80026444e46 /src
parent4f2ad23585ac57006c4b7ff426646c5a9fea7900 (diff)
eolian/generator: constify all prototypes for @const functions
Otherwise there would be conflicts in certain circumstances. This also requires adding const on many existing functions, and similar work is necessary in Elementary. @fix
Diffstat (limited to 'src')
-rw-r--r--src/bin/eolian/eo_generator.c6
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_camera.c2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_light.c10
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_material.c2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c14
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_object.c4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_scene.c14
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_texture.c6
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c2
-rw-r--r--src/lib/evas/canvas/evas_main.c8
-rw-r--r--src/lib/evas/canvas/evas_object_box.c10
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c6
-rw-r--r--src/lib/evas/canvas/evas_object_image.c6
-rw-r--r--src/lib/evas/canvas/evas_object_main.c4
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c10
-rw-r--r--src/lib/evas/canvas/evas_object_table.c6
-rw-r--r--src/lib/evas/canvas/evas_object_text.c8
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c10
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c4
-rw-r--r--src/lib/evas/common/evas_model_save.c2
-rw-r--r--src/lib/evas/include/evas_private.h8
-rw-r--r--src/modules/evas/model_savers/eet/evas_model_save_eet.c2
-rw-r--r--src/modules/evas/model_savers/obj/evas_model_save_obj.c2
-rw-r--r--src/modules/evas/model_savers/ply/evas_model_save_ply.c2
25 files changed, 79 insertions, 77 deletions
diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index 7d98eb9342..d31a656a80 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -512,12 +512,13 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
512 /* Generation of the user function prototype declaration - not needed when @auto and @empty are indicated */ 512 /* Generation of the user function prototype declaration - not needed when @auto and @empty are indicated */
513 if (!is_empty && !is_auto) 513 if (!is_empty && !is_auto)
514 { 514 {
515 eina_strbuf_append_printf(fbody, "%s _%s%s%s_%s%s(Eo *obj, @#Datatype_Data *pd%s);\n\n", 515 eina_strbuf_append_printf(fbody, "%s _%s%s%s_%s%s(%sEo *obj, @#Datatype_Data *pd%s);\n\n",
516 rettype?rettype:"void", 516 rettype?rettype:"void",
517 class_env.lower_classname, 517 class_env.lower_classname,
518 impl_env?"_":"", 518 impl_env?"_":"",
519 impl_env?impl_env->lower_classname:"", 519 impl_env?impl_env->lower_classname:"",
520 eolian_function_name_get(funcid), suffix, 520 eolian_function_name_get(funcid), suffix,
521 eolian_function_object_is_const(funcid)?"const ":"",
521 eina_strbuf_string_get(full_params)); 522 eina_strbuf_string_get(full_params));
522 } 523 }
523 524
@@ -527,12 +528,13 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
527 eina_hash_add(_funcs_params_init, 528 eina_hash_add(_funcs_params_init,
528 eina_stringshare_add(eolian_function_name_get(funcid)), (void *)ftype); 529 eina_stringshare_add(eolian_function_name_get(funcid)), (void *)ftype);
529 /* Generation of the intermediate function __eolian_... */ 530 /* Generation of the intermediate function __eolian_... */
530 eina_strbuf_append_printf(fbody, "static %s __eolian_%s%s%s_%s%s(Eo *obj%s, @#Datatype_Data *pd%s%s)\n{\n", 531 eina_strbuf_append_printf(fbody, "static %s __eolian_%s%s%s_%s%s(%sEo *obj%s, @#Datatype_Data *pd%s%s)\n{\n",
531 rettype?rettype:"void", 532 rettype?rettype:"void",
532 class_env.lower_classname, 533 class_env.lower_classname,
533 impl_env?"_":"", 534 impl_env?"_":"",
534 impl_env?impl_env->lower_classname:"", 535 impl_env?impl_env->lower_classname:"",
535 eolian_function_name_get(funcid), suffix, 536 eolian_function_name_get(funcid), suffix,
537 eolian_function_object_is_const(funcid)?"const ":"",
536 is_empty || is_auto?" EINA_UNUSED":"", 538 is_empty || is_auto?" EINA_UNUSED":"",
537 is_empty || (is_auto && !eina_strbuf_length_get(params_init))?" EINA_UNUSED":"", 539 is_empty || (is_auto && !eina_strbuf_length_get(params_init))?" EINA_UNUSED":"",
538 eina_strbuf_string_get(full_params)); 540 eina_strbuf_string_get(full_params));
diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.c b/src/lib/evas/canvas/evas_canvas3d_camera.c
index f6b85af8b7..802bccf57f 100644
--- a/src/lib/evas/canvas/evas_canvas3d_camera.c
+++ b/src/lib/evas/canvas/evas_canvas3d_camera.c
@@ -114,7 +114,7 @@ _evas_canvas3d_camera_projection_matrix_set(Eo *obj, Evas_Canvas3D_Camera_Data *
114} 114}
115 115
116EOLIAN static void 116EOLIAN static void
117_evas_canvas3d_camera_projection_matrix_get(Eo *obj EINA_UNUSED, 117_evas_canvas3d_camera_projection_matrix_get(const Eo *obj EINA_UNUSED,
118 Evas_Canvas3D_Camera_Data *pd, 118 Evas_Canvas3D_Camera_Data *pd,
119 Evas_Real *matrix) 119 Evas_Real *matrix)
120{ 120{
diff --git a/src/lib/evas/canvas/evas_canvas3d_light.c b/src/lib/evas/canvas/evas_canvas3d_light.c
index 6861652a6c..d207d9b62f 100644
--- a/src/lib/evas/canvas/evas_canvas3d_light.c
+++ b/src/lib/evas/canvas/evas_canvas3d_light.c
@@ -147,7 +147,7 @@ _evas_canvas3d_light_ambient_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas_Rea
147} 147}
148 148
149EOLIAN static void 149EOLIAN static void
150_evas_canvas3d_light_ambient_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Light_Data *pd, Evas_Real *r, Evas_Real *g, Evas_Real *b, Evas_Real *a) 150_evas_canvas3d_light_ambient_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Light_Data *pd, Evas_Real *r, Evas_Real *g, Evas_Real *b, Evas_Real *a)
151{ 151{
152 if (r) *r = pd->ambient.r; 152 if (r) *r = pd->ambient.r;
153 if (g) *g = pd->ambient.g; 153 if (g) *g = pd->ambient.g;
@@ -167,7 +167,7 @@ _evas_canvas3d_light_diffuse_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas_Rea
167} 167}
168 168
169EOLIAN static void 169EOLIAN static void
170_evas_canvas3d_light_diffuse_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Light_Data *pd, Evas_Real *r, Evas_Real *g, Evas_Real *b, Evas_Real *a) 170_evas_canvas3d_light_diffuse_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Light_Data *pd, Evas_Real *r, Evas_Real *g, Evas_Real *b, Evas_Real *a)
171{ 171{
172 if (r) *r = pd->diffuse.r; 172 if (r) *r = pd->diffuse.r;
173 if (g) *g = pd->diffuse.g; 173 if (g) *g = pd->diffuse.g;
@@ -187,7 +187,7 @@ _evas_canvas3d_light_specular_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas_Re
187} 187}
188 188
189EOLIAN static void 189EOLIAN static void
190_evas_canvas3d_light_specular_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Light_Data *pd, Evas_Real *r, Evas_Real *g, Evas_Real *b, Evas_Real *a) 190_evas_canvas3d_light_specular_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Light_Data *pd, Evas_Real *r, Evas_Real *g, Evas_Real *b, Evas_Real *a)
191{ 191{
192 if (r) *r = pd->specular.r; 192 if (r) *r = pd->specular.r;
193 if (g) *g = pd->specular.g; 193 if (g) *g = pd->specular.g;
@@ -232,7 +232,7 @@ _evas_canvas3d_light_attenuation_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas
232} 232}
233 233
234EOLIAN static void 234EOLIAN static void
235_evas_canvas3d_light_attenuation_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Light_Data *pd, Evas_Real *constant, Evas_Real *linear, Evas_Real *quadratic) 235_evas_canvas3d_light_attenuation_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Light_Data *pd, Evas_Real *constant, Evas_Real *linear, Evas_Real *quadratic)
236{ 236{
237 if (constant) *constant = pd->atten_const; 237 if (constant) *constant = pd->atten_const;
238 if (linear) *linear = pd->atten_linear; 238 if (linear) *linear = pd->atten_linear;
@@ -264,7 +264,7 @@ _evas_canvas3d_light_projection_matrix_set(Eo *obj, Evas_Canvas3D_Light_Data *pd
264} 264}
265 265
266EOLIAN static void 266EOLIAN static void
267_evas_canvas3d_light_projection_matrix_get(Eo *obj EINA_UNUSED, 267_evas_canvas3d_light_projection_matrix_get(const Eo *obj EINA_UNUSED,
268 Evas_Canvas3D_Light_Data *pd, 268 Evas_Canvas3D_Light_Data *pd,
269 Evas_Real *matrix) 269 Evas_Real *matrix)
270{ 270{
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.c b/src/lib/evas/canvas/evas_canvas3d_material.c
index ab0fe732ba..46f5a847c0 100644
--- a/src/lib/evas/canvas/evas_canvas3d_material.c
+++ b/src/lib/evas/canvas/evas_canvas3d_material.c
@@ -159,7 +159,7 @@ _evas_canvas3d_material_color_set(Eo *obj, Evas_Canvas3D_Material_Data *pd, Evas
159} 159}
160 160
161EOLIAN static void 161EOLIAN static void
162_evas_canvas3d_material_color_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd, Evas_Canvas3D_Material_Attrib attrib, Evas_Real *r, Evas_Real *g, Evas_Real *b, Evas_Real *a) 162_evas_canvas3d_material_color_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd, Evas_Canvas3D_Material_Attrib attrib, Evas_Real *r, Evas_Real *g, Evas_Real *b, Evas_Real *a)
163{ 163{
164 if (r) *r = pd->attribs[attrib].color.r; 164 if (r) *r = pd->attribs[attrib].color.r;
165 if (g) *g = pd->attribs[attrib].color.g; 165 if (g) *g = pd->attribs[attrib].color.g;
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c
index fb20da7b25..1b18699768 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.c
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c
@@ -634,7 +634,7 @@ _evas_canvas3d_mesh_frame_vertex_data_unmap(Eo *obj EINA_UNUSED, Evas_Canvas3D_M
634} 634}
635 635
636EOLIAN static int 636EOLIAN static int
637_evas_canvas3d_mesh_frame_vertex_stride_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd, int frame, Evas_Canvas3D_Vertex_Attrib attrib) 637_evas_canvas3d_mesh_frame_vertex_stride_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd, int frame, Evas_Canvas3D_Vertex_Attrib attrib)
638{ 638{
639 Evas_Canvas3D_Mesh_Frame *f = evas_canvas3d_mesh_frame_find(pd, frame); 639 Evas_Canvas3D_Mesh_Frame *f = evas_canvas3d_mesh_frame_find(pd, frame);
640 640
@@ -706,13 +706,13 @@ _evas_canvas3d_mesh_index_data_copy_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_
706} 706}
707 707
708EOLIAN static Evas_Canvas3D_Index_Format 708EOLIAN static Evas_Canvas3D_Index_Format
709_evas_canvas3d_mesh_index_format_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd) 709_evas_canvas3d_mesh_index_format_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd)
710{ 710{
711 return pd->index_format; 711 return pd->index_format;
712} 712}
713 713
714EOLIAN static int 714EOLIAN static int
715_evas_canvas3d_mesh_index_count_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd) 715_evas_canvas3d_mesh_index_count_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd)
716{ 716{
717 return pd->index_count; 717 return pd->index_count;
718} 718}
@@ -879,7 +879,7 @@ _evas_canvas3d_mesh_efl_file_file_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd,
879} 879}
880 880
881EOLIAN static Eina_Bool 881EOLIAN static Eina_Bool
882_evas_canvas3d_mesh_efl_file_save(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, 882_evas_canvas3d_mesh_efl_file_save(const Eo *obj, Evas_Canvas3D_Mesh_Data *pd,
883 const char *file, 883 const char *file,
884 const char *key EINA_UNUSED, 884 const char *key EINA_UNUSED,
885 const char *flags EINA_UNUSED) 885 const char *flags EINA_UNUSED)
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index 461ce3bcb2..2fb2bf2d12 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -1158,7 +1158,7 @@ _evas_canvas3d_node_eo_base_destructor(Eo *obj, Evas_Canvas3D_Node_Data *pd EINA
1158} 1158}
1159 1159
1160EOLIAN static Evas_Canvas3D_Node_Type 1160EOLIAN static Evas_Canvas3D_Node_Type
1161_evas_canvas3d_node_type_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd) 1161_evas_canvas3d_node_type_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd)
1162{ 1162{
1163 return pd->type; 1163 return pd->type;
1164} 1164}
@@ -1226,13 +1226,13 @@ _evas_canvas3d_node_member_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
1226} 1226}
1227 1227
1228EOLIAN static Evas_Canvas3D_Node * 1228EOLIAN static Evas_Canvas3D_Node *
1229_evas_canvas3d_node_parent_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd) 1229_evas_canvas3d_node_parent_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd)
1230{ 1230{
1231 return pd->parent; 1231 return pd->parent;
1232} 1232}
1233 1233
1234EOLIAN static const Eina_List * 1234EOLIAN static const Eina_List *
1235_evas_canvas3d_node_member_list_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd) 1235_evas_canvas3d_node_member_list_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd)
1236{ 1236{
1237 return pd->members; 1237 return pd->members;
1238} 1238}
@@ -1288,7 +1288,7 @@ _evas_canvas3d_node_scale_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Real x,
1288} 1288}
1289 1289
1290EOLIAN static void 1290EOLIAN static void
1291_evas_canvas3d_node_position_get(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Space space, 1291_evas_canvas3d_node_position_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Space space,
1292 Evas_Real *x, Evas_Real *y, Evas_Real *z) 1292 Evas_Real *x, Evas_Real *y, Evas_Real *z)
1293{ 1293{
1294 if (space == EVAS_CANVAS3D_SPACE_LOCAL) 1294 if (space == EVAS_CANVAS3D_SPACE_LOCAL)
@@ -1314,7 +1314,7 @@ _evas_canvas3d_node_position_get(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canv
1314} 1314}
1315 1315
1316EOLIAN static void 1316EOLIAN static void
1317_evas_canvas3d_node_orientation_get(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Space space, 1317_evas_canvas3d_node_orientation_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Space space,
1318 Evas_Real *x, Evas_Real *y, Evas_Real *z, Evas_Real *w) 1318 Evas_Real *x, Evas_Real *y, Evas_Real *z, Evas_Real *w)
1319{ 1319{
1320 if (space == EVAS_CANVAS3D_SPACE_LOCAL) 1320 if (space == EVAS_CANVAS3D_SPACE_LOCAL)
@@ -1344,7 +1344,7 @@ _evas_canvas3d_node_orientation_get(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_C
1344} 1344}
1345 1345
1346EOLIAN static void 1346EOLIAN static void
1347_evas_canvas3d_node_scale_get(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Space space, 1347_evas_canvas3d_node_scale_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Space space,
1348 Evas_Real *x, Evas_Real *y, Evas_Real *z) 1348 Evas_Real *x, Evas_Real *y, Evas_Real *z)
1349{ 1349{
1350 if (space == EVAS_CANVAS3D_SPACE_LOCAL) 1350 if (space == EVAS_CANVAS3D_SPACE_LOCAL)
@@ -1661,7 +1661,7 @@ _evas_canvas3d_node_mesh_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D
1661} 1661}
1662 1662
1663EOLIAN static const Eina_List * 1663EOLIAN static const Eina_List *
1664_evas_canvas3d_node_mesh_list_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd) 1664_evas_canvas3d_node_mesh_list_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd)
1665{ 1665{
1666 return pd->data.mesh.meshes; 1666 return pd->data.mesh.meshes;
1667} 1667}
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.c b/src/lib/evas/canvas/evas_canvas3d_object.c
index 50c972c224..3cba61c44e 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.c
+++ b/src/lib/evas/canvas/evas_canvas3d_object.c
@@ -29,13 +29,13 @@ _evas_canvas3d_object_type_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Object_Data *p
29} 29}
30 30
31EOLIAN static Evas_Canvas3D_Object_Type 31EOLIAN static Evas_Canvas3D_Object_Type
32_evas_canvas3d_object_type_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Object_Data *pd) 32_evas_canvas3d_object_type_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Object_Data *pd)
33{ 33{
34 return pd->type; 34 return pd->type;
35} 35}
36 36
37EOLIAN static Eina_Bool 37EOLIAN static Eina_Bool
38_evas_canvas3d_object_dirty_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Object_Data *pd, Evas_Canvas3D_State state) 38_evas_canvas3d_object_dirty_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Object_Data *pd, Evas_Canvas3D_State state)
39{ 39{
40 return pd->dirty[state]; 40 return pd->dirty[state];
41} 41}
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.c b/src/lib/evas/canvas/evas_canvas3d_scene.c
index 823e7af86b..b97c694e60 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.c
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.c
@@ -145,7 +145,7 @@ _evas_canvas3d_scene_size_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd,
145} 145}
146 146
147EOLIAN static void 147EOLIAN static void
148_evas_canvas3d_scene_size_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd, int *w, int *h) 148_evas_canvas3d_scene_size_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd, int *w, int *h)
149{ 149{
150 if (w) *w = pd->w; 150 if (w) *w = pd->w;
151 if (h) *h = pd->h; 151 if (h) *h = pd->h;
@@ -160,7 +160,7 @@ _evas_canvas3d_scene_background_color_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Sce
160} 160}
161 161
162EOLIAN static void 162EOLIAN static void
163_evas_canvas3d_scene_background_color_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd, 163_evas_canvas3d_scene_background_color_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd,
164 Evas_Real *r, Evas_Real *g, Evas_Real *b, Evas_Real *a) 164 Evas_Real *r, Evas_Real *g, Evas_Real *b, Evas_Real *a)
165{ 165{
166 if (r) *r = pd->bg_color.r; 166 if (r) *r = pd->bg_color.r;
@@ -588,7 +588,7 @@ static void _node_mesh_colors_free_cb(void *data)
588} 588}
589 589
590EOLIAN static Eina_Bool 590EOLIAN static Eina_Bool
591_evas_canvas3d_scene_pick(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real x, Evas_Real y, 591_evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real x, Evas_Real y,
592 Evas_Canvas3D_Node **node, Evas_Canvas3D_Mesh **mesh, 592 Evas_Canvas3D_Node **node, Evas_Canvas3D_Mesh **mesh,
593 Evas_Real *s, Evas_Real *t) 593 Evas_Real *s, Evas_Real *t)
594{ 594{
@@ -714,7 +714,7 @@ _evas_canvas3d_scene_pick(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real x, Ev
714} 714}
715 715
716EOLIAN static Evas_Canvas3D_Node * 716EOLIAN static Evas_Canvas3D_Node *
717_evas_canvas3d_scene_exist(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real x, Evas_Real y, Evas_Canvas3D_Node *node) 717_evas_canvas3d_scene_exist(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real x, Evas_Real y, Evas_Canvas3D_Node *node)
718{ 718{
719 Evas_Canvas3D_Pick_Data data; 719 Evas_Canvas3D_Pick_Data data;
720 Evas_Canvas3D_Node_Data *pd_camera_node; 720 Evas_Canvas3D_Node_Data *pd_camera_node;
@@ -749,7 +749,7 @@ _evas_canvas3d_scene_exist(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real x, E
749} 749}
750 750
751EOLIAN static Eina_List * 751EOLIAN static Eina_List *
752_evas_canvas3d_scene_pick_member_list_get(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real x, Evas_Real y) 752_evas_canvas3d_scene_pick_member_list_get(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real x, Evas_Real y)
753{ 753{
754 const Eina_List *list = NULL, *l = NULL; 754 const Eina_List *list = NULL, *l = NULL;
755 Eina_List *picked_nodes = NULL; 755 Eina_List *picked_nodes = NULL;
@@ -776,7 +776,7 @@ _evas_canvas3d_scene_pick_member_list_get(Eo *obj, Evas_Canvas3D_Scene_Data *pd,
776} 776}
777 777
778EOLIAN static Eina_Bool 778EOLIAN static Eina_Bool
779_evas_canvas3d_scene_shadows_enable_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd) 779_evas_canvas3d_scene_shadows_enable_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd)
780{ 780{
781 return pd->shadows_enabled; 781 return pd->shadows_enabled;
782} 782}
@@ -789,7 +789,7 @@ _evas_canvas3d_scene_shadows_enable_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene
789} 789}
790 790
791EOLIAN static Eina_Bool 791EOLIAN static Eina_Bool
792_evas_canvas3d_scene_color_pick_enable_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd) 792_evas_canvas3d_scene_color_pick_enable_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd)
793{ 793{
794 return pd->color_pick_enabled; 794 return pd->color_pick_enabled;
795} 795}
diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.c b/src/lib/evas/canvas/evas_canvas3d_texture.c
index 0350e76c67..51e034f3c5 100644
--- a/src/lib/evas/canvas/evas_canvas3d_texture.c
+++ b/src/lib/evas/canvas/evas_canvas3d_texture.c
@@ -480,7 +480,7 @@ _evas_canvas3d_texture_source_visible_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Tex
480} 480}
481 481
482EOLIAN static Evas_Colorspace 482EOLIAN static Evas_Colorspace
483_evas_canvas3d_texture_color_format_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Texture_Data *pd) 483_evas_canvas3d_texture_color_format_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Texture_Data *pd)
484{ 484{
485 Evas_Colorspace format = -1; 485 Evas_Colorspace format = -1;
486 Eo *evas = NULL; 486 Eo *evas = NULL;
@@ -500,7 +500,7 @@ _evas_canvas3d_texture_color_format_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Textu
500} 500}
501 501
502EOLIAN static void 502EOLIAN static void
503_evas_canvas3d_texture_size_get(Eo *obj, Evas_Canvas3D_Texture_Data *pd, int *w, int *h) 503_evas_canvas3d_texture_size_get(const Eo *obj, Evas_Canvas3D_Texture_Data *pd, int *w, int *h)
504{ 504{
505 Eo *evas = NULL; 505 Eo *evas = NULL;
506 eo_do(obj, evas = evas_common_evas_get()); 506 eo_do(obj, evas = evas_common_evas_get());
@@ -554,7 +554,7 @@ _evas_canvas3d_texture_filter_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_
554} 554}
555 555
556EOLIAN static void 556EOLIAN static void
557_evas_canvas3d_texture_filter_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Texture_Filter *min, Evas_Canvas3D_Texture_Filter *mag) 557_evas_canvas3d_texture_filter_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Texture_Filter *min, Evas_Canvas3D_Texture_Filter *mag)
558{ 558{
559 Eo *evas = NULL; 559 Eo *evas = NULL;
560 eo_do(obj, evas = evas_common_evas_get()); 560 eo_do(obj, evas = evas_common_evas_get());
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c
index 046683baf5..b2433b8209 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -400,7 +400,7 @@ update:
400} 400}
401 401
402EOLIAN void 402EOLIAN void
403_evas_filter_efl_gfx_filter_source_get(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, 403_evas_filter_efl_gfx_filter_source_get(const Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd,
404 const char *name, Efl_Gfx_Base **source) 404 const char *name, Efl_Gfx_Base **source)
405{ 405{
406 if (!source) return; 406 if (!source) return;
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index cdbbde8701..e20f748941 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -459,28 +459,28 @@ _evas_canvas_output_framespace_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Ev
459} 459}
460 460
461EOLIAN static Evas_Coord 461EOLIAN static Evas_Coord
462_evas_canvas_coord_screen_x_to_world(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int x) 462_evas_canvas_coord_screen_x_to_world(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int x)
463{ 463{
464 if (e->output.w == e->viewport.w) return e->viewport.x + x; 464 if (e->output.w == e->viewport.w) return e->viewport.x + x;
465 else return (long long)e->viewport.x + (((long long)x * (long long)e->viewport.w) / (long long)e->output.w); 465 else return (long long)e->viewport.x + (((long long)x * (long long)e->viewport.w) / (long long)e->output.w);
466} 466}
467 467
468EOLIAN static Evas_Coord 468EOLIAN static Evas_Coord
469_evas_canvas_coord_screen_y_to_world(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int y) 469_evas_canvas_coord_screen_y_to_world(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int y)
470{ 470{
471 if (e->output.h == e->viewport.h) return e->viewport.y + y; 471 if (e->output.h == e->viewport.h) return e->viewport.y + y;
472 else return (long long)e->viewport.y + (((long long)y * (long long)e->viewport.h) / (long long)e->output.h); 472 else return (long long)e->viewport.y + (((long long)y * (long long)e->viewport.h) / (long long)e->output.h);
473} 473}
474 474
475EOLIAN static int 475EOLIAN static int
476_evas_canvas_coord_world_x_to_screen(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x) 476_evas_canvas_coord_world_x_to_screen(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x)
477{ 477{
478 if (e->output.w == e->viewport.w) return x - e->viewport.x; 478 if (e->output.w == e->viewport.w) return x - e->viewport.x;
479 else return (int)((((long long)x - (long long)e->viewport.x) * (long long)e->output.w) / (long long)e->viewport.w); 479 else return (int)((((long long)x - (long long)e->viewport.x) * (long long)e->output.w) / (long long)e->viewport.w);
480} 480}
481 481
482EOLIAN static int 482EOLIAN static int
483_evas_canvas_coord_world_y_to_screen(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord y) 483_evas_canvas_coord_world_y_to_screen(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord y)
484{ 484{
485 if (e->output.h == e->viewport.h) return y - e->viewport.y; 485 if (e->output.h == e->viewport.h) return y - e->viewport.y;
486 else return (int)((((long long)y - (long long)e->viewport.y) * (long long)e->output.h) / (long long)e->viewport.h); 486 else return (int)((((long long)y - (long long)e->viewport.y) * (long long)e->output.h) / (long long)e->viewport.h);
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index 675e63e719..a33a9e4679 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -1841,7 +1841,7 @@ _evas_box_remove_all(Eo *o, Evas_Object_Box_Data *priv, Eina_Bool clear)
1841} 1841}
1842 1842
1843EOLIAN static Eina_Iterator* 1843EOLIAN static Eina_Iterator*
1844_evas_box_iterator_new(Eo *o, Evas_Object_Box_Data *priv) 1844_evas_box_iterator_new(const Eo *o, Evas_Object_Box_Data *priv)
1845{ 1845{
1846 Evas_Object_Box_Iterator *it; 1846 Evas_Object_Box_Iterator *it;
1847 1847
@@ -1863,7 +1863,7 @@ _evas_box_iterator_new(Eo *o, Evas_Object_Box_Data *priv)
1863} 1863}
1864 1864
1865EOLIAN static Eina_Accessor* 1865EOLIAN static Eina_Accessor*
1866_evas_box_accessor_new(Eo *o, Evas_Object_Box_Data *priv) 1866_evas_box_accessor_new(const Eo *o, Evas_Object_Box_Data *priv)
1867{ 1867{
1868 Evas_Object_Box_Accessor *it; 1868 Evas_Object_Box_Accessor *it;
1869 1869
@@ -1899,13 +1899,13 @@ evas_object_box_children_get(const Evas_Object *o)
1899} 1899}
1900 1900
1901EOLIAN static const char* 1901EOLIAN static const char*
1902_evas_box_option_property_name_get(Eo *o EINA_UNUSED, Evas_Object_Box_Data *_pd EINA_UNUSED, int property EINA_UNUSED) 1902_evas_box_option_property_name_get(const Eo *o EINA_UNUSED, Evas_Object_Box_Data *_pd EINA_UNUSED, int property EINA_UNUSED)
1903{ 1903{
1904 return NULL; 1904 return NULL;
1905} 1905}
1906 1906
1907EOLIAN static int 1907EOLIAN static int
1908_evas_box_option_property_id_get(Eo *o EINA_UNUSED, Evas_Object_Box_Data *_pd EINA_UNUSED, const char *name EINA_UNUSED) 1908_evas_box_option_property_id_get(const Eo *o EINA_UNUSED, Evas_Object_Box_Data *_pd EINA_UNUSED, const char *name EINA_UNUSED)
1909{ 1909{
1910 return -1; 1910 return -1;
1911} 1911}
@@ -1960,7 +1960,7 @@ evas_object_box_option_property_vget(const Evas_Object *o, Evas_Object_Box_Optio
1960} 1960}
1961 1961
1962EOLIAN static Eina_Bool 1962EOLIAN static Eina_Bool
1963_evas_box_option_property_vget(Eo *o EINA_UNUSED, Evas_Object_Box_Data *_pd EINA_UNUSED, Evas_Object_Box_Option *opt EINA_UNUSED, int property EINA_UNUSED, va_list *args EINA_UNUSED) 1963_evas_box_option_property_vget(const Eo *o EINA_UNUSED, Evas_Object_Box_Data *_pd EINA_UNUSED, Evas_Object_Box_Option *opt EINA_UNUSED, int property EINA_UNUSED, va_list *args EINA_UNUSED)
1964{ 1964{
1965 return EINA_FALSE; 1965 return EINA_FALSE;
1966} 1966}
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index 7d5e6d2af7..4c1b95a6ca 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -395,7 +395,7 @@ _evas_grid_clear(Eo *o, Evas_Grid_Data *priv, Eina_Bool clear)
395} 395}
396 396
397EOLIAN static Eina_Bool 397EOLIAN static Eina_Bool
398_evas_grid_pack_get(Eo *o EINA_UNUSED, Evas_Grid_Data *_pd EINA_UNUSED, Evas_Object *child, int *x, int *y, int *w, int *h) 398_evas_grid_pack_get(const Eo *o EINA_UNUSED, Evas_Grid_Data *_pd EINA_UNUSED, Evas_Object *child, int *x, int *y, int *w, int *h)
399{ 399{
400 Evas_Object_Grid_Option *opt; 400 Evas_Object_Grid_Option *opt;
401 401
@@ -414,7 +414,7 @@ _evas_grid_pack_get(Eo *o EINA_UNUSED, Evas_Grid_Data *_pd EINA_UNUSED, Evas_Obj
414} 414}
415 415
416EOLIAN static Eina_Iterator* 416EOLIAN static Eina_Iterator*
417_evas_grid_iterator_new(Eo *o, Evas_Grid_Data *priv) 417_evas_grid_iterator_new(const Eo *o, Evas_Grid_Data *priv)
418{ 418{
419 Evas_Object_Grid_Iterator *it; 419 Evas_Object_Grid_Iterator *it;
420 420
@@ -436,7 +436,7 @@ _evas_grid_iterator_new(Eo *o, Evas_Grid_Data *priv)
436} 436}
437 437
438EOLIAN static Eina_Accessor* 438EOLIAN static Eina_Accessor*
439_evas_grid_accessor_new(Eo *o, Evas_Grid_Data *priv) 439_evas_grid_accessor_new(const Eo *o, Evas_Grid_Data *priv)
440{ 440{
441 Evas_Object_Grid_Accessor *it; 441 Evas_Object_Grid_Accessor *it;
442 442
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 807f27cc5e..344a8496f8 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -1318,7 +1318,7 @@ _evas_image_data_set(Eo *eo_obj, Evas_Image_Data *o, void *data)
1318} 1318}
1319 1319
1320EOLIAN static void* 1320EOLIAN static void*
1321_evas_image_data_get(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED, Eina_Bool for_writing) 1321_evas_image_data_get(const Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED, Eina_Bool for_writing)
1322{ 1322{
1323 Evas_Image_Data *o = (Evas_Image_Data *) _pd; 1323 Evas_Image_Data *o = (Evas_Image_Data *) _pd;
1324 DATA32 *data; 1324 DATA32 *data;
@@ -1620,7 +1620,7 @@ _evas_image_reload(Eo *eo_obj, Evas_Image_Data *o)
1620} 1620}
1621 1621
1622EOLIAN static Eina_Bool 1622EOLIAN static Eina_Bool
1623_evas_image_efl_file_save(Eo *eo_obj, Evas_Image_Data *o, const char *file, const char *key, const char *flags) 1623_evas_image_efl_file_save(const Eo *eo_obj, Evas_Image_Data *o, const char *file, const char *key, const char *flags)
1624{ 1624{
1625 DATA32 *data = NULL; 1625 DATA32 *data = NULL;
1626 int quality = 80, compress = 9, ok = 0; 1626 int quality = 80, compress = 9, ok = 0;
@@ -2221,7 +2221,7 @@ _evas_image_animated_loop_count_get(Eo *eo_obj, Evas_Image_Data *o)
2221} 2221}
2222 2222
2223EOLIAN static double 2223EOLIAN static double
2224_evas_image_animated_frame_duration_get(Eo *eo_obj, Evas_Image_Data *o, int start_frame, int frame_num) 2224_evas_image_animated_frame_duration_get(const Eo *eo_obj, Evas_Image_Data *o, int start_frame, int frame_num)
2225{ 2225{
2226 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 2226 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2227 int frame_count = 0; 2227 int frame_count = 0;
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 936e54dec9..8800a041b5 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -2003,13 +2003,13 @@ _evas_object_smart_data_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *
2003} 2003}
2004 2004
2005EOLIAN static Eina_Bool 2005EOLIAN static Eina_Bool
2006_evas_object_smart_type_check(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, const char *type EINA_UNUSED) 2006_evas_object_smart_type_check(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, const char *type EINA_UNUSED)
2007{ 2007{
2008 return EINA_FALSE; 2008 return EINA_FALSE;
2009} 2009}
2010 2010
2011EOLIAN static Eina_Bool 2011EOLIAN static Eina_Bool
2012_evas_object_smart_type_check_ptr(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, const char *type EINA_UNUSED) 2012_evas_object_smart_type_check_ptr(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, const char *type EINA_UNUSED)
2013{ 2013{
2014 return EINA_FALSE; 2014 return EINA_FALSE;
2015} 2015}
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 27fca2b99e..21d74d5142 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -310,7 +310,7 @@ _evas_object_smart_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, E
310} 310}
311 311
312EOLIAN static Eina_Bool 312EOLIAN static Eina_Bool
313_evas_object_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char *type) 313_evas_object_smart_evas_object_smart_type_check(const Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char *type)
314{ 314{
315 const Evas_Smart_Class *sc; 315 const Evas_Smart_Class *sc;
316 Eo_Class *klass; 316 Eo_Class *klass;
@@ -340,7 +340,7 @@ _evas_object_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o E
340} 340}
341 341
342EOLIAN static Eina_Bool 342EOLIAN static Eina_Bool
343_evas_object_smart_evas_object_smart_type_check_ptr(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char* type) 343_evas_object_smart_evas_object_smart_type_check_ptr(const Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char* type)
344{ 344{
345 Eo_Class *klass; 345 Eo_Class *klass;
346 const Evas_Smart_Class *sc; 346 const Evas_Smart_Class *sc;
@@ -405,7 +405,7 @@ _evas_object_smart_iterator_free(Evas_Object_Smart_Iterator *it)
405 405
406// Should we have an eo_children_iterator_new API and just inherit from it ? 406// Should we have an eo_children_iterator_new API and just inherit from it ?
407EOLIAN static Eina_Iterator* 407EOLIAN static Eina_Iterator*
408_evas_object_smart_iterator_new(Eo *eo_obj, Evas_Smart_Data *priv) 408_evas_object_smart_iterator_new(const Eo *eo_obj, Evas_Smart_Data *priv)
409{ 409{
410 Evas_Object_Smart_Iterator *it; 410 Evas_Object_Smart_Iterator *it;
411 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 411 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
@@ -813,7 +813,7 @@ _evas_object_smart_callbacks_descriptions_set(Eo *eo_obj EINA_UNUSED, Evas_Smart
813} 813}
814 814
815EOLIAN static void 815EOLIAN static void
816_evas_object_smart_callbacks_descriptions_get(Eo *eo_obj, Evas_Smart_Data *o, const Evas_Smart_Cb_Description ***class_descriptions, unsigned int *class_count, const Evas_Smart_Cb_Description ***instance_descriptions, unsigned int *instance_count) 816_evas_object_smart_callbacks_descriptions_get(const Eo *eo_obj, Evas_Smart_Data *o, const Evas_Smart_Cb_Description ***class_descriptions, unsigned int *class_count, const Evas_Smart_Cb_Description ***instance_descriptions, unsigned int *instance_count)
817{ 817{
818 if (class_descriptions) *class_descriptions = NULL; 818 if (class_descriptions) *class_descriptions = NULL;
819 if (class_count) *class_count = 0; 819 if (class_count) *class_count = 0;
@@ -831,7 +831,7 @@ _evas_object_smart_callbacks_descriptions_get(Eo *eo_obj, Evas_Smart_Data *o, co
831} 831}
832 832
833EOLIAN static void 833EOLIAN static void
834_evas_object_smart_callback_description_find(Eo *eo_obj, Evas_Smart_Data *o, const char *name, const Evas_Smart_Cb_Description **class_description, const Evas_Smart_Cb_Description **instance_description) 834_evas_object_smart_callback_description_find(const Eo *eo_obj, Evas_Smart_Data *o, const char *name, const Evas_Smart_Cb_Description **class_description, const Evas_Smart_Cb_Description **instance_description)
835{ 835{
836 836
837 if (!name) 837 if (!name)
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index cc61e19373..5a4cfcbdde 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -1056,7 +1056,7 @@ _evas_table_padding_get(Eo *o EINA_UNUSED, Evas_Table_Data *priv, Evas_Coord *ho
1056} 1056}
1057 1057
1058EOLIAN static Eina_Bool 1058EOLIAN static Eina_Bool
1059_evas_table_pack_get(Eo *o EINA_UNUSED, Evas_Table_Data *_pd EINA_UNUSED, Evas_Object *child, unsigned short *col, unsigned short *row, unsigned short *colspan, unsigned short *rowspan) 1059_evas_table_pack_get(const Eo *o EINA_UNUSED, Evas_Table_Data *_pd EINA_UNUSED, Evas_Object *child, unsigned short *col, unsigned short *row, unsigned short *colspan, unsigned short *rowspan)
1060{ 1060{
1061 Evas_Object_Table_Option *opt; 1061 Evas_Object_Table_Option *opt;
1062 1062
@@ -1310,7 +1310,7 @@ _evas_table_col_row_size_get(Eo *o EINA_UNUSED, Evas_Table_Data *priv, int *cols
1310} 1310}
1311 1311
1312EOLIAN static Eina_Iterator* 1312EOLIAN static Eina_Iterator*
1313_evas_table_iterator_new(Eo *o, Evas_Table_Data *priv) 1313_evas_table_iterator_new(const Eo *o, Evas_Table_Data *priv)
1314{ 1314{
1315 Evas_Object_Table_Iterator *it; 1315 Evas_Object_Table_Iterator *it;
1316 1316
@@ -1338,7 +1338,7 @@ _evas_table_iterator_new(Eo *o, Evas_Table_Data *priv)
1338} 1338}
1339 1339
1340EOLIAN static Eina_Accessor* 1340EOLIAN static Eina_Accessor*
1341_evas_table_accessor_new(Eo *o, Evas_Table_Data *priv) 1341_evas_table_accessor_new(const Eo *o, Evas_Table_Data *priv)
1342{ 1342{
1343 Evas_Object_Table_Accessor *it; 1343 Evas_Object_Table_Accessor *it;
1344 1344
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 111379115f..e0433ccd59 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -656,7 +656,7 @@ _layout_text_item_trim(Evas_Object_Protected_Data *obj, Evas_Text_Data *o, Evas_
656} 656}
657 657
658static void 658static void
659_evas_object_text_pad_get(Evas_Object *eo_obj, Evas_Text_Data *o, int *l, int *r, int *t, int *b) 659_evas_object_text_pad_get(const Eo *eo_obj, Evas_Text_Data *o, int *l, int *r, int *t, int *b)
660{ 660{
661 if (l) *l = 0; 661 if (l) *l = 0;
662 if (r) *r = 0; 662 if (r) *r = 0;
@@ -1116,7 +1116,7 @@ _evas_text_vert_advance_get(Eo *eo_obj, Evas_Text_Data *o)
1116} 1116}
1117 1117
1118EOLIAN static Eina_Bool 1118EOLIAN static Eina_Bool
1119_evas_text_char_pos_get(Eo *eo_obj, Evas_Text_Data *o, int pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) 1119_evas_text_char_pos_get(const Eo *eo_obj, Evas_Text_Data *o, int pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
1120{ 1120{
1121 Eina_Bool ret; 1121 Eina_Bool ret;
1122 ret = EINA_FALSE; 1122 ret = EINA_FALSE;
@@ -1159,7 +1159,7 @@ _evas_text_char_pos_get(Eo *eo_obj, Evas_Text_Data *o, int pos, Evas_Coord *cx,
1159} 1159}
1160 1160
1161EOLIAN static int 1161EOLIAN static int
1162_evas_text_last_up_to_pos(Eo *eo_obj, Evas_Text_Data *o, Evas_Coord x, Evas_Coord y) 1162_evas_text_last_up_to_pos(const Eo *eo_obj, Evas_Text_Data *o, Evas_Coord x, Evas_Coord y)
1163{ 1163{
1164 int ret; 1164 int ret;
1165 ret = -1; 1165 ret = -1;
@@ -1173,7 +1173,7 @@ _evas_text_last_up_to_pos(Eo *eo_obj, Evas_Text_Data *o, Evas_Coord x, Evas_Coor
1173} 1173}
1174 1174
1175EOLIAN static int 1175EOLIAN static int
1176_evas_text_char_coords_get(Eo *eo_obj, Evas_Text_Data *o, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) 1176_evas_text_char_coords_get(const Eo *eo_obj, Evas_Text_Data *o, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
1177{ 1177{
1178 int ret; 1178 int ret;
1179 ret = -1; 1179 ret = -1;
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 6a5648e8ca..c8cf754094 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -6101,7 +6101,7 @@ _evas_textblock_style_user_push(Eo *eo_obj, Evas_Textblock_Data *o, Evas_Textblo
6101} 6101}
6102 6102
6103EOLIAN static const Evas_Textblock_Style* 6103EOLIAN static const Evas_Textblock_Style*
6104_evas_textblock_style_user_peek(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Data *o) 6104_evas_textblock_style_user_peek(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Data *o)
6105{ 6105{
6106 return o->style_user; 6106 return o->style_user;
6107} 6107}
@@ -7150,7 +7150,7 @@ _evas_textblock_cursor_get(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Data *o)
7150} 7150}
7151 7151
7152EOLIAN static Evas_Textblock_Cursor* 7152EOLIAN static Evas_Textblock_Cursor*
7153_evas_textblock_cursor_new(Eo *eo_obj, Evas_Textblock_Data *o) 7153_evas_textblock_cursor_new(const Eo *eo_obj, Evas_Textblock_Data *o)
7154{ 7154{
7155 Evas_Textblock_Cursor *cur; 7155 Evas_Textblock_Cursor *cur;
7156 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 7156 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
@@ -7188,7 +7188,7 @@ evas_textblock_cursor_is_format(const Evas_Textblock_Cursor *cur)
7188} 7188}
7189 7189
7190EOLIAN static const Eina_List * 7190EOLIAN static const Eina_List *
7191_evas_textblock_node_format_list_get(Eo *eo_obj, Evas_Textblock_Data *o, const char *anchor) 7191_evas_textblock_node_format_list_get(const Eo *eo_obj, Evas_Textblock_Data *o, const char *anchor)
7192{ 7192{
7193 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 7193 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
7194 evas_object_async_block(obj); 7194 evas_object_async_block(obj);
@@ -10793,14 +10793,14 @@ evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur)
10793 10793
10794/* general controls */ 10794/* general controls */
10795EOLIAN static Eina_Bool 10795EOLIAN static Eina_Bool
10796_evas_textblock_line_number_geometry_get(Eo *eo_obj, Evas_Textblock_Data *o, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) 10796_evas_textblock_line_number_geometry_get(const Eo *eo_obj, Evas_Textblock_Data *o, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
10797{ 10797{
10798 10798
10799 Evas_Object_Textblock_Line *ln; 10799 Evas_Object_Textblock_Line *ln;
10800 10800
10801 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 10801 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
10802 evas_object_async_block(obj); 10802 evas_object_async_block(obj);
10803 _relayout_if_needed(eo_obj, o); 10803 _relayout_if_needed((Evas_Object *)eo_obj, o);
10804 10804
10805 ln = _find_layout_line_num(eo_obj, line); 10805 ln = _find_layout_line_num(eo_obj, line);
10806 if (!ln) return EINA_FALSE; 10806 if (!ln) return EINA_FALSE;
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index c84d0f38d7..92e98fca3e 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -1385,7 +1385,7 @@ _evas_textgrid_palette_set(Eo *eo_obj, Evas_Textgrid_Data *o, Evas_Textgrid_Pale
1385} 1385}
1386 1386
1387EOLIAN static void 1387EOLIAN static void
1388_evas_textgrid_palette_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, Evas_Textgrid_Palette pal, int idx, int *r, int *g, int *b, int *a) 1388_evas_textgrid_palette_get(const Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, Evas_Textgrid_Palette pal, int idx, int *r, int *g, int *b, int *a)
1389{ 1389{
1390 Eina_Array *palette; 1390 Eina_Array *palette;
1391 Evas_Object_Textgrid_Color *color; 1391 Evas_Object_Textgrid_Color *color;
@@ -1442,7 +1442,7 @@ _evas_textgrid_cellrow_set(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, int y,
1442} 1442}
1443 1443
1444EOLIAN static Evas_Textgrid_Cell* 1444EOLIAN static Evas_Textgrid_Cell*
1445_evas_textgrid_cellrow_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, int y) 1445_evas_textgrid_cellrow_get(const Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, int y)
1446{ 1446{
1447 Evas_Textgrid_Cell *ret; 1447 Evas_Textgrid_Cell *ret;
1448 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 1448 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
diff --git a/src/lib/evas/common/evas_model_save.c b/src/lib/evas/common/evas_model_save.c
index 2011c7451f..caf72ca400 100644
--- a/src/lib/evas/common/evas_model_save.c
+++ b/src/lib/evas/common/evas_model_save.c
@@ -8,7 +8,7 @@
8#include "evas_private.h" 8#include "evas_private.h"
9 9
10void 10void
11evas_common_save_model_to_file(Evas_Canvas3D_Mesh *model, 11evas_common_save_model_to_file(const Evas_Canvas3D_Mesh *model,
12 const char *file, 12 const char *file,
13 Evas_Canvas3D_Mesh_Frame *f) 13 Evas_Canvas3D_Mesh_Frame *f)
14{ 14{
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 872dbade8e..24f70cd9cc 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1781,14 +1781,14 @@ void evas_filter_shutdown(void);
1781/* Temporary save/load functions */ 1781/* Temporary save/load functions */
1782void evas_common_load_model_from_file(Evas_Canvas3D_Mesh *model, const char *file); 1782void evas_common_load_model_from_file(Evas_Canvas3D_Mesh *model, const char *file);
1783void evas_common_load_model_from_eina_file(Evas_Canvas3D_Mesh *model, const Eina_File *file); 1783void evas_common_load_model_from_eina_file(Evas_Canvas3D_Mesh *model, const Eina_File *file);
1784void evas_common_save_model_to_file(Evas_Canvas3D_Mesh *model, const char *file, Evas_Canvas3D_Mesh_Frame *f); 1784void evas_common_save_model_to_file(const Evas_Canvas3D_Mesh *model, const char *file, Evas_Canvas3D_Mesh_Frame *f);
1785void evas_model_load_file_eet(Evas_Canvas3D_Mesh *mesh, Eina_File *file); 1785void evas_model_load_file_eet(Evas_Canvas3D_Mesh *mesh, Eina_File *file);
1786void evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh, Eina_File *file); 1786void evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh, Eina_File *file);
1787void evas_model_load_file_obj(Evas_Canvas3D_Mesh *mesh, Eina_File *file); 1787void evas_model_load_file_obj(Evas_Canvas3D_Mesh *mesh, Eina_File *file);
1788void evas_model_load_file_ply(Evas_Canvas3D_Mesh *mesh, Eina_File *file); 1788void evas_model_load_file_ply(Evas_Canvas3D_Mesh *mesh, Eina_File *file);
1789void evas_model_save_file_eet(Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f); 1789void evas_model_save_file_eet(const Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f);
1790void evas_model_save_file_obj(Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f); 1790void evas_model_save_file_obj(const Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f);
1791void evas_model_save_file_ply(Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f); 1791void evas_model_save_file_ply(const Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f);
1792 1792
1793/* Primitives functions */ 1793/* Primitives functions */
1794void evas_common_set_model_from_primitive(Evas_Canvas3D_Mesh *model, int frame, Evas_Canvas3D_Primitive_Data *primitive); 1794void evas_common_set_model_from_primitive(Evas_Canvas3D_Mesh *model, int frame, Evas_Canvas3D_Primitive_Data *primitive);
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 97ac9454f3..71e094ad1d 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
@@ -146,7 +146,7 @@ _set_frame_to_eet_file_from_mesh(Evas_Canvas3D_Mesh_Eet *eet_mesh)
146} 146}
147 147
148void 148void
149evas_model_save_file_eet(Evas_Canvas3D_Mesh *mesh, 149evas_model_save_file_eet(const Evas_Canvas3D_Mesh *mesh,
150 const char *file, 150 const char *file,
151 Evas_Canvas3D_Mesh_Frame *f) 151 Evas_Canvas3D_Mesh_Frame *f)
152{ 152{
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 0d4cd1efdf..b009c32b6c 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
@@ -157,7 +157,7 @@ _save_material(Evas_Canvas3D_Mesh_Data *pd EINA_UNUSED,
157} 157}
158 158
159void 159void
160evas_model_save_file_obj(Evas_Canvas3D_Mesh *mesh, const char *_obj_file_name, Evas_Canvas3D_Mesh_Frame *f) 160evas_model_save_file_obj(const Evas_Canvas3D_Mesh *mesh, const char *_obj_file_name, Evas_Canvas3D_Mesh_Frame *f)
161{ 161{
162 int len; 162 int len;
163 char *_mtl_file_name, *_without_extention; 163 char *_mtl_file_name, *_without_extention;
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 6ebddb046c..e5ad7c2b68 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
@@ -10,7 +10,7 @@
10#include "evas_private.h" 10#include "evas_private.h"
11 11
12void 12void
13evas_model_save_file_ply(Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f) 13evas_model_save_file_ply(const Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f)
14{ 14{
15 float *src_pos, *src_nor, *src_tex, *src_col; 15 float *src_pos, *src_nor, *src_tex, *src_col;
16 int i; 16 int i;