Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_callbacks.c evas_clip.c evas_data.c evas_events.c
evas_key.c evas_key_grab.c evas_name.c evas_object_image.c
evas_object_intercept.c evas_object_smart.c evas_object_text.c
evas_smart.c
Log Message:
const-ify lots of things...
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_callbacks.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_callbacks.c 8 Jan 2003 04:33:33 -0000 1.7
+++ evas_callbacks.c 10 Jan 2003 04:58:51 -0000 1.8
@@ -259,7 +259,7 @@
* @endcode
*/
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), void *data)
+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)
{
/* MEM OK */
Evas_Func_Node *fn;
@@ -274,7 +274,7 @@
fn = evas_mem_calloc(sizeof(Evas_Func_Node));
if (!fn) return;
fn->func = func;
- fn->data = data;
+ fn->data = (void *)data;
switch (type)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_clip.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_clip.c 9 Dec 2002 23:00:10 -0000 1.2
+++ evas_clip.c 10 Jan 2003 04:58:51 -0000 1.3
@@ -186,7 +186,7 @@
}
}
-Evas_List *
+const Evas_List *
evas_object_clipees_get(Evas_Object *obj)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_data.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_data.c 8 Nov 2002 08:02:14 -0000 1.1
+++ evas_data.c 10 Jan 2003 04:58:51 -0000 1.2
@@ -3,7 +3,7 @@
#include "Evas.h"
void
-evas_object_data_set(Evas_Object *obj, const char *key, void *data)
+evas_object_data_set(Evas_Object *obj, const char *key, const void *data)
{
Evas_Data_Node *node;
@@ -16,7 +16,7 @@
node = malloc(sizeof(Evas_Data_Node));
node->key = strdup(key);
- node->data = data;
+ node->data = (void *)data;
obj->data.elements = evas_list_prepend(obj->data.elements, node);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_events.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_events.c 5 Jan 2003 12:55:37 -0000 1.3
+++ evas_events.c 10 Jan 2003 04:58:51 -0000 1.4
@@ -80,7 +80,7 @@
}
void
-evas_event_feed_mouse_down_data(Evas *e, int b, void *data)
+evas_event_feed_mouse_down_data(Evas *e, int b, const void *data)
{
Evas_List *l, *copy;
@@ -109,7 +109,7 @@
ev.output.y = e->pointer.y;
ev.canvas.x = e->pointer.canvas_x;
ev.canvas.y = e->pointer.canvas_y;
- ev.data = data;
+ ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_DOWN, &ev);
@@ -118,7 +118,7 @@
}
void
-evas_event_feed_mouse_up_data(Evas *e, int b, void *data)
+evas_event_feed_mouse_up_data(Evas *e, int b, const void *data)
{
Evas_List *l, *copy;
@@ -145,7 +145,7 @@
ev.output.y = e->pointer.y;
ev.canvas.x = e->pointer.canvas_x;
ev.canvas.y = e->pointer.canvas_y;
- ev.data = data;
+ ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_UP, &ev);
@@ -177,7 +177,7 @@
ev.output.y = e->pointer.y;
ev.canvas.x = e->pointer.canvas_x;
ev.canvas.y = e->pointer.canvas_y;
- ev.data = data;
+ ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
@@ -200,7 +200,7 @@
ev.output.y = e->pointer.y;
ev.canvas.x = e->pointer.canvas_x;
ev.canvas.y = e->pointer.canvas_y;
- ev.data = data;
+ ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN, &ev);
@@ -215,7 +215,7 @@
}
void
-evas_event_feed_mouse_move_data(Evas *e, int x, int y, void *data)
+evas_event_feed_mouse_move_data(Evas *e, int x, int y, const void *data)
{
int px, py;
double pcx, pcy;
@@ -267,7 +267,7 @@
ev.prev.output.y = py;
ev.prev.canvas.x = pcx;
ev.prev.canvas.y = pcy;
- ev.data = data;
+ ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_MOVE,
&ev);
@@ -293,7 +293,7 @@
ev.output.y = e->pointer.y;
ev.canvas.x = e->pointer.canvas_x;
ev.canvas.y = e->pointer.canvas_y;
- ev.data = data;
+ ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
@@ -338,7 +338,7 @@
ev.prev.output.y = py;
ev.prev.canvas.x = pcx;
ev.prev.canvas.y = pcy;
- ev.data = data;
+ ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_MOVE,
&ev);
@@ -355,7 +355,7 @@
ev.output.y = e->pointer.y;
ev.canvas.x = e->pointer.canvas_x;
ev.canvas.y = e->pointer.canvas_y;
- ev.data = data;
+ ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
@@ -379,7 +379,7 @@
ev.output.y = e->pointer.y;
ev.canvas.x = e->pointer.canvas_x;
ev.canvas.y = e->pointer.canvas_y;
- ev.data = data;
+ ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN, &ev);
@@ -393,7 +393,7 @@
}
void
-evas_event_feed_mouse_in_data(Evas *e, void *data)
+evas_event_feed_mouse_in_data(Evas *e, const void *data)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
@@ -402,7 +402,7 @@
}
void
-evas_event_feed_mouse_out_data(Evas *e, void *data)
+evas_event_feed_mouse_out_data(Evas *e, const void *data)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
@@ -411,7 +411,7 @@
}
void
-evas_event_feed_key_down_data(Evas *e, char *keyname, void *data)
+evas_event_feed_key_down_data(Evas *e, const char *keyname, const void *data)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
@@ -421,8 +421,8 @@
{
Evas_Event_Key_Down ev;
- ev.keyname = keyname;
- ev.data = data;
+ ev.keyname = (char *)keyname;
+ ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
if (e->grabs)
@@ -449,7 +449,7 @@
}
void
-evas_event_feed_key_up_data(Evas *e, char *keyname, void *data)
+evas_event_feed_key_up_data(Evas *e, const char *keyname, const void *data)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
@@ -459,8 +459,8 @@
{
Evas_Event_Key_Up ev;
- ev.keyname = keyname;
- ev.data = data;
+ ev.keyname = (char *)keyname;
+ ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
if (e->grabs)
@@ -517,13 +517,13 @@
}
void
-evas_event_feed_key_down(Evas *e, char *keyname)
+evas_event_feed_key_down(Evas *e, const char *keyname)
{
evas_event_feed_key_down_data(e, keyname, NULL);
}
void
-evas_event_feed_key_up(Evas *e, char *keyname)
+evas_event_feed_key_up(Evas *e, const char *keyname)
{
evas_event_feed_key_up_data(e, keyname, NULL);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_key.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_key.c 5 Jan 2003 12:55:37 -0000 1.3
+++ evas_key.c 10 Jan 2003 04:58:51 -0000 1.4
@@ -4,11 +4,11 @@
/* private calls */
-static int evas_key_modifier_number(Evas_Modifier *m, char *keyname);
-static int evas_key_lock_number(Evas_Lock *l, char *keyname);
+static int evas_key_modifier_number(Evas_Modifier *m, const char *keyname);
+static int evas_key_lock_number(Evas_Lock *l, const char *keyname);
static int
-evas_key_modifier_number(Evas_Modifier *m, char *keyname)
+evas_key_modifier_number(Evas_Modifier *m, const char *keyname)
{
int i;
@@ -20,7 +20,7 @@
}
static int
-evas_key_lock_number(Evas_Lock *l, char *keyname)
+evas_key_lock_number(Evas_Lock *l, const char *keyname)
{
int i;
@@ -54,7 +54,7 @@
}
int
-evas_key_modifier_is_set_get(Evas_Modifier *m, char *keyname)
+evas_key_modifier_is_set_get(Evas_Modifier *m, const char *keyname)
{
Evas_Modifier_Mask num;
@@ -68,7 +68,7 @@
}
int
-evas_key_lock_is_set_get(Evas_Lock *l, char *keyname)
+evas_key_lock_is_set_get(Evas_Lock *l, const char *keyname)
{
Evas_Modifier_Mask num;
@@ -82,7 +82,7 @@
}
void
-evas_key_modifier_add(Evas *e, char *keyname)
+evas_key_modifier_add(Evas *e, const char *keyname)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
@@ -97,7 +97,7 @@
}
void
-evas_key_modifier_del(Evas *e, char *keyname)
+evas_key_modifier_del(Evas *e, const char *keyname)
{
int i;
@@ -122,7 +122,7 @@
}
void
-evas_key_lock_add(Evas *e, char *keyname)
+evas_key_lock_add(Evas *e, const char *keyname)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
@@ -137,7 +137,7 @@
}
void
-evas_key_lock_del(Evas *e, char *keyname)
+evas_key_lock_del(Evas *e, const char *keyname)
{
int i;
@@ -163,7 +163,7 @@
}
void
-evas_key_modifier_on(Evas *e, char *keyname)
+evas_key_modifier_on(Evas *e, const char *keyname)
{
Evas_Modifier_Mask num;
@@ -177,7 +177,7 @@
}
void
-evas_key_modifier_off(Evas *e, char *keyname)
+evas_key_modifier_off(Evas *e, const char *keyname)
{
Evas_Modifier_Mask num;
@@ -191,7 +191,7 @@
}
void
-evas_key_lock_on(Evas *e, char *keyname)
+evas_key_lock_on(Evas *e, const char *keyname)
{
Evas_Modifier_Mask num;
@@ -205,7 +205,7 @@
}
void
-evas_key_lock_off(Evas *e, char *keyname)
+evas_key_lock_off(Evas *e, const char *keyname)
{
Evas_Modifier_Mask num;
@@ -221,7 +221,7 @@
/* errr need to add key grabbing/ungrabbing calls - missing modifier stuff. */
Evas_Modifier_Mask
-evas_key_modifier_mask_get(Evas *e, char *keyname)
+evas_key_modifier_mask_get(Evas *e, const char *keyname)
{
Evas_Modifier_Mask num;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_key_grab.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_key_grab.c 5 Jan 2003 12:55:37 -0000 1.1
+++ evas_key_grab.c 10 Jan 2003 04:58:51 -0000 1.2
@@ -8,12 +8,12 @@
/* Evas and then a linked lists of grabs for that key and what */
/* modifiers/not_modifers they use */
-static Evas_Key_Grab *evas_key_grab_new (Evas_Object *obj, char *keyname,
Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, int exclusive);
-static void evas_key_grab_free (Evas_Object *obj, char *keyname,
Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers);
-static Evas_Key_Grab *evas_key_grab_find (Evas_Object *obj, char *keyname,
Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers);
+static Evas_Key_Grab *evas_key_grab_new (Evas_Object *obj, const char *keyname,
+Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, int exclusive);
+static void evas_key_grab_free (Evas_Object *obj, const char *keyname,
+Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers);
+static Evas_Key_Grab *evas_key_grab_find (Evas_Object *obj, const char *keyname,
+Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers);
static Evas_Key_Grab *
-evas_key_grab_new(Evas_Object *obj, char *keyname, Evas_Modifier_Mask modifiers,
Evas_Modifier_Mask not_modifiers, int exclusive)
+evas_key_grab_new(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask
+modifiers, Evas_Modifier_Mask not_modifiers, int exclusive)
{
/* MEM OK */
Evas_Key_Grab *g;
@@ -72,7 +72,7 @@
}
static void
-evas_key_grab_free(Evas_Object *obj, char *keyname, Evas_Modifier_Mask modifiers,
Evas_Modifier_Mask not_modifiers)
+evas_key_grab_free(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask
+modifiers, Evas_Modifier_Mask not_modifiers)
{
/* MEM OK */
Evas_Key_Grab *g;
@@ -85,7 +85,7 @@
}
static Evas_Key_Grab *
-evas_key_grab_find(Evas_Object *obj, char *keyname, Evas_Modifier_Mask modifiers,
Evas_Modifier_Mask not_modifiers)
+evas_key_grab_find(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask
+modifiers, Evas_Modifier_Mask not_modifiers)
{
/* MEM OK */
Evas_List *l;
@@ -125,7 +125,7 @@
/* public calls */
int
-evas_object_key_grab(Evas_Object *obj, char *keyname, Evas_Modifier_Mask modifiers,
Evas_Modifier_Mask not_modifiers, int exclusive)
+evas_object_key_grab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask
+modifiers, Evas_Modifier_Mask not_modifiers, int exclusive)
{
/* MEM OK */
Evas_Key_Grab *g;
@@ -144,7 +144,7 @@
}
void
-evas_object_key_ungrab(Evas_Object *obj, char *keyname, Evas_Modifier_Mask modifiers,
Evas_Modifier_Mask not_modifiers)
+evas_object_key_ungrab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask
+modifiers, Evas_Modifier_Mask not_modifiers)
{
/* MEM OK */
Evas_Key_Grab *g;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_name.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_name.c 8 Nov 2002 08:02:14 -0000 1.1
+++ evas_name.c 10 Jan 2003 04:58:51 -0000 1.2
@@ -21,7 +21,7 @@
}
}
-char *
+const char *
evas_object_name_get(Evas_Object *obj)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_image.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_object_image.c 8 Nov 2002 08:02:14 -0000 1.1
+++ evas_object_image.c 10 Jan 2003 04:58:51 -0000 1.2
@@ -91,7 +91,7 @@
}
void
-evas_object_image_file_set(Evas_Object *obj, char *file, char *key)
+evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key)
{
Evas_Object_Image *o;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_intercept.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_object_intercept.c 17 Dec 2002 00:00:34 -0000 1.3
+++ evas_object_intercept.c 10 Jan 2003 04:58:51 -0000 1.4
@@ -190,7 +190,7 @@
/* public calls */
void
-evas_object_intercept_show_callback_add(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj), void *data)
+evas_object_intercept_show_callback_add(Evas_Object *obj, void (*func) (void *data,
+Evas_Object *obj), const void *data)
{
/* MEM OK */
@@ -201,7 +201,7 @@
evas_object_intercept_init(obj);
if (!obj->interceptors) return;
obj->interceptors->show.func = func;
- obj->interceptors->show.data = data;
+ obj->interceptors->show.data = (void *)data;
}
void *
@@ -223,7 +223,7 @@
}
void
-evas_object_intercept_hide_callback_add(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj), void *data)
+evas_object_intercept_hide_callback_add(Evas_Object *obj, void (*func) (void *data,
+Evas_Object *obj), const void *data)
{
/* MEM OK */
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -233,7 +233,7 @@
evas_object_intercept_init(obj);
if (!obj->interceptors) return;
obj->interceptors->hide.func = func;
- obj->interceptors->hide.data = data;
+ obj->interceptors->hide.data = (void *)data;
}
void *
@@ -255,7 +255,7 @@
}
void
-evas_object_intercept_move_callback_add(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj, double x, double y), void *data)
+evas_object_intercept_move_callback_add(Evas_Object *obj, void (*func) (void *data,
+Evas_Object *obj, double x, double y), const void *data)
{
/* MEM OK */
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -265,7 +265,7 @@
evas_object_intercept_init(obj);
if (!obj->interceptors) return;
obj->interceptors->move.func = func;
- obj->interceptors->move.data = data;
+ obj->interceptors->move.data = (void *)data;
}
void *
@@ -286,7 +286,7 @@
}
void
-evas_object_intercept_resize_callback_add(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj, double w, double h), void *data)
+evas_object_intercept_resize_callback_add(Evas_Object *obj, void (*func) (void *data,
+Evas_Object *obj, double w, double h), const void *data)
{
/* MEM OK */
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -296,7 +296,7 @@
evas_object_intercept_init(obj);
if (!obj->interceptors) return;
obj->interceptors->resize.func = func;
- obj->interceptors->resize.data = data;
+ obj->interceptors->resize.data = (void *)data;
}
void *
@@ -317,7 +317,7 @@
}
void
-evas_object_intercept_raise_callback_add(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj), void *data)
+evas_object_intercept_raise_callback_add(Evas_Object *obj, void (*func) (void *data,
+Evas_Object *obj), const void *data)
{
/* MEM OK */
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -327,7 +327,7 @@
evas_object_intercept_init(obj);
if (!obj->interceptors) return;
obj->interceptors->raise.func = func;
- obj->interceptors->raise.data = data;
+ obj->interceptors->raise.data = (void *)data;
}
void *
@@ -348,7 +348,7 @@
}
void
-evas_object_intercept_lower_callback_add(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj), void *data)
+evas_object_intercept_lower_callback_add(Evas_Object *obj, void (*func) (void *data,
+Evas_Object *obj), const void *data)
{
/* MEM OK */
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -358,7 +358,7 @@
evas_object_intercept_init(obj);
if (!obj->interceptors) return;
obj->interceptors->lower.func = func;
- obj->interceptors->lower.data = data;
+ obj->interceptors->lower.data = (void *)data;
}
void *
@@ -379,7 +379,7 @@
}
void
-evas_object_intercept_stack_above_callback_add(Evas_Object *obj, void (*func) (void
*data, Evas_Object *obj, Evas_Object *above), void *data)
+evas_object_intercept_stack_above_callback_add(Evas_Object *obj, void (*func) (void
+*data, Evas_Object *obj, Evas_Object *above), const void *data)
{
/* MEM OK */
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -389,7 +389,7 @@
evas_object_intercept_init(obj);
if (!obj->interceptors) return;
obj->interceptors->stack_above.func = func;
- obj->interceptors->stack_above.data = data;
+ obj->interceptors->stack_above.data = (void *)data;
}
void *
@@ -410,7 +410,7 @@
}
void
-evas_object_intercept_stack_below_callback_add(Evas_Object *obj, void (*func) (void
*data, Evas_Object *obj, Evas_Object *below), void *data)
+evas_object_intercept_stack_below_callback_add(Evas_Object *obj, void (*func) (void
+*data, Evas_Object *obj, Evas_Object *below), const void *data)
{
/* MEM OK */
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -420,7 +420,7 @@
evas_object_intercept_init(obj);
if (!obj->interceptors) return;
obj->interceptors->stack_below.func = func;
- obj->interceptors->stack_below.data = data;
+ obj->interceptors->stack_below.data = (void *)data;
}
void *
@@ -441,7 +441,7 @@
}
void
-evas_object_intercept_layer_set_callback_add(Evas_Object *obj, void (*func) (void
*data, Evas_Object *obj, int l), void *data)
+evas_object_intercept_layer_set_callback_add(Evas_Object *obj, void (*func) (void
+*data, Evas_Object *obj, int l), const void *data)
{
/* MEM OK */
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -451,7 +451,7 @@
evas_object_intercept_init(obj);
if (!obj->interceptors) return;
obj->interceptors->layer_set.func = func;
- obj->interceptors->layer_set.data = data;
+ obj->interceptors->layer_set.data = (void *)data;
}
void *
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_smart.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_object_smart.c 8 Nov 2002 08:02:14 -0000 1.1
+++ evas_object_smart.c 10 Jan 2003 04:58:51 -0000 1.2
@@ -153,7 +153,7 @@
}
void
-evas_object_smart_callback_add(Evas_Object *obj, char *event, void (*func) (void
*data, Evas_Object *obj, void *event_info), void *data)
+evas_object_smart_callback_add(Evas_Object *obj, const char *event, void (*func)
+(void *data, Evas_Object *obj, void *event_info), const void *data)
{
Evas_Object_Smart *o;
Evas_Smart_Callback *cb;
@@ -170,12 +170,12 @@
cb = calloc(1, sizeof(Evas_Smart_Callback));
cb->event = strdup(event);
cb->func = func;
- cb->func_data = data;
+ cb->func_data = (void *)data;
obj->smart.callbacks = evas_list_prepend(obj->smart.callbacks, cb);
}
void *
-evas_object_smart_callback_del(Evas_Object *obj, char *event, void (*func) (void
*data, Evas_Object *obj, void *event_info))
+evas_object_smart_callback_del(Evas_Object *obj, const char *event, void (*func)
+(void *data, Evas_Object *obj, void *event_info))
{
Evas_Object_Smart *o;
Evas_List *l;
@@ -208,7 +208,7 @@
}
void
-evas_object_smart_callback_call(Evas_Object *obj, char *event, void *event_info)
+evas_object_smart_callback_call(Evas_Object *obj, const char *event, void *event_info)
{
Evas_Object_Smart *o;
Evas_List *l;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_text.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_object_text.c 8 Jan 2003 06:39:38 -0000 1.4
+++ evas_object_text.c 10 Jan 2003 04:58:51 -0000 1.5
@@ -72,7 +72,7 @@
}
void
-evas_object_text_font_set(Evas_Object *obj, char *font, double size)
+evas_object_text_font_set(Evas_Object *obj, const char *font, double size)
{
Evas_Object_Text *o;
int is, was;
@@ -93,13 +93,13 @@
was = evas_object_is_in_output_rect(obj,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y, 1, 1);
- /* DO II */
+ /* DO IT */
if (o->engine_data)
obj->layer->evas->engine.func->font_free(obj->layer->evas->engine.data.output,
o->engine_data);
- if (evas_file_path_is_full_path(font))
+ if (evas_file_path_is_full_path((char *)font))
o->engine_data =
obj->layer->evas->engine.func->font_load(obj->layer->evas->engine.data.output,
- font, size);
+ (char *)font, size);
else
{
Evas_List *l;
@@ -109,7 +109,7 @@
char *tmp, *font_tmp;
Evas_List *dir;
- tmp = evas_file_path_join(l->data, font);
+ tmp = evas_file_path_join(l->data, (char *)font);
if (tmp)
{
char *tmp2;
@@ -148,7 +148,7 @@
}
free(tmp);
}
- dir = evas_file_path_list(l->data, font, 0);
+ dir = evas_file_path_list(l->data, (char *)font, 0);
while (dir)
{
tmp = evas_file_path_join(l->data, dir->data);
@@ -288,7 +288,7 @@
}
void
-evas_object_text_text_set(Evas_Object *obj, char *text)
+evas_object_text_text_set(Evas_Object *obj, const char *text)
{
Evas_Object_Text *o;
int is, was;
@@ -341,7 +341,7 @@
evas_object_inform_call_resize(obj);
}
-char *
+const char *
evas_object_text_text_get(Evas_Object *obj)
{
Evas_Object_Text *o;
@@ -538,7 +538,7 @@
}
void
-evas_object_font_path_append(Evas *e, char *path)
+evas_object_font_path_append(Evas *e, const char *path)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
@@ -548,7 +548,7 @@
}
void
-evas_object_font_path_prepend(Evas *e, char *path)
+evas_object_font_path_prepend(Evas *e, const char *path)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
@@ -557,7 +557,7 @@
e->font_path = evas_list_prepend(e->font_path, strdup(path));
}
-Evas_List *
+const Evas_List *
evas_object_font_path_list(Evas *e)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_smart.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_smart.c 8 Nov 2002 08:02:14 -0000 1.1
+++ evas_smart.c 10 Jan 2003 04:58:51 -0000 1.2
@@ -4,34 +4,39 @@
/* all public */
Evas_Smart *
-evas_smart_new(char *name,
- void (*func_add) (Evas_Object *o),
- void (*func_del) (Evas_Object *o),
- void (*func_layer_set) (Evas_Object *o, int l),
- void (*func_raise) (Evas_Object *o),
- void (*func_lower) (Evas_Object *o),
- void (*func_stack_above) (Evas_Object *o, Evas_Object *above),
- void (*func_stack_below) (Evas_Object *o, Evas_Object *below),
- void (*func_move) (Evas_Object *o, double x, double y),
- void (*func_resize) (Evas_Object *o, double w, double h),
- void (*func_show) (Evas_Object *o),
- void (*func_hide) (Evas_Object *o),
- void (*func_color_set) (Evas_Object *o, int r, int g, int b,
int a),
- void (*func_clip_set) (Evas_Object *o, Evas_Object *clip),
- void (*func_clip_unset) (Evas_Object *o),
- void *data)
+evas_smart_new(const char *name,
+ void (*func_add) (Evas_Object *o),
+ void (*func_del) (Evas_Object *o),
+ void (*func_layer_set) (Evas_Object *o, int l),
+ void (*func_raise) (Evas_Object *o),
+ void (*func_lower) (Evas_Object *o),
+ void (*func_stack_above) (Evas_Object *o, Evas_Object *above),
+ void (*func_stack_below) (Evas_Object *o, Evas_Object *below),
+ void (*func_move) (Evas_Object *o, double x, double y),
+ void (*func_resize) (Evas_Object *o, double w, double h),
+ void (*func_show) (Evas_Object *o),
+ void (*func_hide) (Evas_Object *o),
+ void (*func_color_set) (Evas_Object *o, int r, int g, int b, int
+a),
+ void (*func_clip_set) (Evas_Object *o, Evas_Object *clip),
+ void (*func_clip_unset) (Evas_Object *o),
+ const void *data)
{
Evas_Smart *s;
if (!name) return NULL;
- s = calloc(1, sizeof(Evas_Smart));
+ s = evas_mem_calloc(sizeof(Evas_Smart));
if (!s) return NULL;
s->magic = MAGIC_SMART;
s->name = strdup(name);
-
+ if (!s->name)
+ {
+ free(s);
+ return NULL;
+ }
+
s->func_add = func_add;
s->func_del = func_del;
s->func_layer_set = func_layer_set;
@@ -46,7 +51,7 @@
s->func_color_set = func_color_set;
s->func_clip_set = func_clip_set;
s->func_clip_unset = func_clip_unset;
- s->data = data;
+ s->data = (void *)data;
return s;
}
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
