From 5d571051b9e2d5aaf99e3dd8d4166de0a544775f Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Fri, 8 Feb 2008 22:35:19 +0000 Subject: [PATCH] Add const to Evas api: objects and remaining bits. SVN revision: 33716 --- legacy/evas/src/lib/Evas.h | 200 +++++++++--------- legacy/evas/src/lib/canvas/evas_clip.c | 4 +- legacy/evas/src/lib/canvas/evas_data.c | 8 +- legacy/evas/src/lib/canvas/evas_events.c | 8 +- legacy/evas/src/lib/canvas/evas_focus.c | 2 +- legacy/evas/src/lib/canvas/evas_key.c | 4 +- legacy/evas/src/lib/canvas/evas_layer.c | 2 +- legacy/evas/src/lib/canvas/evas_name.c | 2 +- .../src/lib/canvas/evas_object_gradient.c | 14 +- .../evas/src/lib/canvas/evas_object_image.c | 34 +-- legacy/evas/src/lib/canvas/evas_object_line.c | 2 +- legacy/evas/src/lib/canvas/evas_object_main.c | 18 +- .../evas/src/lib/canvas/evas_object_smart.c | 8 +- legacy/evas/src/lib/canvas/evas_object_text.c | 36 ++-- .../src/lib/canvas/evas_object_textblock.c | 56 ++--- legacy/evas/src/lib/canvas/evas_stack.c | 19 +- legacy/evas/src/lib/imaging/evas_imaging.c | 24 +-- 17 files changed, 220 insertions(+), 221 deletions(-) diff --git a/legacy/evas/src/lib/Evas.h b/legacy/evas/src/lib/Evas.h index f79f20d409..1fad432bee 100644 --- a/legacy/evas/src/lib/Evas.h +++ b/legacy/evas/src/lib/Evas.h @@ -449,7 +449,7 @@ extern "C" { /* line objects */ EAPI Evas_Object *evas_object_line_add (Evas *e); EAPI void evas_object_line_xy_set (Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2); - EAPI void evas_object_line_xy_get (Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1, Evas_Coord *x2, Evas_Coord *y2); + EAPI void evas_object_line_xy_get (const Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1, Evas_Coord *x2, Evas_Coord *y2); /* gradient objects */ EAPI Evas_Object *evas_object_gradient_add (Evas *e); @@ -459,19 +459,19 @@ extern "C" { EAPI void evas_object_gradient_alpha_data_set (Evas_Object *obj, void *alpha_data, int len); EAPI void evas_object_gradient_clear (Evas_Object *obj); EAPI void evas_object_gradient_type_set (Evas_Object *obj, const char *type, const char *instance_params); - EAPI void evas_object_gradient_type_get (Evas_Object *obj, char **type, char **instance_params); + EAPI void evas_object_gradient_type_get (const Evas_Object *obj, char **type, char **instance_params); EAPI void evas_object_gradient_fill_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); - EAPI void evas_object_gradient_fill_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); + EAPI void evas_object_gradient_fill_get (const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); EAPI void evas_object_gradient_fill_angle_set (Evas_Object *obj, Evas_Angle angle); - EAPI Evas_Angle evas_object_gradient_fill_angle_get (Evas_Object *obj); + EAPI Evas_Angle evas_object_gradient_fill_angle_get (const Evas_Object *obj); EAPI void evas_object_gradient_fill_spread_set (Evas_Object *obj, int tile_mode); - EAPI int evas_object_gradient_fill_spread_get (Evas_Object *obj); + EAPI int evas_object_gradient_fill_spread_get (const Evas_Object *obj); EAPI void evas_object_gradient_angle_set (Evas_Object *obj, Evas_Angle angle); - EAPI Evas_Angle evas_object_gradient_angle_get (Evas_Object *obj); + EAPI Evas_Angle evas_object_gradient_angle_get (const Evas_Object *obj); EAPI void evas_object_gradient_direction_set (Evas_Object *obj, int direction); - EAPI int evas_object_gradient_direction_get (Evas_Object *obj); + EAPI int evas_object_gradient_direction_get (const Evas_Object *obj); EAPI void evas_object_gradient_offset_set (Evas_Object *obj, float offset); - EAPI float evas_object_gradient_offset_get (Evas_Object *obj); + EAPI float evas_object_gradient_offset_get (const Evas_Object *obj); /* polygon objects */ EAPI Evas_Object *evas_object_polygon_add (Evas *e); @@ -481,41 +481,41 @@ extern "C" { /* image objects */ EAPI Evas_Object *evas_object_image_add (Evas *e); EAPI void evas_object_image_file_set (Evas_Object *obj, const char *file, const char *key); - EAPI void evas_object_image_file_get (Evas_Object *obj, const char **file, const char **key); + EAPI void evas_object_image_file_get (const Evas_Object *obj, const char **file, const char **key); EAPI void evas_object_image_border_set (Evas_Object *obj, int l, int r, int t, int b); - EAPI void evas_object_image_border_get (Evas_Object *obj, int *l, int *r, int *t, int *b); + EAPI void evas_object_image_border_get (const Evas_Object *obj, int *l, int *r, int *t, int *b); EAPI void evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Bool fill); - EAPI Evas_Bool evas_object_image_border_center_fill_get(Evas_Object *obj); + EAPI Evas_Bool evas_object_image_border_center_fill_get(const Evas_Object *obj); EAPI void evas_object_image_fill_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); - EAPI void evas_object_image_fill_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); + EAPI void evas_object_image_fill_get (const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); EAPI void evas_object_image_size_set (Evas_Object *obj, int w, int h); - EAPI void evas_object_image_size_get (Evas_Object *obj, int *w, int *h); - EAPI int evas_object_image_stride_get (Evas_Object *obj); - EAPI int evas_object_image_load_error_get (Evas_Object *obj); + EAPI void evas_object_image_size_get (const Evas_Object *obj, int *w, int *h); + EAPI int evas_object_image_stride_get (const Evas_Object *obj); + EAPI int evas_object_image_load_error_get (const Evas_Object *obj); EAPI void evas_object_image_data_set (Evas_Object *obj, void *data); - EAPI void *evas_object_image_data_get (Evas_Object *obj, Evas_Bool for_writing); + EAPI void *evas_object_image_data_get (const Evas_Object *obj, Evas_Bool for_writing); EAPI void evas_object_image_data_copy_set (Evas_Object *obj, void *data); EAPI void evas_object_image_data_update_add (Evas_Object *obj, int x, int y, int w, int h); EAPI void evas_object_image_alpha_set (Evas_Object *obj, Evas_Bool has_alpha); - EAPI Evas_Bool evas_object_image_alpha_get (Evas_Object *obj); + EAPI Evas_Bool evas_object_image_alpha_get (const Evas_Object *obj); EAPI void evas_object_image_smooth_scale_set(Evas_Object *obj, Evas_Bool smooth_scale); - EAPI Evas_Bool evas_object_image_smooth_scale_get(Evas_Object *obj); + EAPI Evas_Bool evas_object_image_smooth_scale_get(const Evas_Object *obj); EAPI void evas_object_image_reload (Evas_Object *obj); - EAPI Evas_Bool evas_object_image_save (Evas_Object *obj, const char *file, const char *key, const char *flags); + EAPI Evas_Bool evas_object_image_save (const Evas_Object *obj, const char *file, const char *key, const char *flags); EAPI Evas_Bool evas_object_image_pixels_import (Evas_Object *obj, Evas_Pixel_Import_Source *pixels); EAPI void evas_object_image_pixels_get_callback_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *o), void *data); EAPI void evas_object_image_pixels_dirty_set (Evas_Object *obj, Evas_Bool dirty); - EAPI Evas_Bool evas_object_image_pixels_dirty_get (Evas_Object *obj); + EAPI Evas_Bool evas_object_image_pixels_dirty_get (const Evas_Object *obj); EAPI void evas_object_image_load_dpi_set (Evas_Object *obj, double dpi); - EAPI double evas_object_image_load_dpi_get (Evas_Object *obj); + EAPI double evas_object_image_load_dpi_get (const Evas_Object *obj); EAPI void evas_object_image_load_size_set (Evas_Object *obj, int w, int h); - EAPI void evas_object_image_load_size_get (Evas_Object *obj, int *w, int *h); + EAPI void evas_object_image_load_size_get (const Evas_Object *obj, int *w, int *h); EAPI void evas_object_image_load_scale_down_set (Evas_Object *obj, int scale_down); - EAPI int evas_object_image_load_scale_down_get (Evas_Object *obj); + EAPI int evas_object_image_load_scale_down_get (const Evas_Object *obj); EAPI void evas_object_image_colorspace_set (Evas_Object *obj, Evas_Colorspace cspace); - EAPI Evas_Colorspace evas_object_image_colorspace_get (Evas_Object *obj); + EAPI Evas_Colorspace evas_object_image_colorspace_get (const Evas_Object *obj); EAPI void evas_object_image_native_surface_set (Evas_Object *obj, Evas_Native_Surface *surf); - EAPI Evas_Native_Surface *evas_object_image_native_surface_get (Evas_Object *obj); + EAPI Evas_Native_Surface *evas_object_image_native_surface_get (const Evas_Object *obj); /* image cache */ EAPI void evas_image_cache_flush (Evas *e); @@ -540,31 +540,31 @@ extern "C" { EAPI Evas_Object *evas_object_text_add (Evas *e); EAPI void evas_object_text_font_source_set (Evas_Object *obj, const char *font); - EAPI const char *evas_object_text_font_source_get (Evas_Object *obj); + EAPI const char *evas_object_text_font_source_get (const Evas_Object *obj); EAPI void evas_object_text_font_set (Evas_Object *obj, const char *font, Evas_Font_Size size); - EAPI void evas_object_text_font_get (Evas_Object *obj, const char **font, Evas_Font_Size *size); + EAPI void evas_object_text_font_get (const Evas_Object *obj, const char **font, Evas_Font_Size *size); EAPI void evas_object_text_text_set (Evas_Object *obj, const char *text); - EAPI const char *evas_object_text_text_get (Evas_Object *obj); - EAPI Evas_Coord evas_object_text_ascent_get (Evas_Object *obj); - EAPI Evas_Coord evas_object_text_descent_get (Evas_Object *obj); - EAPI Evas_Coord evas_object_text_max_ascent_get (Evas_Object *obj); - EAPI Evas_Coord evas_object_text_max_descent_get (Evas_Object *obj); - EAPI Evas_Coord evas_object_text_horiz_advance_get(Evas_Object *obj); - EAPI Evas_Coord evas_object_text_vert_advance_get (Evas_Object *obj); - EAPI Evas_Coord evas_object_text_inset_get (Evas_Object *obj); - EAPI int evas_object_text_char_pos_get (Evas_Object *obj, int pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); - EAPI int evas_object_text_char_coords_get (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); - EAPI Evas_Text_Style_Type evas_object_text_style_get (Evas_Object *obj); + EAPI const char *evas_object_text_text_get (const Evas_Object *obj); + EAPI Evas_Coord evas_object_text_ascent_get (const Evas_Object *obj); + EAPI Evas_Coord evas_object_text_descent_get (const Evas_Object *obj); + EAPI Evas_Coord evas_object_text_max_ascent_get (const Evas_Object *obj); + EAPI Evas_Coord evas_object_text_max_descent_get (const Evas_Object *obj); + EAPI Evas_Coord evas_object_text_horiz_advance_get(const Evas_Object *obj); + EAPI Evas_Coord evas_object_text_vert_advance_get (const Evas_Object *obj); + EAPI Evas_Coord evas_object_text_inset_get (const Evas_Object *obj); + EAPI int evas_object_text_char_pos_get (const Evas_Object *obj, int pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); + EAPI int evas_object_text_char_coords_get (const Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); + EAPI Evas_Text_Style_Type evas_object_text_style_get (const Evas_Object *obj); EAPI void evas_object_text_style_set (Evas_Object *obj, Evas_Text_Style_Type type); EAPI void evas_object_text_shadow_color_set (Evas_Object *obj, int r, int g, int b, int a); - EAPI void evas_object_text_shadow_color_get (Evas_Object *obj, int *r, int *g, int *b, int *a); + EAPI void evas_object_text_shadow_color_get (const Evas_Object *obj, int *r, int *g, int *b, int *a); EAPI void evas_object_text_glow_color_set (Evas_Object *obj, int r, int g, int b, int a); - EAPI void evas_object_text_glow_color_get (Evas_Object *obj, int *r, int *g, int *b, int *a); + EAPI void evas_object_text_glow_color_get (const Evas_Object *obj, int *r, int *g, int *b, int *a); EAPI void evas_object_text_glow2_color_set (Evas_Object *obj, int r, int g, int b, int a); - EAPI void evas_object_text_glow2_color_get (Evas_Object *obj, int *r, int *g, int *b, int *a); + EAPI void evas_object_text_glow2_color_get (const Evas_Object *obj, int *r, int *g, int *b, int *a); EAPI void evas_object_text_outline_color_set(Evas_Object *obj, int r, int g, int b, int a); - EAPI void evas_object_text_outline_color_get(Evas_Object *obj, int *r, int *g, int *b, int *a); - EAPI void evas_object_text_style_pad_get (Evas_Object *obj, int *l, int *r, int *t, int *b); + EAPI void evas_object_text_outline_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a); + EAPI void evas_object_text_style_pad_get (const Evas_Object *obj, int *l, int *r, int *t, int *b); /* string and font handling */ EAPI int evas_string_char_next_get (const char *str, int pos, int *decoded); @@ -607,15 +607,15 @@ extern "C" { EAPI Evas_Textblock_Style *evas_textblock_style_new(void); EAPI void evas_textblock_style_free(Evas_Textblock_Style *ts); EAPI void evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text); - EAPI const char *evas_textblock_style_get(Evas_Textblock_Style *ts); + EAPI const char *evas_textblock_style_get(const Evas_Textblock_Style *ts); EAPI void evas_object_textblock_style_set(Evas_Object *obj, Evas_Textblock_Style *ts); - EAPI const Evas_Textblock_Style *evas_object_textblock_style_get(Evas_Object *obj); + EAPI const Evas_Textblock_Style *evas_object_textblock_style_get(const Evas_Object *obj); EAPI void evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text); - EAPI const char *evas_object_textblock_text_markup_get(Evas_Object *obj); + EAPI const char *evas_object_textblock_text_markup_get(const Evas_Object *obj); - EAPI const Evas_Textblock_Cursor *evas_object_textblock_cursor_get(Evas_Object *obj); + EAPI const Evas_Textblock_Cursor *evas_object_textblock_cursor_get(const Evas_Object *obj); EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_new(Evas_Object *obj); EAPI void evas_textblock_cursor_free(Evas_Textblock_Cursor *cur); @@ -630,11 +630,11 @@ extern "C" { EAPI void evas_textblock_cursor_char_last(Evas_Textblock_Cursor *cur); EAPI void evas_textblock_cursor_line_first(Evas_Textblock_Cursor *cur); EAPI void evas_textblock_cursor_line_last(Evas_Textblock_Cursor *cur); - EAPI int evas_textblock_cursor_pos_get(Evas_Textblock_Cursor *cur); + EAPI int evas_textblock_cursor_pos_get(const Evas_Textblock_Cursor *cur); EAPI void evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int pos); EAPI Evas_Bool evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line); - EAPI int evas_textblock_cursor_compare(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2); - EAPI void evas_textblock_cursor_copy(Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest); + EAPI int evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2); + EAPI void evas_textblock_cursor_copy(const Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest); EAPI void evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *text); EAPI void evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *text); @@ -645,75 +645,75 @@ extern "C" { EAPI void evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur); EAPI void evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2); - EAPI const char *evas_textblock_cursor_node_text_get(Evas_Textblock_Cursor *cur); - EAPI int evas_textblock_cursor_node_text_length_get(Evas_Textblock_Cursor *cur); - EAPI const char *evas_textblock_cursor_node_format_get(Evas_Textblock_Cursor *cur); - EAPI char *evas_textblock_cursor_range_text_get(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format); + EAPI const char *evas_textblock_cursor_node_text_get(const Evas_Textblock_Cursor *cur); + EAPI int evas_textblock_cursor_node_text_length_get(const Evas_Textblock_Cursor *cur); + EAPI const char *evas_textblock_cursor_node_format_get(const Evas_Textblock_Cursor *cur); + EAPI char *evas_textblock_cursor_range_text_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format); - EAPI int evas_textblock_cursor_char_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); - EAPI int evas_textblock_cursor_line_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); + EAPI int evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); + EAPI int evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); EAPI Evas_Bool evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y); EAPI int evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y); - EAPI Evas_List *evas_textblock_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2); + EAPI Evas_List *evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2); - EAPI Evas_Bool evas_object_textblock_line_number_geometry_get(Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); + EAPI Evas_Bool evas_object_textblock_line_number_geometry_get(const Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); EAPI void evas_object_textblock_clear(Evas_Object *obj); - EAPI void evas_object_textblock_size_formatted_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); - EAPI void evas_object_textblock_size_native_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); - EAPI void evas_object_textblock_style_insets_get(Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b); + EAPI void evas_object_textblock_size_formatted_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); + EAPI void evas_object_textblock_size_native_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); + EAPI void evas_object_textblock_style_insets_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b); /* general objects */ EAPI void evas_object_del (Evas_Object *obj); - EAPI const char *evas_object_type_get (Evas_Object *obj); + EAPI const char *evas_object_type_get (const Evas_Object *obj); EAPI void evas_object_layer_set (Evas_Object *obj, int l); - EAPI int evas_object_layer_get (Evas_Object *obj); + EAPI int evas_object_layer_get (const Evas_Object *obj); EAPI void evas_object_raise (Evas_Object *obj); EAPI void evas_object_lower (Evas_Object *obj); EAPI void evas_object_stack_above (Evas_Object *obj, Evas_Object *above); EAPI void evas_object_stack_below (Evas_Object *obj, Evas_Object *below); - EAPI Evas_Object *evas_object_above_get (Evas_Object *obj); - EAPI Evas_Object *evas_object_below_get (Evas_Object *obj); + EAPI Evas_Object *evas_object_above_get (const Evas_Object *obj); + EAPI Evas_Object *evas_object_below_get (const Evas_Object *obj); EAPI Evas_Object *evas_object_bottom_get (const Evas *e); EAPI Evas_Object *evas_object_top_get (const Evas *e); EAPI void evas_object_move (Evas_Object *obj, Evas_Coord x, Evas_Coord y); EAPI void evas_object_resize (Evas_Object *obj, Evas_Coord w, Evas_Coord h); - EAPI void evas_object_geometry_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); + EAPI void evas_object_geometry_get (const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); EAPI void evas_object_show (Evas_Object *obj); EAPI void evas_object_hide (Evas_Object *obj); - EAPI Evas_Bool evas_object_visible_get (Evas_Object *obj); + EAPI Evas_Bool evas_object_visible_get (const Evas_Object *obj); EAPI void evas_object_render_op_set (Evas_Object *obj, Evas_Render_Op op); - EAPI Evas_Render_Op evas_object_render_op_get (Evas_Object *obj); + EAPI Evas_Render_Op evas_object_render_op_get (const Evas_Object *obj); EAPI void evas_object_anti_alias_set (Evas_Object *obj, Evas_Bool antialias); - EAPI Evas_Bool evas_object_anti_alias_get (Evas_Object *obj); + EAPI Evas_Bool evas_object_anti_alias_get (const Evas_Object *obj); EAPI void evas_object_color_set (Evas_Object *obj, int r, int g, int b, int a); - EAPI void evas_object_color_get (Evas_Object *obj, int *r, int *g, int *b, int *a); + EAPI void evas_object_color_get (const Evas_Object *obj, int *r, int *g, int *b, int *a); EAPI void evas_object_color_interpolation_set (Evas_Object *obj, int color_space); - EAPI int evas_object_color_interpolation_get (Evas_Object *obj); + EAPI int evas_object_color_interpolation_get (const Evas_Object *obj); EAPI void evas_object_clip_set (Evas_Object *obj, Evas_Object *clip); - EAPI Evas_Object *evas_object_clip_get (Evas_Object *obj); + EAPI Evas_Object *evas_object_clip_get (const Evas_Object *obj); EAPI void evas_object_clip_unset (Evas_Object *obj); - EAPI const Evas_List *evas_object_clipees_get (Evas_Object *obj); + EAPI const Evas_List *evas_object_clipees_get (const Evas_Object *obj); EAPI void evas_object_data_set (Evas_Object *obj, const char *key, const void *data); - EAPI void *evas_object_data_get (Evas_Object *obj, const char *key); + EAPI void *evas_object_data_get (const Evas_Object *obj, const char *key); EAPI void *evas_object_data_del (Evas_Object *obj, const char *key); EAPI void evas_object_name_set (Evas_Object *obj, const char *name); - EAPI const char *evas_object_name_get (Evas_Object *obj); + EAPI const char *evas_object_name_get (const Evas_Object *obj); EAPI Evas_Object *evas_object_name_find (const Evas *e, const char *name); - EAPI Evas *evas_object_evas_get (Evas_Object *obj); + EAPI Evas *evas_object_evas_get (const Evas_Object *obj); EAPI Evas_Object *evas_object_top_at_xy_get (const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Bool include_pass_events_objects, Evas_Bool include_hidden_objects); EAPI Evas_Object *evas_object_top_at_pointer_get (const Evas *e); @@ -733,10 +733,10 @@ extern "C" { EAPI Evas_Object *evas_object_smart_add (Evas *e, Evas_Smart *s); EAPI void evas_object_smart_member_add (Evas_Object *obj, Evas_Object *smart_obj); EAPI void evas_object_smart_member_del (Evas_Object *obj); - EAPI Evas_Object *evas_object_smart_parent_get (Evas_Object *obj); - EAPI Evas_List *evas_object_smart_members_get (Evas_Object *obj); - EAPI Evas_Smart *evas_object_smart_smart_get (Evas_Object *obj); - EAPI void *evas_object_smart_data_get (Evas_Object *obj); + EAPI Evas_Object *evas_object_smart_parent_get (const Evas_Object *obj); + EAPI Evas_List *evas_object_smart_members_get (const Evas_Object *obj); + EAPI Evas_Smart *evas_object_smart_smart_get (const Evas_Object *obj); + EAPI void *evas_object_smart_data_get (const Evas_Object *obj); EAPI void evas_object_smart_data_set (Evas_Object *obj, void *data); EAPI void evas_object_smart_callback_add (Evas_Object *obj, const char *event, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data); EAPI void *evas_object_smart_callback_del (Evas_Object *obj, const char *event, void (*func) (void *data, Evas_Object *obj, void *event_info)); @@ -745,7 +745,7 @@ extern "C" { /* events */ EAPI void evas_event_freeze (Evas *e); EAPI void evas_event_thaw (Evas *e); - EAPI int evas_event_freeze_get (Evas *e); + EAPI int evas_event_freeze_get (const Evas *e); EAPI void evas_event_feed_mouse_down (Evas *e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data); EAPI void evas_event_feed_mouse_up (Evas *e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data); EAPI void evas_event_feed_mouse_move (Evas *e, int x, int y, unsigned int timestamp, const void *data); @@ -756,16 +756,16 @@ extern "C" { EAPI void evas_event_feed_key_up (Evas *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data); EAPI void evas_object_focus_set (Evas_Object *obj, Evas_Bool focus); - EAPI Evas_Bool evas_object_focus_get (Evas_Object *obj); + EAPI Evas_Bool evas_object_focus_get (const Evas_Object *obj); EAPI Evas_Object *evas_focus_get (const Evas *e); EAPI const Evas_Modifier *evas_key_modifier_get (const Evas *e); EAPI const Evas_Lock *evas_key_lock_get (const Evas *e); - EAPI Evas_Bool evas_key_modifier_is_set (Evas_Modifier *m, const char *keyname); + EAPI Evas_Bool evas_key_modifier_is_set (const Evas_Modifier *m, const char *keyname); - EAPI Evas_Bool evas_key_lock_is_set (Evas_Lock *l, const char *keyname); + EAPI Evas_Bool evas_key_lock_is_set (const Evas_Lock *l, const char *keyname); EAPI void evas_key_modifier_add (Evas *e, const char *keyname); EAPI void evas_key_modifier_del (Evas *e, const char *keyname); @@ -783,17 +783,17 @@ extern "C" { EAPI void evas_object_key_ungrab (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers); EAPI void evas_object_pass_events_set (Evas_Object *obj, Evas_Bool pass); - EAPI Evas_Bool evas_object_pass_events_get (Evas_Object *obj); + EAPI Evas_Bool evas_object_pass_events_get (const Evas_Object *obj); EAPI void evas_object_repeat_events_set (Evas_Object *obj, Evas_Bool repeat); - EAPI Evas_Bool evas_object_repeat_events_get (Evas_Object *obj); + EAPI Evas_Bool evas_object_repeat_events_get (const Evas_Object *obj); EAPI void evas_object_propagate_events_set (Evas_Object *obj, Evas_Bool prop); - EAPI Evas_Bool evas_object_propagate_events_get (Evas_Object *obj); + EAPI Evas_Bool evas_object_propagate_events_get (const Evas_Object *obj); EAPI void evas_object_pointer_mode_set (Evas_Object *obj, Evas_Object_Pointer_Mode setting); EAPI Evas_Object_Pointer_Mode evas_object_pointer_mode_get(const Evas_Object *obj); EAPI void evas_object_precise_is_inside_set (Evas_Object *obj, Evas_Bool precise); - EAPI Evas_Bool evas_object_precise_is_inside_get (Evas_Object *obj); + EAPI Evas_Bool evas_object_precise_is_inside_get (const Evas_Object *obj); EAPI void evas_object_event_callback_add (Evas_Object *obj, Evas_Callback_Type type, void (*func) (void *data, Evas *e, Evas_Object *obj, void *event_info), const void *data); EAPI void *evas_object_event_callback_del (Evas_Object *obj, Evas_Callback_Type type, void (*func) (void *data, Evas *e, Evas_Object *obj, void *event_info)); @@ -845,8 +845,8 @@ extern "C" { EAPI Evas_Imaging_Image *evas_imaging_image_load (const char *file, const char *key); EAPI void evas_imaging_image_free (Evas_Imaging_Image *im); - EAPI void evas_imaging_image_size_get (Evas_Imaging_Image *im, int *w, int *h); - EAPI Evas_Bool evas_imaging_image_alpha_get (Evas_Imaging_Image *im); + EAPI void evas_imaging_image_size_get (const Evas_Imaging_Image *im, int *w, int *h); + EAPI Evas_Bool evas_imaging_image_alpha_get (const Evas_Imaging_Image *im); EAPI void evas_imaging_image_cache_set (int bytes); EAPI int evas_imaging_image_cache_get (void); @@ -856,16 +856,16 @@ extern "C" { EAPI Evas_Imaging_Font *evas_imaging_font_load (const char *file, const char *key, int size); EAPI void evas_imaging_font_free (Evas_Imaging_Font *fn); - EAPI int evas_imaging_font_ascent_get (Evas_Imaging_Font *fn); - EAPI int evas_imaging_font_descent_get (Evas_Imaging_Font *fn); - EAPI int evas_imaging_font_max_ascent_get (Evas_Imaging_Font *fn); - EAPI int evas_imaging_font_max_descent_get (Evas_Imaging_Font *fn); - EAPI int evas_imaging_font_line_advance_get (Evas_Imaging_Font *fn); - EAPI void evas_imaging_font_string_advance_get (Evas_Imaging_Font *fn, char *str, int *x, int *y); - EAPI void evas_imaging_font_string_size_query (Evas_Imaging_Font *fn, char *str, int *w, int *h); - EAPI int evas_imaging_font_string_inset_get (Evas_Imaging_Font *fn, char *str); - EAPI int evas_imaging_font_string_char_coords_get (Evas_Imaging_Font *fn, char *str, int pos, int *cx, int *cy, int *cw, int *ch); - EAPI int evas_imaging_font_string_char_at_coords_get (Evas_Imaging_Font *fn, char *str, int x, int y, int *cx, int *cy, int *cw, int *ch); + EAPI int evas_imaging_font_ascent_get (const Evas_Imaging_Font *fn); + EAPI int evas_imaging_font_descent_get (const Evas_Imaging_Font *fn); + EAPI int evas_imaging_font_max_ascent_get (const Evas_Imaging_Font *fn); + EAPI int evas_imaging_font_max_descent_get (const Evas_Imaging_Font *fn); + EAPI int evas_imaging_font_line_advance_get (const Evas_Imaging_Font *fn); + EAPI void evas_imaging_font_string_advance_get (const Evas_Imaging_Font *fn, char *str, int *x, int *y); + EAPI void evas_imaging_font_string_size_query (const Evas_Imaging_Font *fn, char *str, int *w, int *h); + EAPI int evas_imaging_font_string_inset_get (const Evas_Imaging_Font *fn, char *str); + EAPI int evas_imaging_font_string_char_coords_get (const Evas_Imaging_Font *fn, char *str, int pos, int *cx, int *cy, int *cw, int *ch); + EAPI int evas_imaging_font_string_char_at_coords_get (const Evas_Imaging_Font *fn, char *str, int x, int y, int *cx, int *cy, int *cw, int *ch); EAPI void evas_imaging_font_cache_set (int bytes); EAPI int evas_imaging_font_cache_get (void); diff --git a/legacy/evas/src/lib/canvas/evas_clip.c b/legacy/evas/src/lib/canvas/evas_clip.c index cdd762896d..bd7dd54d96 100644 --- a/legacy/evas/src/lib/canvas/evas_clip.c +++ b/legacy/evas/src/lib/canvas/evas_clip.c @@ -238,7 +238,7 @@ evas_object_clip_set(Evas_Object *obj, Evas_Object *clip) * @ingroup Evas_Clip_Group */ EAPI Evas_Object * -evas_object_clip_get(Evas_Object *obj) +evas_object_clip_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return NULL; @@ -354,7 +354,7 @@ evas_object_clip_unset(Evas_Object *obj) * @ingroup Evas_Clip_Group */ EAPI const Evas_List * -evas_object_clipees_get(Evas_Object *obj) +evas_object_clipees_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return NULL; diff --git a/legacy/evas/src/lib/canvas/evas_data.c b/legacy/evas/src/lib/canvas/evas_data.c index cb963bd3b7..6ce65360c8 100644 --- a/legacy/evas/src/lib/canvas/evas_data.c +++ b/legacy/evas/src/lib/canvas/evas_data.c @@ -87,7 +87,7 @@ evas_object_data_set(Evas_Object *obj, const char *key, const void *data) * @ingroup Evas_Object_Data_Group */ EAPI void * -evas_object_data_get(Evas_Object *obj, const char *key) +evas_object_data_get(const Evas_Object *obj, const char *key) { Evas_List *l; @@ -103,8 +103,10 @@ evas_object_data_get(Evas_Object *obj, const char *key) node = l->data; if (!strcmp(node->key, key)) { - obj->data.elements = evas_list_remove_list(obj->data.elements, l); - obj->data.elements = evas_list_prepend(obj->data.elements, node); + Evas_List *lst; + lst = obj->data.elements; + lst = evas_list_promote_list(lst, l); + ((Evas_Object *)obj)->data.elements = lst; return node->data; } } diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/legacy/evas/src/lib/canvas/evas_events.c index a2eb9e02e1..afe925e0b8 100644 --- a/legacy/evas/src/lib/canvas/evas_events.c +++ b/legacy/evas/src/lib/canvas/evas_events.c @@ -207,7 +207,7 @@ evas_event_thaw(Evas *e) * @ingroup Evas_Event_Freezing_Group */ EAPI int -evas_event_freeze_get(Evas *e) +evas_event_freeze_get(const Evas *e) { MAGIC_CHECK(e, Evas, MAGIC_EVAS); return 0; @@ -1031,7 +1031,7 @@ evas_object_pass_events_set(Evas_Object *obj, Evas_Bool pass) * @ingroup Evas_Object_Event_Flags_Group */ EAPI Evas_Bool -evas_object_pass_events_get(Evas_Object *obj) +evas_object_pass_events_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return 0; @@ -1082,7 +1082,7 @@ evas_object_repeat_events_set(Evas_Object *obj, Evas_Bool repeat) * @ingroup Evas_Object_Event_Flags_Group */ EAPI Evas_Bool -evas_object_repeat_events_get(Evas_Object *obj) +evas_object_repeat_events_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return 0; @@ -1125,7 +1125,7 @@ evas_object_propagate_events_set(Evas_Object *obj, Evas_Bool prop) * @ingroup Evas_Object_Event_Flags_Group */ EAPI Evas_Bool -evas_object_propagate_events_get(Evas_Object *obj) +evas_object_propagate_events_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return 0; diff --git a/legacy/evas/src/lib/canvas/evas_focus.c b/legacy/evas/src/lib/canvas/evas_focus.c index c478cbf2ae..ad6e2591db 100644 --- a/legacy/evas/src/lib/canvas/evas_focus.c +++ b/legacy/evas/src/lib/canvas/evas_focus.c @@ -66,7 +66,7 @@ evas_object_focus_set(Evas_Object *obj, Evas_Bool focus) * @return 1 if the object has the focus, 0 otherwise. */ EAPI Evas_Bool -evas_object_focus_get(Evas_Object *obj) +evas_object_focus_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return 0; diff --git a/legacy/evas/src/lib/canvas/evas_key.c b/legacy/evas/src/lib/canvas/evas_key.c index 4da7cb2398..289a3f4b63 100644 --- a/legacy/evas/src/lib/canvas/evas_key.c +++ b/legacy/evas/src/lib/canvas/evas_key.c @@ -96,7 +96,7 @@ evas_key_lock_get(const Evas *e) * @return 1 if the @p keyname is on, 0 otherwise. */ EAPI Evas_Bool -evas_key_modifier_is_set(Evas_Modifier *m, const char *keyname) +evas_key_modifier_is_set(const Evas_Modifier *m, const char *keyname) { Evas_Modifier_Mask num; int n; @@ -127,7 +127,7 @@ evas_key_modifier_is_set(Evas_Modifier *m, const char *keyname) * @param 1 if the @p keyname kock is set, 0 otherwise. */ EAPI Evas_Bool -evas_key_lock_is_set(Evas_Lock *l, const char *keyname) +evas_key_lock_is_set(const Evas_Lock *l, const char *keyname) { Evas_Modifier_Mask num; int n; diff --git a/legacy/evas/src/lib/canvas/evas_layer.c b/legacy/evas/src/lib/canvas/evas_layer.c index d6cc14e5f4..5e466af94c 100644 --- a/legacy/evas/src/lib/canvas/evas_layer.c +++ b/legacy/evas/src/lib/canvas/evas_layer.c @@ -188,7 +188,7 @@ evas_object_layer_set(Evas_Object *obj, int l) * @ingroup Evas_Object_Layer_Group */ EAPI int -evas_object_layer_get(Evas_Object *obj) +evas_object_layer_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return 0; diff --git a/legacy/evas/src/lib/canvas/evas_name.c b/legacy/evas/src/lib/canvas/evas_name.c index c616a355e5..c1cc94d390 100644 --- a/legacy/evas/src/lib/canvas/evas_name.c +++ b/legacy/evas/src/lib/canvas/evas_name.c @@ -40,7 +40,7 @@ evas_object_name_set(Evas_Object *obj, const char *name) * @ingroup Evas_Object_Name_Group */ EAPI const char * -evas_object_name_get(Evas_Object *obj) +evas_object_name_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return NULL; diff --git a/legacy/evas/src/lib/canvas/evas_object_gradient.c b/legacy/evas/src/lib/canvas/evas_object_gradient.c index 9ef6c8449b..74c5c43f42 100644 --- a/legacy/evas/src/lib/canvas/evas_object_gradient.c +++ b/legacy/evas/src/lib/canvas/evas_object_gradient.c @@ -334,7 +334,7 @@ evas_object_gradient_fill_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas * @ingroup Evas_Object_Gradient_Fill_Group */ EAPI void -evas_object_gradient_fill_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) +evas_object_gradient_fill_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { Evas_Object_Gradient *o; @@ -393,7 +393,7 @@ evas_object_gradient_fill_angle_set(Evas_Object *obj, Evas_Angle angle) * @ingroup Evas_Object_Gradient_Group */ EAPI Evas_Angle -evas_object_gradient_fill_angle_get(Evas_Object *obj) +evas_object_gradient_fill_angle_get(const Evas_Object *obj) { Evas_Object_Gradient *o; @@ -440,7 +440,7 @@ evas_object_gradient_fill_spread_set(Evas_Object *obj, int spread) * @ingroup Evas_Object_Gradient_Group */ EAPI int -evas_object_gradient_fill_spread_get(Evas_Object *obj) +evas_object_gradient_fill_spread_get(const Evas_Object *obj) { Evas_Object_Gradient *o; @@ -489,7 +489,7 @@ evas_object_gradient_angle_set(Evas_Object *obj, Evas_Angle angle) * @ingroup Evas_Object_Gradient_Group */ EAPI Evas_Angle -evas_object_gradient_angle_get(Evas_Object *obj) +evas_object_gradient_angle_get(const Evas_Object *obj) { Evas_Object_Gradient *o; @@ -534,7 +534,7 @@ evas_object_gradient_offset_set(Evas_Object *obj, float offset) * @ingroup Evas_Object_Gradient_Group */ EAPI float -evas_object_gradient_offset_get(Evas_Object *obj) +evas_object_gradient_offset_get(const Evas_Object *obj) { Evas_Object_Gradient *o; @@ -580,7 +580,7 @@ evas_object_gradient_direction_set(Evas_Object *obj, int direction) * @ingroup Evas_Object_Gradient_Group */ EAPI int -evas_object_gradient_direction_get(Evas_Object *obj) +evas_object_gradient_direction_get(const Evas_Object *obj) { Evas_Object_Gradient *o; @@ -685,7 +685,7 @@ evas_object_gradient_type_set(Evas_Object *obj, const char *name, const char *pa * @ingroup Evas_Object_Gradient_Type_Group */ EAPI void -evas_object_gradient_type_get(Evas_Object *obj, char **name, char **params) +evas_object_gradient_type_get(const Evas_Object *obj, char **name, char **params) { Evas_Object_Gradient *o; diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c index ed70fd28d4..bdd3f6b0dd 100644 --- a/legacy/evas/src/lib/canvas/evas_object_image.c +++ b/legacy/evas/src/lib/canvas/evas_object_image.c @@ -290,7 +290,7 @@ evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key) * @ingroup Evas_Object_Image_File_Group */ EAPI void -evas_object_image_file_get(Evas_Object *obj, const char **file, const char **key) +evas_object_image_file_get(const Evas_Object *obj, const char **file, const char **key) { Evas_Object_Image *o; @@ -376,7 +376,7 @@ evas_object_image_border_set(Evas_Object *obj, int l, int r, int t, int b) * @ingroup Evas_Object_Image_Border_Group */ EAPI void -evas_object_image_border_get(Evas_Object *obj, int *l, int *r, int *t, int *b) +evas_object_image_border_get(const Evas_Object *obj, int *l, int *r, int *t, int *b) { Evas_Object_Image *o; @@ -452,7 +452,7 @@ evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Bool fill) * @ingroup Evas_Object_Image_Fill_Group */ EAPI Evas_Bool -evas_object_image_border_center_fill_get(Evas_Object *obj) +evas_object_image_border_center_fill_get(const Evas_Object *obj) { Evas_Object_Image *o; @@ -527,7 +527,7 @@ evas_object_image_fill_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Co * @ingroup Evas_Object_Image_Fill_Group */ EAPI void -evas_object_image_fill_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) +evas_object_image_fill_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { Evas_Object_Image *o; @@ -631,7 +631,7 @@ evas_object_image_size_set(Evas_Object *obj, int w, int h) * @ingroup Evas_Object_Image_Size */ EAPI void -evas_object_image_size_get(Evas_Object *obj, int *w, int *h) +evas_object_image_size_get(const Evas_Object *obj, int *w, int *h) { Evas_Object_Image *o; @@ -661,7 +661,7 @@ evas_object_image_size_get(Evas_Object *obj, int *w, int *h) * @ingroup Evas_Object_Image_Size */ EAPI int -evas_object_image_stride_get(Evas_Object *obj) +evas_object_image_stride_get(const Evas_Object *obj) { Evas_Object_Image *o; @@ -686,7 +686,7 @@ evas_object_image_stride_get(Evas_Object *obj) * @ingroup Evas_Object_Image */ EAPI int -evas_object_image_load_error_get(Evas_Object *obj) +evas_object_image_load_error_get(const Evas_Object *obj) { Evas_Object_Image *o; @@ -788,7 +788,7 @@ evas_object_image_data_set(Evas_Object *obj, void *data) * @ingroup Evas_Object_Image_Data */ EAPI void * -evas_object_image_data_get(Evas_Object *obj, Evas_Bool for_writing) +evas_object_image_data_get(const Evas_Object *obj, Evas_Bool for_writing) { Evas_Object_Image *o; DATA32 *data; @@ -961,7 +961,7 @@ evas_object_image_alpha_set(Evas_Object *obj, Evas_Bool has_alpha) * @ingroup Evas_Object_Image_Alpha */ EAPI Evas_Bool -evas_object_image_alpha_get(Evas_Object *obj) +evas_object_image_alpha_get(const Evas_Object *obj) { Evas_Object_Image *o; @@ -1022,7 +1022,7 @@ evas_object_image_smooth_scale_set(Evas_Object *obj, Evas_Bool smooth_scale) * @ingroup Evas_Object_Image_Scale */ EAPI Evas_Bool -evas_object_image_smooth_scale_get(Evas_Object *obj) +evas_object_image_smooth_scale_get(const Evas_Object *obj) { Evas_Object_Image *o; @@ -1083,7 +1083,7 @@ evas_object_image_reload(Evas_Object *obj) * @ingroup Evas_Object_Image */ EAPI Evas_Bool -evas_object_image_save(Evas_Object *obj, const char *file, const char *key, const char *flags) +evas_object_image_save(const Evas_Object *obj, const char *file, const char *key, const char *flags) { Evas_Object_Image *o; DATA32 *data = NULL; @@ -1284,7 +1284,7 @@ evas_object_image_pixels_dirty_set(Evas_Object *obj, Evas_Bool dirty) * @ingroup Evas_Object_Image */ EAPI Evas_Bool -evas_object_image_pixels_dirty_get(Evas_Object *obj) +evas_object_image_pixels_dirty_get(const Evas_Object *obj) { Evas_Object_Image *o; @@ -1334,7 +1334,7 @@ evas_object_image_load_dpi_set(Evas_Object *obj, double dpi) * */ EAPI double -evas_object_image_load_dpi_get(Evas_Object *obj) +evas_object_image_load_dpi_get(const Evas_Object *obj) { Evas_Object_Image *o; @@ -1378,7 +1378,7 @@ evas_object_image_load_size_set(Evas_Object *obj, int w, int h) } EAPI void -evas_object_image_load_size_get(Evas_Object *obj, int *w, int *h) +evas_object_image_load_size_get(const Evas_Object *obj, int *w, int *h) { Evas_Object_Image *o; @@ -1428,7 +1428,7 @@ evas_object_image_load_scale_down_set(Evas_Object *obj, int scale_down) * */ EAPI int -evas_object_image_load_scale_down_get(Evas_Object *obj) +evas_object_image_load_scale_down_get(const Evas_Object *obj) { Evas_Object_Image *o; @@ -1474,7 +1474,7 @@ evas_object_image_colorspace_set(Evas_Object *obj, Evas_Colorspace cspace) * */ EAPI Evas_Colorspace -evas_object_image_colorspace_get(Evas_Object *obj) +evas_object_image_colorspace_get(const Evas_Object *obj) { Evas_Object_Image *o; @@ -1518,7 +1518,7 @@ evas_object_image_native_surface_set(Evas_Object *obj, Evas_Native_Surface *surf * */ EAPI Evas_Native_Surface * -evas_object_image_native_surface_get(Evas_Object *obj) +evas_object_image_native_surface_get(const Evas_Object *obj) { Evas_Object_Image *o; diff --git a/legacy/evas/src/lib/canvas/evas_object_line.c b/legacy/evas/src/lib/canvas/evas_object_line.c index 3707a71126..54466b07b2 100644 --- a/legacy/evas/src/lib/canvas/evas_object_line.c +++ b/legacy/evas/src/lib/canvas/evas_object_line.c @@ -184,7 +184,7 @@ evas_object_line_xy_set(Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coo * @ingroup Evas_Line_Group */ EAPI void -evas_object_line_xy_get(Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1, Evas_Coord *x2, Evas_Coord *y2) +evas_object_line_xy_get(const Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1, Evas_Coord *x2, Evas_Coord *y2) { Evas_Object_Line *o; diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/legacy/evas/src/lib/canvas/evas_object_main.c index b58222afc5..5fb3edc8d3 100644 --- a/legacy/evas/src/lib/canvas/evas_object_main.c +++ b/legacy/evas/src/lib/canvas/evas_object_main.c @@ -653,7 +653,7 @@ evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h) * @ingroup Evas_Object_Group */ EAPI void -evas_object_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) +evas_object_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); if (x) *x = 0; if (y) *y = 0; if (w) *w = 0; if (h) *h = 0; @@ -817,7 +817,7 @@ evas_object_hide(Evas_Object *obj) * @ingroup Evas_Object_Visibility_Group */ EAPI Evas_Bool -evas_object_visible_get(Evas_Object *obj) +evas_object_visible_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return 0; @@ -882,7 +882,7 @@ evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a) * @ingroup Evas_Object_Group */ EAPI void -evas_object_color_get(Evas_Object *obj, int *r, int *g, int *b, int *a) +evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); if (r) *r = 0; if (g) *g = 0; if (b) *b = 0; if (a) *a = 0; @@ -926,7 +926,7 @@ evas_object_anti_alias_set(Evas_Object *obj, Evas_Bool anti_alias) * @ingroup Evas_Object_Group */ EAPI Evas_Bool -evas_object_anti_alias_get(Evas_Object *obj) +evas_object_anti_alias_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return 0; @@ -962,7 +962,7 @@ evas_object_color_interpolation_set(Evas_Object *obj, int color_space) * @ingroup Evas_Object_Group */ EAPI int -evas_object_color_interpolation_get(Evas_Object *obj) +evas_object_color_interpolation_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return 0; @@ -998,7 +998,7 @@ evas_object_render_op_set(Evas_Object *obj, Evas_Render_Op render_op) * @ingroup Evas_Object_Group */ EAPI Evas_Render_Op -evas_object_render_op_get(Evas_Object *obj) +evas_object_render_op_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return 0; @@ -1014,7 +1014,7 @@ evas_object_render_op_get(Evas_Object *obj) * @ingroup Evas_Object_Group */ EAPI Evas * -evas_object_evas_get(Evas_Object *obj) +evas_object_evas_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return NULL; @@ -1232,7 +1232,7 @@ evas_objects_in_rectangle_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Co * @ingroup Evas_Object_Group */ EAPI const char * -evas_object_type_get(Evas_Object *obj) +evas_object_type_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return NULL; @@ -1263,7 +1263,7 @@ evas_object_precise_is_inside_set(Evas_Object *obj, Evas_Bool precise) * @ingroup Evas_Object_Group */ EAPI Evas_Bool -evas_object_precise_is_inside_get(Evas_Object *obj) +evas_object_precise_is_inside_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return 0; diff --git a/legacy/evas/src/lib/canvas/evas_object_smart.c b/legacy/evas/src/lib/canvas/evas_object_smart.c index 4834c76d3d..cc4f088342 100644 --- a/legacy/evas/src/lib/canvas/evas_object_smart.c +++ b/legacy/evas/src/lib/canvas/evas_object_smart.c @@ -90,7 +90,7 @@ evas_object_smart_data_set(Evas_Object *obj, void *data) * @ingroup Evas_Smart_Object_Group */ EAPI void * -evas_object_smart_data_get(Evas_Object *obj) +evas_object_smart_data_get(const Evas_Object *obj) { Evas_Object_Smart *o; @@ -112,7 +112,7 @@ evas_object_smart_data_get(Evas_Object *obj) * @ingroup Evas_Smart_Object_Group */ EAPI Evas_Smart * -evas_object_smart_smart_get(Evas_Object *obj) +evas_object_smart_smart_get(const Evas_Object *obj) { Evas_Object_Smart *o; @@ -219,7 +219,7 @@ evas_object_smart_member_del(Evas_Object *obj) * @ingroup Evas_Smart_Object_Group */ EAPI Evas_Object * -evas_object_smart_parent_get(Evas_Object *obj) +evas_object_smart_parent_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return NULL; @@ -235,7 +235,7 @@ evas_object_smart_parent_get(Evas_Object *obj) * The returned list should be freed with evas_list_free() when you no longer need it */ EAPI Evas_List * -evas_object_smart_members_get(Evas_Object *obj) +evas_object_smart_members_get(const Evas_Object *obj) { Evas_List *members; Evas_Object_List *member; diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/legacy/evas/src/lib/canvas/evas_object_text.c index 49c49dd9ca..57e56572ea 100644 --- a/legacy/evas/src/lib/canvas/evas_object_text.c +++ b/legacy/evas/src/lib/canvas/evas_object_text.c @@ -127,7 +127,7 @@ evas_object_text_font_source_set(Evas_Object *obj, const char *font_source) * */ EAPI const char * -evas_object_text_font_source_get(Evas_Object *obj) +evas_object_text_font_source_get(const Evas_Object *obj) { Evas_Object_Text *o; @@ -264,7 +264,7 @@ evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size siz * @param size A pointer to the location to store the font size in (may be NULL). */ EAPI void -evas_object_text_font_get(Evas_Object *obj, const char **font, Evas_Font_Size *size) +evas_object_text_font_get(const Evas_Object *obj, const char **font, Evas_Font_Size *size) { Evas_Object_Text *o; @@ -355,7 +355,7 @@ evas_object_text_text_set(Evas_Object *obj, const char *text) * @return The text currently being displayed. Do not free it. */ EAPI const char * -evas_object_text_text_get(Evas_Object *obj) +evas_object_text_text_get(const Evas_Object *obj) { Evas_Object_Text *o; @@ -376,7 +376,7 @@ evas_object_text_text_get(Evas_Object *obj) * */ EAPI Evas_Coord -evas_object_text_ascent_get(Evas_Object *obj) +evas_object_text_ascent_get(const Evas_Object *obj) { Evas_Object_Text *o; @@ -397,7 +397,7 @@ evas_object_text_ascent_get(Evas_Object *obj) * */ EAPI Evas_Coord -evas_object_text_descent_get(Evas_Object *obj) +evas_object_text_descent_get(const Evas_Object *obj) { Evas_Object_Text *o; @@ -418,7 +418,7 @@ evas_object_text_descent_get(Evas_Object *obj) * */ EAPI Evas_Coord -evas_object_text_max_ascent_get(Evas_Object *obj) +evas_object_text_max_ascent_get(const Evas_Object *obj) { Evas_Object_Text *o; @@ -439,7 +439,7 @@ evas_object_text_max_ascent_get(Evas_Object *obj) * */ EAPI Evas_Coord -evas_object_text_max_descent_get(Evas_Object *obj) +evas_object_text_max_descent_get(const Evas_Object *obj) { Evas_Object_Text *o; @@ -460,7 +460,7 @@ evas_object_text_max_descent_get(Evas_Object *obj) * */ EAPI Evas_Coord -evas_object_text_inset_get(Evas_Object *obj) +evas_object_text_inset_get(const Evas_Object *obj) { Evas_Object_Text *o; @@ -483,7 +483,7 @@ evas_object_text_inset_get(Evas_Object *obj) * */ EAPI Evas_Coord -evas_object_text_horiz_advance_get(Evas_Object *obj) +evas_object_text_horiz_advance_get(const Evas_Object *obj) { Evas_Object_Text *o; @@ -506,7 +506,7 @@ evas_object_text_horiz_advance_get(Evas_Object *obj) * */ EAPI Evas_Coord -evas_object_text_vert_advance_get(Evas_Object *obj) +evas_object_text_vert_advance_get(const Evas_Object *obj) { Evas_Object_Text *o; @@ -541,7 +541,7 @@ evas_object_text_vert_advance_get(Evas_Object *obj) * @returns 0 on error, 1 on success. */ EAPI int -evas_object_text_char_pos_get(Evas_Object *obj, int pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) +evas_object_text_char_pos_get(const Evas_Object *obj, int pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) { Evas_Object_Text *o; int l = 0, r = 0, t = 0, b = 0; @@ -594,7 +594,7 @@ evas_object_text_char_pos_get(Evas_Object *obj, int pos, Evas_Coord *cx, Evas_Co * */ EAPI int -evas_object_text_char_coords_get(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) +evas_object_text_char_coords_get(const Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) { Evas_Object_Text *o; int l = 0, r = 0, t = 0, b = 0; @@ -682,7 +682,7 @@ evas_object_text_style_set(Evas_Object *obj, Evas_Text_Style_Type style) * */ EAPI Evas_Text_Style_Type -evas_object_text_style_get(Evas_Object *obj) +evas_object_text_style_get(const Evas_Object *obj) { Evas_Object_Text *o; @@ -731,7 +731,7 @@ evas_object_text_shadow_color_set(Evas_Object *obj, int r, int g, int b, int a) * */ EAPI void -evas_object_text_shadow_color_get(Evas_Object *obj, int *r, int *g, int *b, int *a) +evas_object_text_shadow_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) { Evas_Object_Text *o; @@ -783,7 +783,7 @@ evas_object_text_glow_color_set(Evas_Object *obj, int r, int g, int b, int a) * */ EAPI void -evas_object_text_glow_color_get(Evas_Object *obj, int *r, int *g, int *b, int *a) +evas_object_text_glow_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) { Evas_Object_Text *o; @@ -835,7 +835,7 @@ evas_object_text_glow2_color_set(Evas_Object *obj, int r, int g, int b, int a) * */ EAPI void -evas_object_text_glow2_color_get(Evas_Object *obj, int *r, int *g, int *b, int *a) +evas_object_text_glow2_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) { Evas_Object_Text *o; @@ -887,7 +887,7 @@ evas_object_text_outline_color_set(Evas_Object *obj, int r, int g, int b, int a) * */ EAPI void -evas_object_text_outline_color_get(Evas_Object *obj, int *r, int *g, int *b, int *a) +evas_object_text_outline_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) { Evas_Object_Text *o; @@ -911,7 +911,7 @@ evas_object_text_outline_color_get(Evas_Object *obj, int *r, int *g, int *b, int * */ EAPI void -evas_object_text_style_pad_get(Evas_Object *obj, int *l, int *r, int *t, int *b) +evas_object_text_style_pad_get(const Evas_Object *obj, int *l, int *r, int *t, int *b) { int sl = 0, sr = 0, st = 0, sb = 0; Evas_Object_Text *o; diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index 6d64c59421..7576322900 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -373,7 +373,7 @@ _strbuf_remove(char *s, int p, int p2, int *len, int *alloc) } static void -_nodes_clear(Evas_Object *obj) +_nodes_clear(const Evas_Object *obj) { Evas_Object_Textblock *o; @@ -390,7 +390,7 @@ _nodes_clear(Evas_Object *obj) } static void -_format_free(Evas_Object *obj, Evas_Object_Textblock_Format *fmt) +_format_free(const Evas_Object *obj, Evas_Object_Textblock_Format *fmt) { fmt->ref--; if (fmt->ref > 0) return; @@ -402,7 +402,7 @@ _format_free(Evas_Object *obj, Evas_Object_Textblock_Format *fmt) } static void -_line_free(Evas_Object *obj, Evas_Object_Textblock_Line *ln) +_line_free(const Evas_Object *obj, Evas_Object_Textblock_Line *ln) { while (ln->items) { @@ -427,7 +427,7 @@ _line_free(Evas_Object *obj, Evas_Object_Textblock_Line *ln) } static void -_lines_clear(Evas_Object *obj, Evas_Object_Textblock_Line *lines) +_lines_clear(const Evas_Object *obj, Evas_Object_Textblock_Line *lines) { Evas_Object_Textblock *o; @@ -1942,7 +1942,7 @@ _layout_format_item_add(Ctxt *c, Evas_Object_Textblock_Node *n, char *item) } static void -_layout(Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_ret) +_layout(const Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_ret) { Evas_Object_Textblock *o; Ctxt ctxt, *c; @@ -1954,7 +1954,7 @@ _layout(Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_ret) /* setup context */ o = (Evas_Object_Textblock *)(obj->object_data); c = &ctxt; - c->obj =obj; + c->obj = (Evas_Object *)obj; c->o = o; c->lines = c->ln = NULL; c->format_stack = NULL; @@ -2137,7 +2137,7 @@ _layout(Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_ret) } static void -_relayout(Evas_Object *obj) +_relayout(const Evas_Object *obj) { Evas_Object_Textblock *o; Evas_Object_Textblock_Line *lines; @@ -2216,7 +2216,7 @@ _find_layout_format_item_line_match(Evas_Object *obj, Evas_Object_Textblock_Node } static Evas_Object_Textblock_Line * -_find_layout_line_num(Evas_Object *obj, int line) +_find_layout_line_num(const Evas_Object *obj, int line) { Evas_Object_List *l; Evas_Object_Textblock *o; @@ -2380,7 +2380,7 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text) } EAPI const char * -evas_textblock_style_get(Evas_Textblock_Style *ts) +evas_textblock_style_get(const Evas_Textblock_Style *ts) { if (!ts) return NULL; return ts->style_text; @@ -2416,7 +2416,7 @@ evas_object_textblock_style_set(Evas_Object *obj, Evas_Textblock_Style *ts) } EAPI const Evas_Textblock_Style * -evas_object_textblock_style_get(Evas_Object *obj) +evas_object_textblock_style_get(const Evas_Object *obj) { TB_HEAD_RETURN(NULL); return o->style; @@ -2605,7 +2605,7 @@ evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text) } EAPI const char * -evas_object_textblock_text_markup_get(Evas_Object *obj) +evas_object_textblock_text_markup_get(const Evas_Object *obj) { TB_HEAD_RETURN(NULL); return o->markup_text; @@ -2613,7 +2613,7 @@ evas_object_textblock_text_markup_get(Evas_Object *obj) /* cursors */ EAPI const Evas_Textblock_Cursor * -evas_object_textblock_cursor_get(Evas_Object *obj) +evas_object_textblock_cursor_get(const Evas_Object *obj) { TB_HEAD_RETURN(NULL); return o->cursor; @@ -2853,7 +2853,7 @@ evas_textblock_cursor_line_last(Evas_Textblock_Cursor *cur) } EAPI int -evas_textblock_cursor_pos_get(Evas_Textblock_Cursor *cur) +evas_textblock_cursor_pos_get(const Evas_Textblock_Cursor *cur) { if (!cur) return -1; return cur->pos; @@ -2905,7 +2905,7 @@ evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line) } EAPI int -evas_textblock_cursor_compare(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2) +evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2) { Evas_Object_List *l1, *l2; @@ -2933,7 +2933,7 @@ evas_textblock_cursor_compare(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor } EAPI void -evas_textblock_cursor_copy(Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest) +evas_textblock_cursor_copy(const Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest) { if (!cur) return; if (!cur_dest) return; @@ -3510,7 +3510,7 @@ evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_C } EAPI const char * -evas_textblock_cursor_node_text_get(Evas_Textblock_Cursor *cur) +evas_textblock_cursor_node_text_get(const Evas_Textblock_Cursor *cur) { if (!cur) return NULL; if (!cur->node) return NULL; @@ -3522,7 +3522,7 @@ evas_textblock_cursor_node_text_get(Evas_Textblock_Cursor *cur) } EAPI int -evas_textblock_cursor_node_text_length_get(Evas_Textblock_Cursor *cur) +evas_textblock_cursor_node_text_length_get(const Evas_Textblock_Cursor *cur) { if (!cur) return 0; if (!cur->node) return 0; @@ -3534,7 +3534,7 @@ evas_textblock_cursor_node_text_length_get(Evas_Textblock_Cursor *cur) } EAPI const char * -evas_textblock_cursor_node_format_get(Evas_Textblock_Cursor *cur) +evas_textblock_cursor_node_format_get(const Evas_Textblock_Cursor *cur) { if (!cur) return NULL; if (!cur->node) return NULL; @@ -3546,7 +3546,7 @@ evas_textblock_cursor_node_format_get(Evas_Textblock_Cursor *cur) } EAPI char * -evas_textblock_cursor_range_text_get(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format) +evas_textblock_cursor_range_text_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format) { Evas_Object_Textblock *o; Evas_Object_Textblock_Node *n1, *n2, *n; @@ -3560,7 +3560,7 @@ evas_textblock_cursor_range_text_get(Evas_Textblock_Cursor *cur1, Evas_Textblock o = (Evas_Object_Textblock *)(cur1->obj->object_data); if (evas_textblock_cursor_compare(cur1, cur2) > 0) { - Evas_Textblock_Cursor *tc; + const Evas_Textblock_Cursor *tc; tc = cur1; cur1 = cur2; @@ -3617,7 +3617,7 @@ evas_textblock_cursor_range_text_get(Evas_Textblock_Cursor *cur1, Evas_Textblock } EAPI int -evas_textblock_cursor_char_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) +evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) { Evas_Object_Textblock *o; Evas_Object_Textblock_Line *ln = NULL; @@ -3671,7 +3671,7 @@ evas_textblock_cursor_char_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord * } EAPI int -evas_textblock_cursor_line_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) +evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) { Evas_Object_Textblock *o; Evas_Object_Textblock_Line *ln = NULL; @@ -3796,7 +3796,7 @@ evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y) } EAPI Evas_List * -evas_textblock_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2) +evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2) { Evas_Object_Textblock *o; Evas_List *rects = NULL; @@ -3810,7 +3810,7 @@ evas_textblock_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Textb o = (Evas_Object_Textblock *)(cur1->obj->object_data); if (evas_textblock_cursor_compare(cur1, cur2) > 0) { - Evas_Textblock_Cursor *tc; + const Evas_Textblock_Cursor *tc; tc = cur1; cur1 = cur2; @@ -3891,7 +3891,7 @@ evas_textblock_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Textb /* general controls */ EAPI Evas_Bool -evas_object_textblock_line_number_geometry_get(Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) +evas_object_textblock_line_number_geometry_get(const Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) { Evas_Object_Textblock_Line *ln; @@ -3940,7 +3940,7 @@ evas_object_textblock_clear(Evas_Object *obj) } EAPI void -evas_object_textblock_size_formatted_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) +evas_object_textblock_size_formatted_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { TB_HEAD(); if (!o->formatted.valid) _relayout(obj); @@ -3949,7 +3949,7 @@ evas_object_textblock_size_formatted_get(Evas_Object *obj, Evas_Coord *w, Evas_C } EAPI void -evas_object_textblock_size_native_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) +evas_object_textblock_size_native_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { TB_HEAD(); if (!o->native.valid) @@ -3965,7 +3965,7 @@ evas_object_textblock_size_native_get(Evas_Object *obj, Evas_Coord *w, Evas_Coor } EAPI void -evas_object_textblock_style_insets_get(Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b) +evas_object_textblock_style_insets_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b) { TB_HEAD(); if (!o->formatted.valid) _relayout(obj); diff --git a/legacy/evas/src/lib/canvas/evas_stack.c b/legacy/evas/src/lib/canvas/evas_stack.c index 40c89664d2..3a01eda430 100644 --- a/legacy/evas/src/lib/canvas/evas_stack.c +++ b/legacy/evas/src/lib/canvas/evas_stack.c @@ -1,11 +1,8 @@ #include "evas_common.h" #include "evas_private.h" -static Evas_Object *evas_object_above_get_internal(Evas_Object *obj); -static Evas_Object *evas_object_below_get_internal(Evas_Object *obj); - static Evas_Object * -evas_object_above_get_internal(Evas_Object *obj) +evas_object_above_get_internal(const Evas_Object *obj) { if (((Evas_Object_List *)obj)->next) return (Evas_Object *)(((Evas_Object_List *)obj)->next); @@ -23,7 +20,7 @@ evas_object_above_get_internal(Evas_Object *obj) } static Evas_Object * -evas_object_below_get_internal(Evas_Object *obj) +evas_object_below_get_internal(const Evas_Object *obj) { if (((Evas_Object_List *)obj)->prev) return (Evas_Object *)(((Evas_Object_List *)obj)->prev); @@ -334,7 +331,7 @@ evas_object_stack_below(Evas_Object *obj, Evas_Object *below) * */ EAPI Evas_Object * -evas_object_above_get(Evas_Object *obj) +evas_object_above_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return NULL; @@ -344,7 +341,7 @@ evas_object_above_get(Evas_Object *obj) do { obj = (Evas_Object *)(((Evas_Object_List *)(obj))->next); - if ((obj) && (!obj->delete_me)) return obj; + if ((obj) && (!obj->delete_me)) return (Evas_Object *)obj; } while (obj); return NULL; @@ -352,7 +349,7 @@ evas_object_above_get(Evas_Object *obj) obj = evas_object_above_get_internal(obj); while (obj) { - if (!obj->delete_me) return obj; + if (!obj->delete_me) return (Evas_Object *)obj; obj = evas_object_above_get_internal(obj); } return NULL; @@ -366,7 +363,7 @@ evas_object_above_get(Evas_Object *obj) * */ EAPI Evas_Object * -evas_object_below_get(Evas_Object *obj) +evas_object_below_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return NULL; @@ -376,7 +373,7 @@ evas_object_below_get(Evas_Object *obj) do { obj = (Evas_Object *)(((Evas_Object_List *)(obj))->prev); - if ((obj) && (!obj->delete_me)) return obj; + if ((obj) && (!obj->delete_me)) return (Evas_Object *)obj; } while (obj); return NULL; @@ -384,7 +381,7 @@ evas_object_below_get(Evas_Object *obj) obj = evas_object_below_get_internal(obj); while (obj) { - if (!obj->delete_me) return obj; + if (!obj->delete_me) return (Evas_Object *)obj; obj = evas_object_below_get_internal(obj); } return NULL; diff --git a/legacy/evas/src/lib/imaging/evas_imaging.c b/legacy/evas/src/lib/imaging/evas_imaging.c index 6d00778f53..1b89a4653a 100644 --- a/legacy/evas/src/lib/imaging/evas_imaging.c +++ b/legacy/evas/src/lib/imaging/evas_imaging.c @@ -36,7 +36,7 @@ evas_imaging_image_free(Evas_Imaging_Image *im) } EAPI void -evas_imaging_image_size_get(Evas_Imaging_Image *im, int *w, int *h) +evas_imaging_image_size_get(const Evas_Imaging_Image *im, int *w, int *h) { if (!im) return; if (w) *w = im->image->image->w; @@ -44,7 +44,7 @@ evas_imaging_image_size_get(Evas_Imaging_Image *im, int *w, int *h) } EAPI Evas_Bool -evas_imaging_image_alpha_get(Evas_Imaging_Image *im) +evas_imaging_image_alpha_get(const Evas_Imaging_Image *im) { if (!im) return 0; if (im->image->flags & RGBA_IMAGE_HAS_ALPHA) return 1; @@ -143,61 +143,61 @@ evas_imaging_font_free(Evas_Imaging_Font *fn) } EAPI int -evas_imaging_font_ascent_get(Evas_Imaging_Font *fn) +evas_imaging_font_ascent_get(const Evas_Imaging_Font *fn) { return evas_common_font_ascent_get(fn->font); } EAPI int -evas_imaging_font_descent_get(Evas_Imaging_Font *fn) +evas_imaging_font_descent_get(const Evas_Imaging_Font *fn) { return evas_common_font_descent_get(fn->font); } EAPI int -evas_imaging_font_max_ascent_get(Evas_Imaging_Font *fn) +evas_imaging_font_max_ascent_get(const Evas_Imaging_Font *fn) { return evas_common_font_max_ascent_get(fn->font); } EAPI int -evas_imaging_font_max_descent_get(Evas_Imaging_Font *fn) +evas_imaging_font_max_descent_get(const Evas_Imaging_Font *fn) { return evas_common_font_max_descent_get(fn->font); } EAPI int -evas_imaging_font_line_advance_get(Evas_Imaging_Font *fn) +evas_imaging_font_line_advance_get(const Evas_Imaging_Font *fn) { return evas_common_font_get_line_advance(fn->font); } EAPI void -evas_imaging_font_string_advance_get(Evas_Imaging_Font *fn, char *str, int *x, int *y) +evas_imaging_font_string_advance_get(const Evas_Imaging_Font *fn, char *str, int *x, int *y) { evas_common_font_query_advance(fn->font, str, x, y); } EAPI void -evas_imaging_font_string_size_query(Evas_Imaging_Font *fn, char *str, int *w, int *h) +evas_imaging_font_string_size_query(const Evas_Imaging_Font *fn, char *str, int *w, int *h) { evas_common_font_query_size(fn->font, str, w, h); } EAPI int -evas_imaging_font_string_inset_get(Evas_Imaging_Font *fn, char *str) +evas_imaging_font_string_inset_get(const Evas_Imaging_Font *fn, char *str) { return evas_common_font_query_inset(fn->font, str); } EAPI int -evas_imaging_font_string_char_coords_get(Evas_Imaging_Font *fn, char *str, int pos, int *cx, int *cy, int *cw, int *ch) +evas_imaging_font_string_char_coords_get(const Evas_Imaging_Font *fn, char *str, int pos, int *cx, int *cy, int *cw, int *ch) { return evas_common_font_query_char_coords(fn->font, str, pos, cx, cy, cw, ch); } EAPI int -evas_imaging_font_string_char_at_coords_get(Evas_Imaging_Font *fn, char *str, int x, int y, int *cx, int *cy, int *cw, int *ch) +evas_imaging_font_string_char_at_coords_get(const Evas_Imaging_Font *fn, char *str, int x, int y, int *cx, int *cy, int *cw, int *ch) { return evas_common_font_query_text_at_pos(fn->font, str, x, y, cx, cy, cw, ch); }