Enlightenment CVS committal
Author : barbieri
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_clip.c evas_data.c evas_events.c evas_focus.c evas_key.c
evas_layer.c evas_name.c evas_object_gradient.c
evas_object_image.c evas_object_line.c evas_object_main.c
evas_object_smart.c evas_object_text.c evas_object_textblock.c
evas_stack.c
Log Message:
Add const to Evas api: objects and remaining bits.
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_clip.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- evas_clip.c 22 Aug 2007 16:45:37 -0000 1.29
+++ evas_clip.c 8 Feb 2008 22:35:19 -0000 1.30
@@ -238,7 +238,7 @@
* @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 @@
* @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;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_data.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- evas_data.c 25 Sep 2007 13:26:23 -0000 1.10
+++ evas_data.c 8 Feb 2008 22:35:19 -0000 1.11
@@ -87,7 +87,7 @@
* @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 @@
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;
}
}
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_events.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- evas_events.c 8 Feb 2008 21:42:01 -0000 1.56
+++ evas_events.c 8 Feb 2008 22:35:19 -0000 1.57
@@ -207,7 +207,7 @@
* @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 @@
* @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 @@
* @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 @@
* @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;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_focus.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_focus.c 8 Feb 2008 21:42:01 -0000 1.8
+++ evas_focus.c 8 Feb 2008 22:35:19 -0000 1.9
@@ -66,7 +66,7 @@
* @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;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_key.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evas_key.c 8 Feb 2008 21:42:01 -0000 1.12
+++ evas_key.c 8 Feb 2008 22:35:19 -0000 1.13
@@ -96,7 +96,7 @@
* @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 @@
* @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;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_layer.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- evas_layer.c 12 Dec 2007 23:52:18 -0000 1.19
+++ evas_layer.c 8 Feb 2008 22:35:19 -0000 1.20
@@ -188,7 +188,7 @@
* @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;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_name.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- evas_name.c 8 Feb 2008 21:42:01 -0000 1.10
+++ evas_name.c 8 Feb 2008 22:35:19 -0000 1.11
@@ -40,7 +40,7 @@
* @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;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_gradient.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- evas_object_gradient.c 5 Oct 2007 04:52:09 -0000 1.19
+++ evas_object_gradient.c 8 Feb 2008 22:35:19 -0000 1.20
@@ -334,7 +334,7 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_image.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- evas_object_image.c 8 Feb 2008 20:44:09 -0000 1.60
+++ evas_object_image.c 8 Feb 2008 22:35:19 -0000 1.61
@@ -290,7 +290,7 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
*
*/
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 @@
}
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 @@
*
*/
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 @@
*
*/
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 @@
*
*/
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;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_line.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- evas_object_line.c 5 Oct 2007 04:52:10 -0000 1.23
+++ evas_object_line.c 8 Feb 2008 22:35:19 -0000 1.24
@@ -184,7 +184,7 @@
* @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;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_main.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- evas_object_main.c 8 Feb 2008 21:42:01 -0000 1.62
+++ evas_object_main.c 8 Feb 2008 22:35:19 -0000 1.63
@@ -653,7 +653,7 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_smart.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- evas_object_smart.c 5 Oct 2007 04:52:10 -0000 1.29
+++ evas_object_smart.c 8 Feb 2008 22:35:19 -0000 1.30
@@ -90,7 +90,7 @@
* @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 @@
* @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 @@
* @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 @@
* 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;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_text.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- evas_object_text.c 8 Feb 2008 20:57:30 -0000 1.67
+++ evas_object_text.c 8 Feb 2008 22:35:19 -0000 1.68
@@ -127,7 +127,7 @@
*
*/
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 @@
* @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 @@
* @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 @@
*
*/
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 @@
*
*/
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 @@
*
*/
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 @@
*
*/
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 @@
*
*/
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 @@
*
*/
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 @@
*
*/
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 @@
* @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 @@
*
*/
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 @@
*
*/
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 @@
*
*/
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 @@
*
*/
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 @@
*
*/
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 @@
*
*/
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 @@
*
*/
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;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_textblock.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -3 -r1.144 -r1.145
--- evas_object_textblock.c 1 Feb 2008 01:45:46 -0000 1.144
+++ evas_object_textblock.c 8 Feb 2008 22:35:19 -0000 1.145
@@ -373,7 +373,7 @@
}
static void
-_nodes_clear(Evas_Object *obj)
+_nodes_clear(const Evas_Object *obj)
{
Evas_Object_Textblock *o;
@@ -390,7 +390,7 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
/* 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 @@
}
static void
-_relayout(Evas_Object *obj)
+_relayout(const Evas_Object *obj)
{
Evas_Object_Textblock *o;
Evas_Object_Textblock_Line *lines;
@@ -2216,7 +2216,7 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
/* 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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
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 @@
}
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 @@
}
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 @@
}
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 @@
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 @@
/* 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 @@
}
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 @@
}
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 @@
}
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);
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_stack.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- evas_stack.c 8 Feb 2008 21:42:01 -0000 1.25
+++ evas_stack.c 8 Feb 2008 22:35:19 -0000 1.26
@@ -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 @@
}
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 @@
*
*/
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 @@
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 @@
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 @@
*
*/
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 @@
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 @@
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;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
