From 4dbd25097ba02b9697599d595e3b2d67d786e23d Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Wed, 13 Feb 2008 04:51:01 +0000 Subject: [PATCH] More const added. SVN revision: 33738 --- src/bin/e_config.c | 12 ++++++------ src/bin/e_config.h | 12 ++++++------ src/bin/e_gadcon.h | 2 +- src/bin/e_int_gadcon_config.c | 10 +++++----- src/bin/e_msgbus.c | 2 +- src/modules/conf_profiles/e_int_config_profiles.c | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 3b3e7e62e..bdb4d5532 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -1697,14 +1697,14 @@ e_config_save_queue(void) NULL); } -EAPI char * +EAPI const char * e_config_profile_get(void) { return _e_config_profile; } EAPI void -e_config_profile_set(char *prof) +e_config_profile_set(const char *prof) { E_FREE(_e_config_profile); _e_config_profile = strdup(prof); @@ -1740,7 +1740,7 @@ e_config_profile_list(void) } EAPI void -e_config_profile_add(char *prof) +e_config_profile_add(const char *prof) { char buf[4096]; const char *homedir; @@ -1751,7 +1751,7 @@ e_config_profile_add(char *prof) } EAPI void -e_config_profile_del(char *prof) +e_config_profile_del(const char *prof) { Ecore_List *files; char buf[4096]; @@ -1809,7 +1809,7 @@ e_config_save_block_get(void) } EAPI void * -e_config_domain_load(char *domain, E_Config_DD *edd) +e_config_domain_load(const char *domain, E_Config_DD *edd) { Eet_File *ef; char buf[4096]; @@ -1864,7 +1864,7 @@ e_config_profile_save(void) } EAPI int -e_config_domain_save(char *domain, E_Config_DD *edd, void *data) +e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data) { Eet_File *ef; char buf[4096], buf2[4096]; diff --git a/src/bin/e_config.h b/src/bin/e_config.h index a4ad744bc..17e302670 100644 --- a/src/bin/e_config.h +++ b/src/bin/e_config.h @@ -426,20 +426,20 @@ EAPI int e_config_save(void); EAPI void e_config_save_flush(void); EAPI void e_config_save_queue(void); -EAPI char *e_config_profile_get(void); -EAPI void e_config_profile_set(char *prof); +EAPI const char *e_config_profile_get(void); +EAPI void e_config_profile_set(const char *prof); EAPI Evas_List *e_config_profile_list(void); -EAPI void e_config_profile_add(char *prof); -EAPI void e_config_profile_del(char *prof); +EAPI void e_config_profile_add(const char *prof); +EAPI void e_config_profile_del(const char *prof); EAPI Evas_List *e_config_engine_list(void); EAPI void e_config_save_block_set(int block); EAPI int e_config_save_block_get(void); -EAPI void *e_config_domain_load(char *domain, E_Config_DD *edd); +EAPI void *e_config_domain_load(const char *domain, E_Config_DD *edd); EAPI int e_config_profile_save(void); -EAPI int e_config_domain_save(char *domain, E_Config_DD *edd, void *data); +EAPI int e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data); EAPI E_Config_Binding_Mouse *e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in); EAPI E_Config_Binding_Key *e_config_binding_key_match(E_Config_Binding_Key *eb_in); diff --git a/src/bin/e_gadcon.h b/src/bin/e_gadcon.h index 14cb49bed..e7b109060 100644 --- a/src/bin/e_gadcon.h +++ b/src/bin/e_gadcon.h @@ -100,7 +100,7 @@ struct _E_Gadcon_Client_Class { int version; /* All members below are part of version 1 */ - char *name; + const char *name; struct { E_Gadcon_Client *(*init) (E_Gadcon *gc, const char *name, const char *id, const char *style); diff --git a/src/bin/e_int_gadcon_config.c b/src/bin/e_int_gadcon_config.c index 50be1f343..314fa4bb7 100644 --- a/src/bin/e_int_gadcon_config.c +++ b/src/bin/e_int_gadcon_config.c @@ -204,14 +204,14 @@ _load_avail_gadgets(void *data) { E_Gadcon_Client_Class *cc; Evas_Object *icon = NULL; - char *lbl = NULL; + const char *lbl = NULL; if (!(cc = l->data)) continue; if (cc->func.label) lbl = cc->func.label(); if (!lbl) lbl = cc->name; if (cc->func.icon) icon = cc->func.icon(evas); e_widget_ilist_append(cfdata->o_avail, icon, lbl, NULL, - cc->name, NULL); + (void *)cc->name, NULL); } e_widget_ilist_go(cfdata->o_avail); e_widget_min_size_get(cfdata->o_avail, &w, NULL); @@ -245,7 +245,7 @@ _load_sel_gadgets(void *data) { E_Gadcon_Client_Class *gcc; Evas_Object *icon = NULL; - char *lbl = NULL; + const char *lbl = NULL; if (!(gcc = l2->data)) continue; if ((cgc->name) && (gcc->name) && @@ -255,7 +255,7 @@ _load_sel_gadgets(void *data) if (!lbl) lbl = gcc->name; if (gcc->func.icon) icon = gcc->func.icon(evas); e_widget_ilist_append(cfdata->o_sel, icon, lbl, NULL, - gcc->name, NULL); + (void *)gcc->name, NULL); } } } @@ -369,7 +369,7 @@ static int _gad_list_sort(void *data1, void *data2) { E_Gadcon_Client_Class *cc, *cc2; - char *lbl1 = NULL, *lbl2 = NULL; + const char *lbl1 = NULL, *lbl2 = NULL; if (!(cc = data1)) return 1; if (!(cc2 = data2)) return -1; diff --git a/src/bin/e_msgbus.c b/src/bin/e_msgbus.c index 5c57a70cd..b48123b20 100644 --- a/src/bin/e_msgbus.c +++ b/src/bin/e_msgbus.c @@ -288,7 +288,7 @@ _e_msgbus_profile_get_cb(E_DBus_Object *obj, DBusMessage *msg) { DBusMessageIter iter; DBusMessage *reply; - char *profile; + const char *profile; profile = e_config_profile_get(); diff --git a/src/modules/conf_profiles/e_int_config_profiles.c b/src/modules/conf_profiles/e_int_config_profiles.c index b054ed8a9..9cfc5286e 100644 --- a/src/modules/conf_profiles/e_int_config_profiles.c +++ b/src/modules/conf_profiles/e_int_config_profiles.c @@ -109,7 +109,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata) { Evas *evas; Evas_List *l; - char *cur_profile; + const char *cur_profile; if (!cfdata) return; if (!cfdata->o_list) return; @@ -148,7 +148,7 @@ static void _ilist_cb_selected(void *data) { E_Config_Dialog_Data *cfdata; - char *cur_profile; + const char *cur_profile; cfdata = data; if (!cfdata) return;