From: sebastid Date: Thu, 17 Aug 2006 16:58:32 +0000 (+0000) Subject: - const X-Git-Tag: submit/efl/20131021.015651~13161 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19bbe60f7e8303d273829b835202bfe33a53a3b6;p=platform%2Fupstream%2Fenlightenment.git - const - remove unused variables - better parameter names SVN revision: 24836 --- diff --git a/src/bin/e_entry_dialog.c b/src/bin/e_entry_dialog.c index 5d2e55e..c574ee4 100644 --- a/src/bin/e_entry_dialog.c +++ b/src/bin/e_entry_dialog.c @@ -11,8 +11,8 @@ EAPI E_Entry_Dialog * e_entry_dialog_show(const char *title, const char *icon, const char *text, const char *initial_text, const char *button_text, const char *button2_text, - void (*func)(char *text, void *data), - void (*func2)(void *data), void *data) + void (*ok_func)(char *text, void *data), + void (*cancel_func)(void *data), void *data) { E_Entry_Dialog *ed; E_Dialog *dia; @@ -20,9 +20,9 @@ e_entry_dialog_show(const char *title, const char *icon, const char *text, int w, h; ed = E_OBJECT_ALLOC(E_Entry_Dialog, E_ENTRY_DIALOG_TYPE, _e_entry_dialog_free); - ed->ok.func = func; + ed->ok.func = ok_func; ed->ok.data = data; - ed->cancel.func = func2; + ed->cancel.func = cancel_func; ed->cancel.data = data; ed->text = strdup(initial_text); diff --git a/src/bin/e_entry_dialog.h b/src/bin/e_entry_dialog.h index cae08b0..f6603d9 100644 --- a/src/bin/e_entry_dialog.h +++ b/src/bin/e_entry_dialog.h @@ -34,8 +34,8 @@ EAPI E_Entry_Dialog *e_entry_dialog_show(const char *title, const char *initial_text, const char *button_text, const char *button2_text, - void (*func) (char *text, void *data), - void (*func2) (void *data), + void (*ok_func) (char *text, void *data), + void (*cancel_func) (void *data), void *data); #endif diff --git a/src/bin/e_int_config_wallpaper_import.c b/src/bin/e_int_config_wallpaper_import.c index edf09f8..6ec5219 100644 --- a/src/bin/e_int_config_wallpaper_import.c +++ b/src/bin/e_int_config_wallpaper_import.c @@ -72,7 +72,7 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent) Evas_Coord w, h; E_Config_Dialog_Data *cfdata; Evas_Modifier_Mask mask; - char *fdev, *fpath; + const char *fdev, *fpath; import = E_NEW(Import, 1); if (!import) return NULL; diff --git a/src/bin/e_spectrum.c b/src/bin/e_spectrum.c index 7820918..961d9b8 100644 --- a/src/bin/e_spectrum.c +++ b/src/bin/e_spectrum.c @@ -100,7 +100,6 @@ static void _e_spectrum_smart_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h) { E_Spectrum *sp; - Evas_Coord x, y; sp = evas_object_smart_data_get(o); if (!sp) return; @@ -151,7 +150,6 @@ _e_spectrum_smart_clip_unset(Evas_Object *o) static void _e_spectrum_smart_init() { - Evas_Smart *smart; if ( _e_spectrum_smart ) return; _e_spectrum_smart = evas_smart_new("e_spectrum", _e_spectrum_smart_add, @@ -204,7 +202,7 @@ _e_spectrum_color_calc(E_Spectrum *sp, float vx, float vy, float vz, int *r, int void _e_spectrum_2d_color_at(E_Spectrum *sp, int x, int y, int *r, int *g, int *b) { - int rr, gg, bb, aa; + int rr, gg, bb; float h, s, v; if (!sp || !sp->cv) return; diff --git a/src/bin/e_thumb_main.c b/src/bin/e_thumb_main.c index fe07af7..1acb632 100644 --- a/src/bin/e_thumb_main.c +++ b/src/bin/e_thumb_main.c @@ -205,7 +205,9 @@ static int _e_cb_timer(void *data) { E_Thumb *eth; + /* Evas_List *del_list = NULL, *l; + */ /* take thumb at head of list */ if (_thumblist) diff --git a/src/bin/e_widget_csel.c b/src/bin/e_widget_csel.c index 3d44b20..112b26f 100644 --- a/src/bin/e_widget_csel.c +++ b/src/bin/e_widget_csel.c @@ -148,7 +148,6 @@ e_widget_csel_add(Evas *evas, E_Color *color) { Evas_Object *obj, *o; Evas_Object *frame, *table; - Evas_Coord mw, mh; E_Color*cv; int i; E_Radio_Group *grp = NULL; diff --git a/src/bin/e_widget_cslider.c b/src/bin/e_widget_cslider.c index 78707b8..94bfeb0 100644 --- a/src/bin/e_widget_cslider.c +++ b/src/bin/e_widget_cslider.c @@ -203,7 +203,6 @@ static void _e_wid_update_standard(E_Widget_Data *wd) { int r, g, b; - float h, s, v; int max, min; float vx; @@ -262,7 +261,6 @@ _e_wid_update_standard(E_Widget_Data *wd) void _e_wid_update_fixed(E_Widget_Data *wd) { - int r, g, b; int max, min; float vx; if (!wd) return; diff --git a/src/bin/e_widget_fsel.c b/src/bin/e_widget_fsel.c index e455a6e..2214ade 100644 --- a/src/bin/e_widget_fsel.c +++ b/src/bin/e_widget_fsel.c @@ -192,7 +192,7 @@ _e_wid_fsel_files_selected(void *data, Evas_Object *obj, void *event_info) /* externally accessible functions */ EAPI Evas_Object * -e_widget_fsel_add(Evas *evas, char *dev, char *path, char *selected, char *filter, +e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, char *filter, void (*sel_func) (void *data, Evas_Object *obj), void *sel_data, void (*chg_func) (void *data, Evas_Object *obj), void *chg_data, int preview) diff --git a/src/bin/e_widget_fsel.h b/src/bin/e_widget_fsel.h index 9f75c8a..bb1ff29 100644 --- a/src/bin/e_widget_fsel.h +++ b/src/bin/e_widget_fsel.h @@ -6,7 +6,7 @@ #ifndef E_WIDGET_FSEL_H #define E_WIDGET_FSEL_H -EAPI Evas_Object *e_widget_fsel_add(Evas *evas, char *dev, char *path, char *selected, char *filter, +EAPI Evas_Object *e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, char *filter, void (*sel_func) (void *data, Evas_Object *obj), void *sel_data, void (*chg_func) (void *data, Evas_Object *obj), void *chg_data, int preview); EAPI const char *e_widget_fsel_selection_path_get(Evas_Object *obj);