enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

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
This commit is contained in:
Daniel Kolesa 2015-06-25 12:17:58 +01:00
parent 4f2ad23585
commit c709f1dca2
25 changed files with 79 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/eolian/eo_generator.c
View File

@ -512,12 +512,13 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
/* Generation of the user function prototype declaration - not needed when @auto and @empty are indicated */
if (!is_empty && !is_auto)
{
eina_strbuf_append_printf(fbody, "%s _%s%s%s_%s%s(Eo *obj, @#Datatype_Data *pd%s);\n\n",
eina_strbuf_append_printf(fbody, "%s _%s%s%s_%s%s(%sEo *obj, @#Datatype_Data *pd%s);\n\n",
rettype?rettype:"void",
class_env.lower_classname,
impl_env?"_":"",
impl_env?impl_env->lower_classname:"",
eolian_function_name_get(funcid), suffix,
eolian_function_object_is_const(funcid)?"const ":"",
eina_strbuf_string_get(full_params));
}
@ -527,12 +528,13 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
eina_hash_add(_funcs_params_init,
eina_stringshare_add(eolian_function_name_get(funcid)), (void *)ftype);
/* Generation of the intermediate function __eolian_... */
eina_strbuf_append_printf(fbody, "static %s __eolian_%s%s%s_%s%s(Eo *obj%s, @#Datatype_Data *pd%s%s)\n{\n",
eina_strbuf_append_printf(fbody, "static %s __eolian_%s%s%s_%s%s(%sEo *obj%s, @#Datatype_Data *pd%s%s)\n{\n",
rettype?rettype:"void",
class_env.lower_classname,
impl_env?"_":"",
impl_env?impl_env->lower_classname:"",
eolian_function_name_get(funcid), suffix,
eolian_function_object_is_const(funcid)?"const ":"",
is_empty || is_auto?" EINA_UNUSED":"",
is_empty || (is_auto && !eina_strbuf_length_get(params_init))?" EINA_UNUSED":"",
eina_strbuf_string_get(full_params));

2
src/lib/evas/canvas/evas_canvas3d_camera.c
View File

@ -114,7 +114,7 @@ _evas_canvas3d_camera_projection_matrix_set(Eo *obj, Evas_Canvas3D_Camera_Data *
}
EOLIAN static void
_evas_canvas3d_camera_projection_matrix_get(Eo *obj EINA_UNUSED,
_evas_canvas3d_camera_projection_matrix_get(const Eo *obj EINA_UNUSED,
Evas_Canvas3D_Camera_Data *pd,
Evas_Real *matrix)
{

10
src/lib/evas/canvas/evas_canvas3d_light.c
View File

@ -147,7 +147,7 @@ _evas_canvas3d_light_ambient_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas_Rea
}
EOLIAN static void
_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)
_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)
{
if (r) *r = pd->ambient.r;
if (g) *g = pd->ambient.g;
@ -167,7 +167,7 @@ _evas_canvas3d_light_diffuse_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas_Rea
}
EOLIAN static void
_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)
_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)
{
if (r) *r = pd->diffuse.r;
if (g) *g = pd->diffuse.g;
@ -187,7 +187,7 @@ _evas_canvas3d_light_specular_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas_Re
}
EOLIAN static void
_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)
_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)
{
if (r) *r = pd->specular.r;
if (g) *g = pd->specular.g;
@ -232,7 +232,7 @@ _evas_canvas3d_light_attenuation_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas
}
EOLIAN static void
_evas_canvas3d_light_attenuation_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Light_Data *pd, Evas_Real *constant, Evas_Real *linear, Evas_Real *quadratic)
_evas_canvas3d_light_attenuation_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Light_Data *pd, Evas_Real *constant, Evas_Real *linear, Evas_Real *quadratic)
{
if (constant) *constant = pd->atten_const;
if (linear) *linear = pd->atten_linear;
@ -264,7 +264,7 @@ _evas_canvas3d_light_projection_matrix_set(Eo *obj, Evas_Canvas3D_Light_Data *pd
}
EOLIAN static void
_evas_canvas3d_light_projection_matrix_get(Eo *obj EINA_UNUSED,
_evas_canvas3d_light_projection_matrix_get(const Eo *obj EINA_UNUSED,
Evas_Canvas3D_Light_Data *pd,
Evas_Real *matrix)
{

2
src/lib/evas/canvas/evas_canvas3d_material.c
View File

@ -159,7 +159,7 @@ _evas_canvas3d_material_color_set(Eo *obj, Evas_Canvas3D_Material_Data *pd, Evas
}
EOLIAN static void
_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)
_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)
{
if (r) *r = pd->attribs[attrib].color.r;
if (g) *g = pd->attribs[attrib].color.g;

8
src/lib/evas/canvas/evas_canvas3d_mesh.c
View File

@ -634,7 +634,7 @@ _evas_canvas3d_mesh_frame_vertex_data_unmap(Eo *obj EINA_UNUSED, Evas_Canvas3D_M
}
EOLIAN static int
_evas_canvas3d_mesh_frame_vertex_stride_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd, int frame, Evas_Canvas3D_Vertex_Attrib attrib)
_evas_canvas3d_mesh_frame_vertex_stride_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd, int frame, Evas_Canvas3D_Vertex_Attrib attrib)
{
Evas_Canvas3D_Mesh_Frame *f = evas_canvas3d_mesh_frame_find(pd, frame);
@ -706,13 +706,13 @@ _evas_canvas3d_mesh_index_data_copy_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_
}
EOLIAN static Evas_Canvas3D_Index_Format
_evas_canvas3d_mesh_index_format_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd)
_evas_canvas3d_mesh_index_format_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd)
{
return pd->index_format;
}
EOLIAN static int
_evas_canvas3d_mesh_index_count_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd)
_evas_canvas3d_mesh_index_count_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data *pd)
{
return pd->index_count;
}
@ -879,7 +879,7 @@ _evas_canvas3d_mesh_efl_file_file_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd,
}
EOLIAN static Eina_Bool
_evas_canvas3d_mesh_efl_file_save(Eo *obj, Evas_Canvas3D_Mesh_Data *pd,
_evas_canvas3d_mesh_efl_file_save(const Eo *obj, Evas_Canvas3D_Mesh_Data *pd,
const char *file,
const char *key EINA_UNUSED,
const char *flags EINA_UNUSED)

14
src/lib/evas/canvas/evas_canvas3d_node.c
View File

@ -1158,7 +1158,7 @@ _evas_canvas3d_node_eo_base_destructor(Eo *obj, Evas_Canvas3D_Node_Data *pd EINA
}
EOLIAN static Evas_Canvas3D_Node_Type
_evas_canvas3d_node_type_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd)
_evas_canvas3d_node_type_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd)
{
return pd->type;
}
@ -1226,13 +1226,13 @@ _evas_canvas3d_node_member_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
}
EOLIAN static Evas_Canvas3D_Node *
_evas_canvas3d_node_parent_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd)
_evas_canvas3d_node_parent_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd)
{
return pd->parent;
}
EOLIAN static const Eina_List *
_evas_canvas3d_node_member_list_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd)
_evas_canvas3d_node_member_list_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd)
{
return pd->members;
}
@ -1288,7 +1288,7 @@ _evas_canvas3d_node_scale_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Real x,
}
EOLIAN static void
_evas_canvas3d_node_position_get(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Space space,
_evas_canvas3d_node_position_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Space space,
Evas_Real *x, Evas_Real *y, Evas_Real *z)
{
if (space == EVAS_CANVAS3D_SPACE_LOCAL)
@ -1314,7 +1314,7 @@ _evas_canvas3d_node_position_get(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canv
}
EOLIAN static void
_evas_canvas3d_node_orientation_get(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Space space,
_evas_canvas3d_node_orientation_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Space space,
Evas_Real *x, Evas_Real *y, Evas_Real *z, Evas_Real *w)
{
if (space == EVAS_CANVAS3D_SPACE_LOCAL)
@ -1344,7 +1344,7 @@ _evas_canvas3d_node_orientation_get(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_C
}
EOLIAN static void
_evas_canvas3d_node_scale_get(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Space space,
_evas_canvas3d_node_scale_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Space space,
Evas_Real *x, Evas_Real *y, Evas_Real *z)
{
if (space == EVAS_CANVAS3D_SPACE_LOCAL)
@ -1661,7 +1661,7 @@ _evas_canvas3d_node_mesh_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D
}
EOLIAN static const Eina_List *
_evas_canvas3d_node_mesh_list_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd)
_evas_canvas3d_node_mesh_list_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd)
{
return pd->data.mesh.meshes;
}

4
src/lib/evas/canvas/evas_canvas3d_object.c
View File

@ -29,13 +29,13 @@ _evas_canvas3d_object_type_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Object_Data *p
}
EOLIAN static Evas_Canvas3D_Object_Type
_evas_canvas3d_object_type_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Object_Data *pd)
_evas_canvas3d_object_type_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Object_Data *pd)
{
return pd->type;
}
EOLIAN static Eina_Bool
_evas_canvas3d_object_dirty_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Object_Data *pd, Evas_Canvas3D_State state)
_evas_canvas3d_object_dirty_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Object_Data *pd, Evas_Canvas3D_State state)
{
return pd->dirty[state];
}

14
src/lib/evas/canvas/evas_canvas3d_scene.c
View File

@ -145,7 +145,7 @@ _evas_canvas3d_scene_size_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd,
}
EOLIAN static void
_evas_canvas3d_scene_size_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd, int *w, int *h)
_evas_canvas3d_scene_size_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd, int *w, int *h)
{
if (w) *w = pd->w;
if (h) *h = pd->h;
@ -160,7 +160,7 @@ _evas_canvas3d_scene_background_color_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Sce
}
EOLIAN static void
_evas_canvas3d_scene_background_color_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd,
_evas_canvas3d_scene_background_color_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd,
Evas_Real *r, Evas_Real *g, Evas_Real *b, Evas_Real *a)
{
if (r) *r = pd->bg_color.r;
@ -588,7 +588,7 @@ static void _node_mesh_colors_free_cb(void *data)
}
EOLIAN static Eina_Bool
_evas_canvas3d_scene_pick(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real x, Evas_Real y,
_evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real x, Evas_Real y,
Evas_Canvas3D_Node **node, Evas_Canvas3D_Mesh **mesh,
Evas_Real *s, Evas_Real *t)
{
@ -714,7 +714,7 @@ _evas_canvas3d_scene_pick(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real x, Ev
}
EOLIAN static Evas_Canvas3D_Node *
_evas_canvas3d_scene_exist(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real x, Evas_Real y, Evas_Canvas3D_Node *node)
_evas_canvas3d_scene_exist(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real x, Evas_Real y, Evas_Canvas3D_Node *node)
{
Evas_Canvas3D_Pick_Data data;
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
}
EOLIAN static Eina_List *
_evas_canvas3d_scene_pick_member_list_get(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real x, Evas_Real y)
_evas_canvas3d_scene_pick_member_list_get(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real x, Evas_Real y)
{
const Eina_List *list = NULL, *l = NULL;
Eina_List *picked_nodes = NULL;
@ -776,7 +776,7 @@ _evas_canvas3d_scene_pick_member_list_get(Eo *obj, Evas_Canvas3D_Scene_Data *pd,
}
EOLIAN static Eina_Bool
_evas_canvas3d_scene_shadows_enable_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd)
_evas_canvas3d_scene_shadows_enable_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd)
{
return pd->shadows_enabled;
}
@ -789,7 +789,7 @@ _evas_canvas3d_scene_shadows_enable_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene
}
EOLIAN static Eina_Bool
_evas_canvas3d_scene_color_pick_enable_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd)
_evas_canvas3d_scene_color_pick_enable_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd)
{
return pd->color_pick_enabled;
}

6
src/lib/evas/canvas/evas_canvas3d_texture.c
View File

@ -480,7 +480,7 @@ _evas_canvas3d_texture_source_visible_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Tex
}
EOLIAN static Evas_Colorspace
_evas_canvas3d_texture_color_format_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Texture_Data *pd)
_evas_canvas3d_texture_color_format_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Texture_Data *pd)
{
Evas_Colorspace format = -1;
Eo *evas = NULL;
@ -500,7 +500,7 @@ _evas_canvas3d_texture_color_format_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Textu
}
EOLIAN static void
_evas_canvas3d_texture_size_get(Eo *obj, Evas_Canvas3D_Texture_Data *pd, int *w, int *h)
_evas_canvas3d_texture_size_get(const Eo *obj, Evas_Canvas3D_Texture_Data *pd, int *w, int *h)
{
Eo *evas = NULL;
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_
}
EOLIAN static void
_evas_canvas3d_texture_filter_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Texture_Filter *min, Evas_Canvas3D_Texture_Filter *mag)
_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)
{
Eo *evas = NULL;
eo_do(obj, evas = evas_common_evas_get());

2
src/lib/evas/canvas/evas_filter_mixin.c
View File

@ -400,7 +400,7 @@ update:
}
EOLIAN void
_evas_filter_efl_gfx_filter_source_get(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd,
_evas_filter_efl_gfx_filter_source_get(const Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd,
const char *name, Efl_Gfx_Base **source)
{
if (!source) return;

8
src/lib/evas/canvas/evas_main.c
View File

@ -459,28 +459,28 @@ _evas_canvas_output_framespace_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Ev
}
EOLIAN static Evas_Coord
_evas_canvas_coord_screen_x_to_world(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int x)
_evas_canvas_coord_screen_x_to_world(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int x)
{
if (e->output.w == e->viewport.w) return e->viewport.x + x;
else return (long long)e->viewport.x + (((long long)x * (long long)e->viewport.w) / (long long)e->output.w);
}
EOLIAN static Evas_Coord
_evas_canvas_coord_screen_y_to_world(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int y)
_evas_canvas_coord_screen_y_to_world(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int y)
{
if (e->output.h == e->viewport.h) return e->viewport.y + y;
else return (long long)e->viewport.y + (((long long)y * (long long)e->viewport.h) / (long long)e->output.h);
}
EOLIAN static int
_evas_canvas_coord_world_x_to_screen(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x)
_evas_canvas_coord_world_x_to_screen(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x)
{
if (e->output.w == e->viewport.w) return x - e->viewport.x;
else return (int)((((long long)x - (long long)e->viewport.x) * (long long)e->output.w) / (long long)e->viewport.w);
}
EOLIAN static int
_evas_canvas_coord_world_y_to_screen(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord y)
_evas_canvas_coord_world_y_to_screen(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord y)
{
if (e->output.h == e->viewport.h) return y - e->viewport.y;
else return (int)((((long long)y - (long long)e->viewport.y) * (long long)e->output.h) / (long long)e->viewport.h);

10
src/lib/evas/canvas/evas_object_box.c
View File

@ -1841,7 +1841,7 @@ _evas_box_remove_all(Eo *o, Evas_Object_Box_Data *priv, Eina_Bool clear)
}
EOLIAN static Eina_Iterator*
_evas_box_iterator_new(Eo *o, Evas_Object_Box_Data *priv)
_evas_box_iterator_new(const Eo *o, Evas_Object_Box_Data *priv)
{
Evas_Object_Box_Iterator *it;
@ -1863,7 +1863,7 @@ _evas_box_iterator_new(Eo *o, Evas_Object_Box_Data *priv)
}
EOLIAN static Eina_Accessor*
_evas_box_accessor_new(Eo *o, Evas_Object_Box_Data *priv)
_evas_box_accessor_new(const Eo *o, Evas_Object_Box_Data *priv)
{
Evas_Object_Box_Accessor *it;
@ -1899,13 +1899,13 @@ evas_object_box_children_get(const Evas_Object *o)
}
EOLIAN static const char*
_evas_box_option_property_name_get(Eo *o EINA_UNUSED, Evas_Object_Box_Data *_pd EINA_UNUSED, int property EINA_UNUSED)
_evas_box_option_property_name_get(const Eo *o EINA_UNUSED, Evas_Object_Box_Data *_pd EINA_UNUSED, int property EINA_UNUSED)
{
return NULL;
}
EOLIAN static int
_evas_box_option_property_id_get(Eo *o EINA_UNUSED, Evas_Object_Box_Data *_pd EINA_UNUSED, const char *name EINA_UNUSED)
_evas_box_option_property_id_get(const Eo *o EINA_UNUSED, Evas_Object_Box_Data *_pd EINA_UNUSED, const char *name EINA_UNUSED)
{
return -1;
}
@ -1960,7 +1960,7 @@ evas_object_box_option_property_vget(const Evas_Object *o, Evas_Object_Box_Optio
}
EOLIAN static Eina_Bool
_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)
_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)
{
return EINA_FALSE;
}

6
src/lib/evas/canvas/evas_object_grid.c
View File

@ -395,7 +395,7 @@ _evas_grid_clear(Eo *o, Evas_Grid_Data *priv, Eina_Bool clear)
}
EOLIAN static Eina_Bool
_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)
_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)
{
Evas_Object_Grid_Option *opt;
@ -414,7 +414,7 @@ _evas_grid_pack_get(Eo *o EINA_UNUSED, Evas_Grid_Data *_pd EINA_UNUSED, Evas_Obj
}
EOLIAN static Eina_Iterator*
_evas_grid_iterator_new(Eo *o, Evas_Grid_Data *priv)
_evas_grid_iterator_new(const Eo *o, Evas_Grid_Data *priv)
{
Evas_Object_Grid_Iterator *it;
@ -436,7 +436,7 @@ _evas_grid_iterator_new(Eo *o, Evas_Grid_Data *priv)
}
EOLIAN static Eina_Accessor*
_evas_grid_accessor_new(Eo *o, Evas_Grid_Data *priv)
_evas_grid_accessor_new(const Eo *o, Evas_Grid_Data *priv)
{
Evas_Object_Grid_Accessor *it;

6
src/lib/evas/canvas/evas_object_image.c
View File

@ -1318,7 +1318,7 @@ _evas_image_data_set(Eo *eo_obj, Evas_Image_Data *o, void *data)
}
EOLIAN static void*
_evas_image_data_get(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED, Eina_Bool for_writing)
_evas_image_data_get(const Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED, Eina_Bool for_writing)
{
Evas_Image_Data *o = (Evas_Image_Data *) _pd;
DATA32 *data;
@ -1620,7 +1620,7 @@ _evas_image_reload(Eo *eo_obj, Evas_Image_Data *o)
}
EOLIAN static Eina_Bool
_evas_image_efl_file_save(Eo *eo_obj, Evas_Image_Data *o, const char *file, const char *key, const char *flags)
_evas_image_efl_file_save(const Eo *eo_obj, Evas_Image_Data *o, const char *file, const char *key, const char *flags)
{
DATA32 *data = NULL;
int quality = 80, compress = 9, ok = 0;
@ -2221,7 +2221,7 @@ _evas_image_animated_loop_count_get(Eo *eo_obj, Evas_Image_Data *o)
}
EOLIAN static double
_evas_image_animated_frame_duration_get(Eo *eo_obj, Evas_Image_Data *o, int start_frame, int frame_num)
_evas_image_animated_frame_duration_get(const Eo *eo_obj, Evas_Image_Data *o, int start_frame, int frame_num)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
int frame_count = 0;

4
src/lib/evas/canvas/evas_object_main.c
View File

@ -2003,13 +2003,13 @@ _evas_object_smart_data_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *
}
EOLIAN static Eina_Bool
_evas_object_smart_type_check(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, const char *type EINA_UNUSED)
_evas_object_smart_type_check(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, const char *type EINA_UNUSED)
{
return EINA_FALSE;
}
EOLIAN static Eina_Bool
_evas_object_smart_type_check_ptr(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, const char *type EINA_UNUSED)
_evas_object_smart_type_check_ptr(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, const char *type EINA_UNUSED)
{
return EINA_FALSE;
}

10
src/lib/evas/canvas/evas_object_smart.c
View File

@ -310,7 +310,7 @@ _evas_object_smart_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, E
}
EOLIAN static Eina_Bool
_evas_object_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char *type)
_evas_object_smart_evas_object_smart_type_check(const Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char *type)
{
const Evas_Smart_Class *sc;
Eo_Class *klass;
@ -340,7 +340,7 @@ _evas_object_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o E
}
EOLIAN static Eina_Bool
_evas_object_smart_evas_object_smart_type_check_ptr(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char* type)
_evas_object_smart_evas_object_smart_type_check_ptr(const Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char* type)
{
Eo_Class *klass;
const Evas_Smart_Class *sc;
@ -405,7 +405,7 @@ _evas_object_smart_iterator_free(Evas_Object_Smart_Iterator *it)
// Should we have an eo_children_iterator_new API and just inherit from it ?
EOLIAN static Eina_Iterator*
_evas_object_smart_iterator_new(Eo *eo_obj, Evas_Smart_Data *priv)
_evas_object_smart_iterator_new(const Eo *eo_obj, Evas_Smart_Data *priv)
{
Evas_Object_Smart_Iterator *it;
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
}
EOLIAN static void
_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)
_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)
{
if (class_descriptions) *class_descriptions = NULL;
if (class_count) *class_count = 0;
@ -831,7 +831,7 @@ _evas_object_smart_callbacks_descriptions_get(Eo *eo_obj, Evas_Smart_Data *o, co
}
EOLIAN static void
_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)
_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)
{
if (!name)

6
src/lib/evas/canvas/evas_object_table.c
View File

@ -1056,7 +1056,7 @@ _evas_table_padding_get(Eo *o EINA_UNUSED, Evas_Table_Data *priv, Evas_Coord *ho
}
EOLIAN static Eina_Bool
_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)
_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)
{
Evas_Object_Table_Option *opt;
@ -1310,7 +1310,7 @@ _evas_table_col_row_size_get(Eo *o EINA_UNUSED, Evas_Table_Data *priv, int *cols
}
EOLIAN static Eina_Iterator*
_evas_table_iterator_new(Eo *o, Evas_Table_Data *priv)
_evas_table_iterator_new(const Eo *o, Evas_Table_Data *priv)
{
Evas_Object_Table_Iterator *it;
@ -1338,7 +1338,7 @@ _evas_table_iterator_new(Eo *o, Evas_Table_Data *priv)
}
EOLIAN static Eina_Accessor*
_evas_table_accessor_new(Eo *o, Evas_Table_Data *priv)
_evas_table_accessor_new(const Eo *o, Evas_Table_Data *priv)
{
Evas_Object_Table_Accessor *it;

8
src/lib/evas/canvas/evas_object_text.c
View File

@ -656,7 +656,7 @@ _layout_text_item_trim(Evas_Object_Protected_Data *obj, Evas_Text_Data *o, Evas_
}
static void
_evas_object_text_pad_get(Evas_Object *eo_obj, Evas_Text_Data *o, int *l, int *r, int *t, int *b)
_evas_object_text_pad_get(const Eo *eo_obj, Evas_Text_Data *o, int *l, int *r, int *t, int *b)
{
if (l) *l = 0;
if (r) *r = 0;
@ -1116,7 +1116,7 @@ _evas_text_vert_advance_get(Eo *eo_obj, Evas_Text_Data *o)
}
EOLIAN static Eina_Bool
_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)
_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)
{
Eina_Bool ret;
ret = EINA_FALSE;
@ -1159,7 +1159,7 @@ _evas_text_char_pos_get(Eo *eo_obj, Evas_Text_Data *o, int pos, Evas_Coord *cx,
}
EOLIAN static int
_evas_text_last_up_to_pos(Eo *eo_obj, Evas_Text_Data *o, Evas_Coord x, Evas_Coord y)
_evas_text_last_up_to_pos(const Eo *eo_obj, Evas_Text_Data *o, Evas_Coord x, Evas_Coord y)
{
int ret;
ret = -1;
@ -1173,7 +1173,7 @@ _evas_text_last_up_to_pos(Eo *eo_obj, Evas_Text_Data *o, Evas_Coord x, Evas_Coor
}
EOLIAN static int
_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)
_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)
{
int ret;
ret = -1;

10
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -6101,7 +6101,7 @@ _evas_textblock_style_user_push(Eo *eo_obj, Evas_Textblock_Data *o, Evas_Textblo
}
EOLIAN static const Evas_Textblock_Style*
_evas_textblock_style_user_peek(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Data *o)
_evas_textblock_style_user_peek(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Data *o)
{
return o->style_user;
}
@ -7150,7 +7150,7 @@ _evas_textblock_cursor_get(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Data *o)
}
EOLIAN static Evas_Textblock_Cursor*
_evas_textblock_cursor_new(Eo *eo_obj, Evas_Textblock_Data *o)
_evas_textblock_cursor_new(const Eo *eo_obj, Evas_Textblock_Data *o)
{
Evas_Textblock_Cursor *cur;
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)
}
EOLIAN static const Eina_List *
_evas_textblock_node_format_list_get(Eo *eo_obj, Evas_Textblock_Data *o, const char *anchor)
_evas_textblock_node_format_list_get(const Eo *eo_obj, Evas_Textblock_Data *o, const char *anchor)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
evas_object_async_block(obj);
@ -10793,14 +10793,14 @@ evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur)
/* general controls */
EOLIAN static Eina_Bool
_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)
_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)
{
Evas_Object_Textblock_Line *ln;
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
evas_object_async_block(obj);
_relayout_if_needed(eo_obj, o);
_relayout_if_needed((Evas_Object *)eo_obj, o);
ln = _find_layout_line_num(eo_obj, line);
if (!ln) return EINA_FALSE;

4
src/lib/evas/canvas/evas_object_textgrid.c
View File

@ -1385,7 +1385,7 @@ _evas_textgrid_palette_set(Eo *eo_obj, Evas_Textgrid_Data *o, Evas_Textgrid_Pale
}
EOLIAN static void
_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)
_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)
{
Eina_Array *palette;
Evas_Object_Textgrid_Color *color;
@ -1442,7 +1442,7 @@ _evas_textgrid_cellrow_set(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, int y,
}
EOLIAN static Evas_Textgrid_Cell*
_evas_textgrid_cellrow_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, int y)
_evas_textgrid_cellrow_get(const Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, int y)
{
Evas_Textgrid_Cell *ret;
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);

2
src/lib/evas/common/evas_model_save.c
View File

@ -8,7 +8,7 @@
#include "evas_private.h"
void
evas_common_save_model_to_file(Evas_Canvas3D_Mesh *model,
evas_common_save_model_to_file(const Evas_Canvas3D_Mesh *model,
const char *file,
Evas_Canvas3D_Mesh_Frame *f)
{

8
src/lib/evas/include/evas_private.h
View File

@ -1781,14 +1781,14 @@ void evas_filter_shutdown(void);
/* Temporary save/load functions */
void evas_common_load_model_from_file(Evas_Canvas3D_Mesh *model, const char *file);
void evas_common_load_model_from_eina_file(Evas_Canvas3D_Mesh *model, const Eina_File *file);
void evas_common_save_model_to_file(Evas_Canvas3D_Mesh *model, const char *file, Evas_Canvas3D_Mesh_Frame *f);
void evas_common_save_model_to_file(const Evas_Canvas3D_Mesh *model, const char *file, Evas_Canvas3D_Mesh_Frame *f);
void evas_model_load_file_eet(Evas_Canvas3D_Mesh *mesh, Eina_File *file);
void evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh, Eina_File *file);
void evas_model_load_file_obj(Evas_Canvas3D_Mesh *mesh, Eina_File *file);
void evas_model_load_file_ply(Evas_Canvas3D_Mesh *mesh, Eina_File *file);
void evas_model_save_file_eet(Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f);
void evas_model_save_file_obj(Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f);
void evas_model_save_file_ply(Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f);
void evas_model_save_file_eet(const Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f);
void evas_model_save_file_obj(const Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f);
void evas_model_save_file_ply(const Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f);
/* Primitives functions */
void evas_common_set_model_from_primitive(Evas_Canvas3D_Mesh *model, int frame, Evas_Canvas3D_Primitive_Data *primitive);

2
src/modules/evas/model_savers/eet/evas_model_save_eet.c
View File

@ -146,7 +146,7 @@ _set_frame_to_eet_file_from_mesh(Evas_Canvas3D_Mesh_Eet *eet_mesh)
}
void
evas_model_save_file_eet(Evas_Canvas3D_Mesh *mesh,
evas_model_save_file_eet(const Evas_Canvas3D_Mesh *mesh,
const char *file,
Evas_Canvas3D_Mesh_Frame *f)
{

2
src/modules/evas/model_savers/obj/evas_model_save_obj.c
View File

@ -157,7 +157,7 @@ _save_material(Evas_Canvas3D_Mesh_Data *pd EINA_UNUSED,
}
void
evas_model_save_file_obj(Evas_Canvas3D_Mesh *mesh, const char *_obj_file_name, Evas_Canvas3D_Mesh_Frame *f)
evas_model_save_file_obj(const Evas_Canvas3D_Mesh *mesh, const char *_obj_file_name, Evas_Canvas3D_Mesh_Frame *f)
{
int len;
char *_mtl_file_name, *_without_extention;

2
src/modules/evas/model_savers/ply/evas_model_save_ply.c
View File

@ -10,7 +10,7 @@
#include "evas_private.h"
void
evas_model_save_file_ply(Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f)
evas_model_save_file_ply(const Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f)
{
float *src_pos, *src_nor, *src_tex, *src_col;
int i;