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

const-ify lots of things... 

SVN revision: 6558
This commit is contained in:
Carsten Haitzler 2003-01-10 04:58:51 +00:00
parent 124d4a8909
commit 3f207b8c08
17 changed files with 194 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
legacy/evas/src/lib/Evas.h
View File

@ -197,14 +197,14 @@ struct _Evas_Event_Key_Up
extern "C" {
#endif
Evas_List *evas_list_append (Evas_List *list, void *data);
Evas_List *evas_list_prepend (Evas_List *list, void *data);
Evas_List *evas_list_append_relative (Evas_List *list, void *data, void *relative);
Evas_List *evas_list_prepend_relative (Evas_List *list, void *data, void *relative);
Evas_List *evas_list_remove (Evas_List *list, void *data);
Evas_List *evas_list_append (Evas_List *list, const void *data);
Evas_List *evas_list_prepend (Evas_List *list, const void *data);
Evas_List *evas_list_append_relative (Evas_List *list, const void *data, const void *relative);
Evas_List *evas_list_prepend_relative (Evas_List *list, const void *data, const void *relative);
Evas_List *evas_list_remove (Evas_List *list, const void *data);
Evas_List *evas_list_remove_list (Evas_List *list, Evas_List *remove_list);
void *evas_list_find (Evas_List *list, void *data);
Evas_List *evas_list_find_list (Evas_List *list, void *data);
void *evas_list_find (Evas_List *list, const void *data);
Evas_List *evas_list_find_list (Evas_List *list, const void *data);
Evas_List *evas_list_free (Evas_List *list);
Evas_List *evas_list_last (Evas_List *list);
Evas_List *evas_list_next (Evas_List *list);
@ -222,12 +222,12 @@ extern "C" {
*
* do we really need this? hmmm - let me think... there may be a better way
*/
Evas_Hash *evas_hash_add (Evas_Hash *hash, const char *key, void *data);
Evas_Hash *evas_hash_del (Evas_Hash *hash, const char *key, void *data);
Evas_Hash *evas_hash_add (Evas_Hash *hash, const char *key, const void*data);
Evas_Hash *evas_hash_del (Evas_Hash *hash, const char *key, const void*data);
void *evas_hash_find (Evas_Hash *hash, const char *key);
int evas_hash_size (Evas_Hash *hash);
void evas_hash_free (Evas_Hash *hash);
void evas_hash_foreach (Evas_Hash *hash, int (*func) (Evas_Hash *hash, const char *key, void *data, void *fdata), void *fdata);
void evas_hash_foreach (Evas_Hash *hash, int (*func) (Evas_Hash *hash, const char *key, void *data, void *fdata), const void *fdata);
int evas_hash_alloc_error (void);
int evas_alloc_error (void);
@ -284,7 +284,7 @@ extern "C" {
void evas_object_polygon_points_clear (Evas_Object *obj);
Evas_Object *evas_object_image_add (Evas *e);
void evas_object_image_file_set (Evas_Object *obj, char *file, char *key);
void evas_object_image_file_set (Evas_Object *obj, const char *file, const char *key);
void evas_object_image_file_get (Evas_Object *obj, char **file, char **key);
void evas_object_image_border_set (Evas_Object *obj, int l, int r, int t, int b);
void evas_object_image_border_get (Evas_Object *obj, int *l, int *r, int *t, int *b);
@ -309,10 +309,10 @@ extern "C" {
int evas_object_image_cache_get (Evas *e);
Evas_Object *evas_object_text_add (Evas *e);
void evas_object_text_font_set (Evas_Object *obj, char *font, double size);
void evas_object_text_font_set (Evas_Object *obj, const char *font, double size);
void evas_object_text_font_get (Evas_Object *obj, char **font, double *size);
void evas_object_text_text_set (Evas_Object *obj, char *text);
char *evas_object_text_text_get (Evas_Object *obj);
void evas_object_text_text_set (Evas_Object *obj, const char *text);
const char *evas_object_text_text_get (Evas_Object *obj);
double evas_object_text_ascent_get (Evas_Object *obj);
double evas_object_text_descent_get (Evas_Object *obj);
double evas_object_text_max_ascent_get (Evas_Object *obj);
@ -324,9 +324,9 @@ extern "C" {
int evas_object_text_char_coords_get (Evas_Object *obj, double x, double y, double *cx, double *cy, double *cw, double *ch);
void evas_object_font_path_clear (Evas *e);
void evas_object_font_path_append (Evas *e, char *path);
void evas_object_font_path_prepend (Evas *e, char *path);
Evas_List *evas_object_font_path_list (Evas *e);
void evas_object_font_path_append (Evas *e, const char *path);
void evas_object_font_path_prepend (Evas *e, const char *path);
const Evas_List *evas_object_font_path_list (Evas *e);
void evas_object_font_cache_flush (Evas *e);
void evas_object_font_cache_set (Evas *e, int size);
@ -362,14 +362,14 @@ extern "C" {
void evas_object_clip_set (Evas_Object *obj, Evas_Object *clip);
Evas_Object *evas_object_clip_get (Evas_Object *obj);
void evas_object_clip_unset (Evas_Object *obj);
Evas_List *evas_object_clipees_get (Evas_Object *obj);
const Evas_List *evas_object_clipees_get (Evas_Object *obj);
void evas_object_data_set (Evas_Object *obj, const char *key, void *data);
void evas_object_data_set (Evas_Object *obj, const char *key, const void *data);
void *evas_object_data_get (Evas_Object *obj, const char *key);
void *evas_object_data_del (Evas_Object *obj, const char *key);
void evas_object_name_set (Evas_Object *obj, const char *name);
char *evas_object_name_get (Evas_Object *obj);
const char *evas_object_name_get (Evas_Object *obj);
Evas_Object *evas_object_name_find (Evas *e, const char *name);
Evas *evas_object_evas_get (Evas_Object *obj);
@ -381,7 +381,7 @@ extern "C" {
Evas_List *evas_objects_at_xy_get (Evas *e, double x, double y, int include_pass_events_objects, int include_hidden_objects);
Evas_List *evas_objects_in_rectangle_get (Evas *e, double x, double y, double w, double h, int include_pass_events_objects, int include_hidden_objects);
Evas_Smart *evas_smart_new (char *name, void (*func_add) (Evas_Object *obj), void (*func_del) (Evas_Object *obj), void (*func_layer_set) (Evas_Object *obj, int l), void (*func_raise) (Evas_Object *obj), void (*func_lower) (Evas_Object *obj), void (*func_stack_above) (Evas_Object *obj, Evas_Object *above), void (*func_stack_below) (Evas_Object *obj, Evas_Object *below), void (*func_move) (Evas_Object *obj, double x, double y), void (*func_resize) (Evas_Object *obj, double w, double h), void (*func_show) (Evas_Object *obj), void (*func_hide) (Evas_Object *obj), void (*func_color_set) (Evas_Object *obj, int r, int g, int b, int a), void (*func_clip_set) (Evas_Object *obj, Evas_Object *clip), void (*func_clip_unset) (Evas_Object *obj), void *data);
Evas_Smart *evas_smart_new (const char *name, void (*func_add) (Evas_Object *obj), void (*func_del) (Evas_Object *obj), void (*func_layer_set) (Evas_Object *obj, int l), void (*func_raise) (Evas_Object *obj), void (*func_lower) (Evas_Object *obj), void (*func_stack_above) (Evas_Object *obj, Evas_Object *above), void (*func_stack_below) (Evas_Object *obj, Evas_Object *below), void (*func_move) (Evas_Object *obj, double x, double y), void (*func_resize) (Evas_Object *obj, double w, double h), void (*func_show) (Evas_Object *obj), void (*func_hide) (Evas_Object *obj), void (*func_color_set) (Evas_Object *obj, int r, int g, int b, int a), void (*func_clip_set) (Evas_Object *obj, Evas_Object *clip), void (*func_clip_unset) (Evas_Object *obj), const void *data);
void evas_smart_free (Evas_Smart *s);
void *evas_smart_data_get (Evas_Smart *s);
@ -391,27 +391,27 @@ extern "C" {
Evas_Smart *evas_object_smart_smart_get (Evas_Object *obj);
void *evas_object_smart_data_get (Evas_Object *obj);
void evas_object_smart_data_set (Evas_Object *obj, void *data);
void evas_object_smart_callback_add (Evas_Object *obj, char *event, void (*func) (void *data, Evas_Object *obj, void *event_info), void *data);
void *evas_object_smart_callback_del (Evas_Object *obj, char *event, void (*func) (void *data, Evas_Object *obj, void *event_info));
void evas_object_smart_callback_call (Evas_Object *obj, char *event, void *event_info);
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);
void *evas_object_smart_callback_del (Evas_Object *obj, const char *event, void (*func) (void *data, Evas_Object *obj, void *event_info));
void evas_object_smart_callback_call (Evas_Object *obj, const char *event, void *event_info);
void evas_event_freeze (Evas *e);
void evas_event_thaw (Evas *e);
int evas_event_freeze_get (Evas *e);
void evas_event_feed_mouse_down_data (Evas *e, int b, void *data);
void evas_event_feed_mouse_up_data (Evas *e, int b, void *data);
void evas_event_feed_mouse_move_data (Evas *e, int x, int y, void *data);
void evas_event_feed_mouse_in_data (Evas *e, void *data);
void evas_event_feed_mouse_out_data (Evas *e, void *data);
void evas_event_feed_key_down_data (Evas *e, char *keyname, void *data);
void evas_event_feed_key_up_data (Evas *e, char *keyname, void *data);
void evas_event_feed_mouse_down_data (Evas *e, int b, const void *data);
void evas_event_feed_mouse_up_data (Evas *e, int b, const void *data);
void evas_event_feed_mouse_move_data (Evas *e, int x, int y, const void *data);
void evas_event_feed_mouse_in_data (Evas *e, const void *data);
void evas_event_feed_mouse_out_data (Evas *e, const void *data);
void evas_event_feed_key_down_data (Evas *e, const char *keyname, const void *data);
void evas_event_feed_key_up_data (Evas *e, const char *keyname, const void *data);
void evas_event_feed_mouse_down (Evas *e, int b);
void evas_event_feed_mouse_up (Evas *e, int b);
void evas_event_feed_mouse_move (Evas *e, int x, int y);
void evas_event_feed_mouse_in (Evas *e);
void evas_event_feed_mouse_out (Evas *e);
void evas_event_feed_key_down (Evas *e, char *keyname);
void evas_event_feed_key_up (Evas *e, char *keyname);
void evas_event_feed_key_down (Evas *e, const char *keyname);
void evas_event_feed_key_up (Evas *e, const char *keyname);
void evas_object_focus_set (Evas_Object *obj, int focus);
int evas_object_focus_get (Evas_Object *obj);
@ -421,50 +421,50 @@ extern "C" {
Evas_Modifier *evas_key_modifier_get (Evas *e);
Evas_Lock *evas_key_lock_get (Evas *e);
int evas_key_modifier_is_set_get (Evas_Modifier *m, char *keyname);
int evas_key_modifier_is_set_get (Evas_Modifier *m, const char *keyname);
int evas_key_lock_is_set_get (Evas_Lock *l, char *keyname);
int evas_key_lock_is_set_get (Evas_Lock *l, const char *keyname);
void evas_key_modifier_add (Evas *e, char *keyname);
void evas_key_modifier_del (Evas *e, char *keyname);
void evas_key_lock_add (Evas *e, char *keyname);
void evas_key_lock_del (Evas *e, char *keyname);
void evas_key_modifier_add (Evas *e, const char *keyname);
void evas_key_modifier_del (Evas *e, const char *keyname);
void evas_key_lock_add (Evas *e, const char *keyname);
void evas_key_lock_del (Evas *e, const char *keyname);
void evas_key_modifier_on (Evas *e, char *keyname);
void evas_key_modifier_off (Evas *e, char *keyname);
void evas_key_lock_on (Evas *e, char *keyname);
void evas_key_lock_off (Evas *e, char *keyname);
void evas_key_modifier_on (Evas *e, const char *keyname);
void evas_key_modifier_off (Evas *e, const char *keyname);
void evas_key_lock_on (Evas *e, const char *keyname);
void evas_key_lock_off (Evas *e, const char *keyname);
Evas_Modifier_Mask evas_key_modifier_mask_get (Evas *e, char *keyname);
Evas_Modifier_Mask evas_key_modifier_mask_get (Evas *e, const char *keyname);
int evas_object_key_grab (Evas_Object *obj, char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, int exclusive);
void evas_object_key_ungrab (Evas_Object *obj, char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers);
int evas_object_key_grab (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, int exclusive);
void evas_object_key_ungrab (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers);
void evas_object_pass_events_set (Evas_Object *obj, int pass);
int evas_object_pass_events_get (Evas_Object *obj);
void evas_object_repeat_events_set (Evas_Object *obj, int repeat);
int evas_object_repeat_events_get (Evas_Object *obj);
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);
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);
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));
void evas_object_intercept_show_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data);
void evas_object_intercept_show_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), const void *data);
void *evas_object_intercept_show_callback_del (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj));
void evas_object_intercept_hide_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data);
void evas_object_intercept_hide_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), const void *data);
void *evas_object_intercept_hide_callback_del (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj));
void evas_object_intercept_move_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, double x, double y), void *data);
void evas_object_intercept_move_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, double x, double y), const void *data);
void *evas_object_intercept_move_callback_del (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, double x, double y));
void evas_object_intercept_resize_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, double w, double h), void *data);
void evas_object_intercept_resize_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, double w, double h), const void *data);
void *evas_object_intercept_resize_callback_del (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, double w, double h));
void evas_object_intercept_raise_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data);
void evas_object_intercept_raise_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), const void *data);
void *evas_object_intercept_raise_callback_del (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj));
void evas_object_intercept_lower_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data);
void evas_object_intercept_lower_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), const void *data);
void *evas_object_intercept_lower_callback_del (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj));
void evas_object_intercept_stack_above_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *above), void *data);
void evas_object_intercept_stack_above_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *above), const void *data);
void *evas_object_intercept_stack_above_callback_del (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *above));
void evas_object_intercept_stack_below_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *below), void *data);
void evas_object_intercept_stack_below_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *below), const void *data);
void *evas_object_intercept_stack_below_callback_del (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, Evas_Object *below));
void evas_object_intercept_layer_set_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, int l), void *data);
void evas_object_intercept_layer_set_callback_add (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, int l), const void *data);
void *evas_object_intercept_layer_set_callback_del (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, int l));
#ifdef __cplusplus

4
legacy/evas/src/lib/canvas/evas_callbacks.c
View File

@ -259,7 +259,7 @@ evas_object_event_callback_call(Evas_Object *obj, Evas_Callback_Type type, void
* @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 @@ evas_object_event_callback_add(Evas_Object *obj, Evas_Callback_Type type, void (
fn = evas_mem_calloc(sizeof(Evas_Func_Node));
if (!fn) return;
fn->func = func;
fn->data = data;
fn->data = (void *)data;
switch (type)
{

2
legacy/evas/src/lib/canvas/evas_clip.c
View File

@ -186,7 +186,7 @@ evas_object_clip_unset(Evas_Object *obj)
}
}
Evas_List *
const Evas_List *
evas_object_clipees_get(Evas_Object *obj)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);

4
legacy/evas/src/lib/canvas/evas_data.c
View File

@ -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 @@ evas_object_data_set(Evas_Object *obj, const char *key, void *data)
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);
}

44
legacy/evas/src/lib/canvas/evas_events.c
View File

@ -80,7 +80,7 @@ evas_event_freeze_get(Evas *e)
}
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 @@ evas_event_feed_mouse_down_data(Evas *e, int b, void *data)
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 @@ evas_event_feed_mouse_down_data(Evas *e, int b, void *data)
}
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 @@ evas_event_feed_mouse_up_data(Evas *e, int b, void *data)
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 @@ evas_event_feed_mouse_up_data(Evas *e, int b, void *data)
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 @@ evas_event_feed_mouse_up_data(Evas *e, int b, void *data)
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 @@ evas_event_feed_mouse_up_data(Evas *e, int b, void *data)
}
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 @@ evas_event_feed_mouse_move_data(Evas *e, int x, int y, void *data)
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 @@ evas_event_feed_mouse_move_data(Evas *e, int x, int y, void *data)
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 @@ evas_event_feed_mouse_move_data(Evas *e, int x, int y, void *data)
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 @@ evas_event_feed_mouse_move_data(Evas *e, int x, int y, void *data)
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 @@ evas_event_feed_mouse_move_data(Evas *e, int x, int y, void *data)
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 @@ evas_event_feed_mouse_move_data(Evas *e, int x, int y, void *data)
}
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 @@ evas_event_feed_mouse_in_data(Evas *e, void *data)
}
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 @@ evas_event_feed_mouse_out_data(Evas *e, void *data)
}
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_feed_key_down_data(Evas *e, char *keyname, void *data)
{
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 @@ evas_event_feed_key_down_data(Evas *e, char *keyname, void *data)
}
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_feed_key_up_data(Evas *e, char *keyname, void *data)
{
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 @@ evas_event_feed_mouse_out(Evas *e)
}
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);
}

30
legacy/evas/src/lib/canvas/evas_key.c
View File

@ -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 @@ evas_key_modifier_number(Evas_Modifier *m, char *keyname)
}
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 @@ evas_key_lock_get(Evas *e)
}
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 @@ evas_key_modifier_is_set_get(Evas_Modifier *m, char *keyname)
}
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 @@ evas_key_lock_is_set_get(Evas_Lock *l, char *keyname)
}
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 @@ evas_key_modifier_add(Evas *e, char *keyname)
}
void
evas_key_modifier_del(Evas *e, char *keyname)
evas_key_modifier_del(Evas *e, const char *keyname)
{
int i;
@ -122,7 +122,7 @@ evas_key_modifier_del(Evas *e, char *keyname)
}
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 @@ evas_key_lock_add(Evas *e, char *keyname)
}
void
evas_key_lock_del(Evas *e, char *keyname)
evas_key_lock_del(Evas *e, const char *keyname)
{
int i;
@ -163,7 +163,7 @@ evas_key_lock_del(Evas *e, char *keyname)
}
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 @@ evas_key_modifier_on(Evas *e, char *keyname)
}
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 @@ evas_key_modifier_off(Evas *e, char *keyname)
}
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 @@ evas_key_lock_on(Evas *e, char *keyname)
}
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 @@ evas_key_lock_off(Evas *e, char *keyname)
/* 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;

16
legacy/evas/src/lib/canvas/evas_key_grab.c
View File

@ -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 @@ evas_key_grab_new(Evas_Object *obj, char *keyname, Evas_Modifier_Mask modifiers,
}
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 @@ evas_key_grab_free(Evas_Object *obj, char *keyname, Evas_Modifier_Mask modifiers
}
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 @@ evas_object_grabs_cleanup(Evas_Object *obj)
/* 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 @@ evas_object_key_grab(Evas_Object *obj, char *keyname, Evas_Modifier_Mask modifie
}
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;

2
legacy/evas/src/lib/canvas/evas_name.c
View File

@ -21,7 +21,7 @@ evas_object_name_set(Evas_Object *obj, const char *name)
}
}
char *
const char *
evas_object_name_get(Evas_Object *obj)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);

2
legacy/evas/src/lib/canvas/evas_object_image.c
View File

@ -91,7 +91,7 @@ evas_object_image_add(Evas *e)
}
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;

36
legacy/evas/src/lib/canvas/evas_object_intercept.c
View File

@ -190,7 +190,7 @@ evas_object_intercept_call_layer_set(Evas_Object *obj, int l)
/* 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_show_callback_add(Evas_Object *obj, void (*func) (void *da
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 @@ evas_object_intercept_show_callback_del(Evas_Object *obj, void (*func) (void *da
}
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_hide_callback_add(Evas_Object *obj, void (*func) (void *da
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 @@ evas_object_intercept_hide_callback_del(Evas_Object *obj, void (*func) (void *da
}
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_move_callback_add(Evas_Object *obj, void (*func) (void *da
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 @@ evas_object_intercept_move_callback_del(Evas_Object *obj, void (*func) (void *da
}
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_resize_callback_add(Evas_Object *obj, void (*func) (void *
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 @@ evas_object_intercept_resize_callback_del(Evas_Object *obj, void (*func) (void *
}
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_raise_callback_add(Evas_Object *obj, void (*func) (void *d
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 @@ evas_object_intercept_raise_callback_del(Evas_Object *obj, void (*func) (void *d
}
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_lower_callback_add(Evas_Object *obj, void (*func) (void *d
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 @@ evas_object_intercept_lower_callback_del(Evas_Object *obj, void (*func) (void *d
}
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_stack_above_callback_add(Evas_Object *obj, void (*func) (v
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 @@ evas_object_intercept_stack_above_callback_del(Evas_Object *obj, void (*func) (v
}
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_stack_below_callback_add(Evas_Object *obj, void (*func) (v
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 @@ evas_object_intercept_stack_below_callback_del(Evas_Object *obj, void (*func) (v
}
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_layer_set_callback_add(Evas_Object *obj, void (*func) (voi
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 *

8
legacy/evas/src/lib/canvas/evas_object_smart.c
View File

@ -153,7 +153,7 @@ evas_object_smart_add(Evas *e, Evas_Smart *s)
}
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 @@ evas_object_smart_callback_add(Evas_Object *obj, char *event, void (*func) (void
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 @@ evas_object_smart_callback_del(Evas_Object *obj, char *event, void (*func) (void
}
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;

22
legacy/evas/src/lib/canvas/evas_object_text.c
View File

@ -72,7 +72,7 @@ evas_object_text_add(Evas *e)
}
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 @@ evas_object_text_font_set(Evas_Object *obj, char *font, double size)
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 @@ evas_object_text_font_set(Evas_Object *obj, char *font, double size)
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 @@ evas_object_text_font_set(Evas_Object *obj, char *font, double size)
}
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 @@ evas_object_text_font_get(Evas_Object *obj, char **font, double *size)
}
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_text_text_set(Evas_Object *obj, char *text)
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 @@ evas_object_font_path_clear(Evas *e)
}
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 @@ evas_object_font_path_append(Evas *e, char *path)
}
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 @@ evas_object_font_path_prepend(Evas *e, char *path)
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);

43
legacy/evas/src/lib/canvas/evas_smart.c
View File

@ -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 @@ evas_smart_new(char *name,
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;
}

10
legacy/evas/src/lib/data/evas_hash.c
View File

@ -61,7 +61,7 @@ evas_hash_gen(const char *key)
* @endcode
*/
Evas_Hash *
evas_hash_add(Evas_Hash *hash, const char *key, void *data)
evas_hash_add(Evas_Hash *hash, const char *key, const void *data)
{
int hash_num;
Evas_Hash_El *el;
@ -102,7 +102,7 @@ evas_hash_add(Evas_Hash *hash, const char *key, void *data)
el->key = NULL;
hash_num = 0;
}
el->data = data;
el->data = (void *)data;
hash->buckets[hash_num] = evas_object_list_prepend(hash->buckets[hash_num], el);
if (evas_list_alloc_error())
{
@ -147,7 +147,7 @@ evas_hash_add(Evas_Hash *hash, const char *key, void *data)
* @endcode
*/
Evas_Hash *
evas_hash_del(Evas_Hash *hash, const char *key, void *data)
evas_hash_del(Evas_Hash *hash, const char *key, const void *data)
{
int hash_num;
Evas_Hash_El *el;
@ -325,7 +325,7 @@ evas_hash_free(Evas_Hash *hash)
* @endcode
*/
void
evas_hash_foreach(Evas_Hash *hash, int (*func) (Evas_Hash *hash, const char *key, void *data, void *fdata), void *fdata)
evas_hash_foreach(Evas_Hash *hash, int (*func) (Evas_Hash *hash, const char *key, void *data, void *fdata), const void *fdata)
{
int i, size;
@ -341,7 +341,7 @@ evas_hash_foreach(Evas_Hash *hash, int (*func) (Evas_Hash *hash, const char *key
next_l = l->next;
el = (Evas_Hash_El *)l;
if (!func(hash, el->key, el->data, fdata)) return;
if (!func(hash, el->key, el->data, (void *)fdata)) return;
l = next_l;
}
}

24
legacy/evas/src/lib/data/evas_list.c
View File

@ -32,7 +32,7 @@ static int _evas_list_alloc_error = 0;
* @endcode
*/
Evas_List *
evas_list_append(Evas_List *list, void *data)
evas_list_append(Evas_List *list, const void *data)
{
Evas_List *l, *new_l;
@ -45,7 +45,7 @@ evas_list_append(Evas_List *list, void *data)
}
new_l->next = NULL;
new_l->prev = NULL;
new_l->data = data;
new_l->data = (void *)data;
if (!list)
{
new_l->last = new_l;
@ -106,7 +106,7 @@ evas_list_append(Evas_List *list, void *data)
* @endcode
*/
Evas_List *
evas_list_prepend(Evas_List *list, void *data)
evas_list_prepend(Evas_List *list, const void *data)
{
Evas_List *new_l;
@ -118,7 +118,7 @@ evas_list_prepend(Evas_List *list, void *data)
return list;
}
new_l->prev = NULL;
new_l->data = data;
new_l->data = (void *)data;
if (!list)
{
new_l->next = NULL;
@ -176,7 +176,7 @@ evas_list_prepend(Evas_List *list, void *data)
* @endcode
*/
Evas_List *
evas_list_append_relative(Evas_List *list, void *data, void *relative)
evas_list_append_relative(Evas_List *list, const void *data, const void *relative)
{
Evas_List *l;
@ -193,7 +193,7 @@ evas_list_append_relative(Evas_List *list, void *data, void *relative)
_evas_list_alloc_error = 1;
return list;
}
new_l->data = data;
new_l->data = (void *)data;
if (l->next)
{
new_l->next = l->next;
@ -254,7 +254,7 @@ evas_list_append_relative(Evas_List *list, void *data, void *relative)
* @endcode
*/
Evas_List *
evas_list_prepend_relative(Evas_List *list, void *data, void *relative)
evas_list_prepend_relative(Evas_List *list, const void *data, const void *relative)
{
Evas_List *l;
@ -271,7 +271,7 @@ evas_list_prepend_relative(Evas_List *list, void *data, void *relative)
_evas_list_alloc_error = 1;
return list;
}
new_l->data = data;
new_l->data = (void *)data;
new_l->prev = l->prev;
new_l->next = l;
if (l->prev) l->prev->next = new_l;
@ -315,7 +315,7 @@ evas_list_prepend_relative(Evas_List *list, void *data, void *relative)
* @endcode
*/
Evas_List *
evas_list_remove(Evas_List *list, void *data)
evas_list_remove(Evas_List *list, const void *data)
{
Evas_List *l;
@ -399,13 +399,13 @@ evas_list_remove_list(Evas_List *list, Evas_List *remove_list)
* @endcode
*/
void *
evas_list_find(Evas_List *list, void *data)
evas_list_find(Evas_List *list, const void *data)
{
Evas_List *l;
for (l = list; l; l = l->next)
{
if (l->data == data) return data;
if (l->data == data) return (void *)data;
}
return NULL;
}
@ -435,7 +435,7 @@ evas_list_find(Evas_List *list, void *data)
* @endcode
*/
Evas_List *
evas_list_find_list(Evas_List *list, void *data)
evas_list_find_list(Evas_List *list, const void *data)
{
Evas_List *l;

3
legacy/evas/src/lib/engines/common/evas_image_main.c
View File

@ -1,4 +1,5 @@
#include "evas_common.h"
#include "evas_private.h"
static Evas_Hash * images = NULL;
static Evas_Object_List * cache = NULL;
@ -307,7 +308,7 @@ evas_common_image_find(const char *filename, const char *key, DATA64 timestamp)
char buf[256];
if ((!filename) && (!key)) return NULL;
real_filename = evas_file_path_resolve(filename);
real_filename = evas_file_path_resolve((char *)filename);
l1 = 0;
if (real_filename) l1 = strlen(real_filename);
else if (filename) l1 = strlen(filename);

20
legacy/evas/src/lib/include/evas_common.h
View File

@ -526,14 +526,14 @@ x++;
extern "C" {
#endif
Evas_List *evas_list_append (Evas_List *list, void *data);
Evas_List *evas_list_prepend (Evas_List *list, void *data);
Evas_List *evas_list_append_relative (Evas_List *list, void *data, void *relative);
Evas_List *evas_list_prepend_relative (Evas_List *list, void *data, void *relative);
Evas_List *evas_list_remove (Evas_List *list, void *data);
Evas_List *evas_list_append (Evas_List *list, const void *data);
Evas_List *evas_list_prepend (Evas_List *list, const void *data);
Evas_List *evas_list_append_relative (Evas_List *list, const void *data, const void *relative);
Evas_List *evas_list_prepend_relative (Evas_List *list, const void *data, const void *relative);
Evas_List *evas_list_remove (Evas_List *list, const void *data);
Evas_List *evas_list_remove_list (Evas_List *list, Evas_List *remove_list);
void *evas_list_find (Evas_List *list, void *data);
Evas_List *evas_list_find_list (Evas_List *list, void *data);
void *evas_list_find (Evas_List *list, const void *data);
Evas_List *evas_list_find_list (Evas_List *list, const void *data);
Evas_List *evas_list_free (Evas_List *list);
Evas_List *evas_list_last (Evas_List *list);
Evas_List *evas_list_next (Evas_List *list);
@ -545,12 +545,12 @@ Evas_List *evas_list_nth_list (Evas_List *list, int n);
Evas_List *evas_list_reverse (Evas_List *list);
int evas_list_alloc_error (void);
Evas_Hash *evas_hash_add (Evas_Hash *hash, const char *key, void *data);
Evas_Hash *evas_hash_del (Evas_Hash *hash, const char *key, void *data);
Evas_Hash *evas_hash_add (Evas_Hash *hash, const char *key, const void *data);
Evas_Hash *evas_hash_del (Evas_Hash *hash, const char *key, const void *data);
void *evas_hash_find (Evas_Hash *hash, const char *key);
int evas_hash_size (Evas_Hash *hash);
void evas_hash_free (Evas_Hash *hash);
void evas_hash_foreach (Evas_Hash *hash, int (*func) (Evas_Hash *hash, const char *key, void *data, void *fdata), void *fdata);
void evas_hash_foreach (Evas_Hash *hash, int (*func) (Evas_Hash *hash, const char *key, void *data, void *fdata), const void *fdata);
int evas_hash_alloc_error (void);
void *evas_object_list_append (void *in_list, void *in_item);