Fix:gui_internal:Clean up the code to get rid of compilation time warnings about const qualifier removal.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5494 ffa7fe5e-494d-0410-b361-a75ebd5db220

9 files changed, 29 insertions, 28 deletions

diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c
index 8c8c8f20..d93e4ca7 100644
--- a/navit/gui/internal/gui_internal.c
+++ b/navit/gui/internal/gui_internal.c
@@ -237,7 +237,7 @@ gui_internal_button_attr_pressed(struct gui_priv *this, struct widget *w, void *
 }
 
 struct widget *
-gui_internal_button_navit_attr_new(struct gui_priv *this, char *text, enum flags flags, struct attr *on, struct attr *off)
+gui_internal_button_navit_attr_new(struct gui_priv *this, const char *text, enum flags flags, struct attr *on, struct attr *off)
 {
 	struct graphics_image *image=NULL;
 	struct widget *ret;
@@ -260,7 +260,7 @@ gui_internal_button_navit_attr_new(struct gui_priv *this, char *text, enum flags
 }
 
 struct widget *
-gui_internal_button_map_attr_new(struct gui_priv *this, char *text, enum flags flags, struct map *map, struct attr *on, struct attr *off, int deflt)
+gui_internal_button_map_attr_new(struct gui_priv *this, const char *text, enum flags flags, struct map *map, struct attr *on, struct attr *off, int deflt)
 {
 	struct graphics_image *image=NULL;
 	struct widget *ret;
@@ -625,7 +625,7 @@ gui_internal_cmd_insert_destination_do(struct gui_priv *this, struct widget *wm,
  * @returns nothing
  */
 void
-gui_internal_select_waypoint(struct gui_priv *this, char *title, char *hint, struct widget *wm_, void(*cmd)(struct gui_priv *priv, struct widget *widget, void *data),void *data)
+gui_internal_select_waypoint(struct gui_priv *this, const char *title, const char *hint, struct widget *wm_, void(*cmd)(struct gui_priv *priv, struct widget *widget, void *data),void *data)
 {
 	struct widget *wb,*w,*wtable,*row,*wc;
 	struct map *map;
@@ -1084,7 +1084,7 @@ gui_internal_cmd_delete_waypoint(struct gui_priv *this, struct widget *wm, void
  * TODO define constants for these values
  */
 void
-gui_internal_cmd_position_do(struct gui_priv *this, struct pcoord *pc_in, struct coord_geo *g_in, struct widget *wm, char *name, int flags)
+gui_internal_cmd_position_do(struct gui_priv *this, struct pcoord *pc_in, struct coord_geo *g_in, struct widget *wm, const char *name, int flags)
 {
 	struct widget *wb,*w,*wtable,*row,*wc,*wbc,*wclosest=NULL;
 	struct coord_geo g;
diff --git a/navit/gui/internal/gui_internal.h b/navit/gui/internal/gui_internal.h
index a635d9af..93863c6a 100644
--- a/navit/gui/internal/gui_internal.h
+++ b/navit/gui/internal/gui_internal.h
@@ -57,10 +57,10 @@ struct gui_internal_methods {
 
 struct gui_internal_widget_methods {
 	void (*append)(struct widget *parent, struct widget *child);
-	struct widget * (*button_new)(struct gui_priv *this, char *text, struct graphics_image *image, enum flags flags);
+	struct widget * (*button_new)(struct gui_priv *this, const char *text, struct graphics_image *image, enum flags flags);
 	struct widget * (*button_new_with_callback)(struct gui_priv *this, const char *text, struct graphics_image *image, enum flags flags, void(*func)(struct gui_priv *priv, struct widget *widget, void *data), void *data);
 	struct widget * (*box_new)(struct gui_priv *this, enum flags flags);
-	struct widget * (*label_new)(struct gui_priv *this, char *text);
+	struct widget * (*label_new)(struct gui_priv *this, const char *text);
 	struct widget * (*image_new)(struct gui_priv *this, struct graphics_image *image);
 	struct widget * (*keyboard)(struct gui_priv *this, int mode);
 	struct widget * (*menu)(struct gui_priv *this, const char *label);
diff --git a/navit/gui/internal/gui_internal_command.c b/navit/gui/internal/gui_internal_command.c
index cabbaea9..5b73294b 100644
--- a/navit/gui/internal/gui_internal_command.c
+++ b/navit/gui/internal/gui_internal_command.c
@@ -867,7 +867,7 @@ gui_internal_cmd_menu2(struct gui_priv *this, char *function, struct attr **in,
 static void
 gui_internal_cmd2_position(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
-	char *name=_("Position");
+	const char *name=_("Position");
 	int flags=-1;
 
 	dbg(1,"enter\n");
diff --git a/navit/gui/internal/gui_internal_html.c b/navit/gui/internal/gui_internal_html.c
index 76becc5d..0cb28761 100644
--- a/navit/gui/internal/gui_internal_html.c
+++ b/navit/gui/internal/gui_internal_html.c
@@ -275,7 +275,7 @@ gui_internal_html_start(void *dummy, const char *tag_name, const char **names, c
 				}
 			}
 			if (!strcmp(type,"text") || !strcmp(type,"password")) {
-				char *value=find_attr(names, values, "value");
+				const char *value=find_attr(names, values, "value");
 				html->w=gui_internal_label_new(this, value);
 				html->w->background=this->background;
 			        html->w->flags |= div_flags(names, values);
diff --git a/navit/gui/internal/gui_internal_priv.h b/navit/gui/internal/gui_internal_priv.h
index bbced9e5..eb265dc5 100644
--- a/navit/gui/internal/gui_internal_priv.h
+++ b/navit/gui/internal/gui_internal_priv.h
@@ -198,18 +198,18 @@ struct widget;
 struct graphics_image *image_new_xs(struct gui_priv *this, const char *name);
 struct graphics_image *image_new_s(struct gui_priv *this, const char *name);
 struct graphics_image *image_new_l(struct gui_priv *this, const char *name);
-struct widget *gui_internal_button_navit_attr_new(struct gui_priv *this, char *text, enum flags flags, struct attr *on, struct attr *off);
-struct widget *gui_internal_button_map_attr_new(struct gui_priv *this, char *text, enum flags flags, struct map *map, struct attr *on, struct attr *off, int deflt);
+struct widget *gui_internal_button_navit_attr_new(struct gui_priv *this, const char *text, enum flags flags, struct attr *on, struct attr *off);
+struct widget *gui_internal_button_map_attr_new(struct gui_priv *this, const char *text, enum flags flags, struct map *map, struct attr *on, struct attr *off, int deflt);
 void gui_internal_say(struct gui_priv *this, struct widget *w, int questionmark);
 void gui_internal_back(struct gui_priv *this, struct widget *w, void *data);
 void gui_internal_cmd_return(struct gui_priv *this, struct widget *wm, void *data);
 void gui_internal_cmd_main_menu(struct gui_priv *this, struct widget *wm, void *data);
 struct widget *gui_internal_time_help(struct gui_priv *this);
 void gui_internal_apply_config(struct gui_priv *this);
-void gui_internal_select_waypoint(struct gui_priv *this, char *title, char *hint, struct widget *wm_, void (*cmd)(struct gui_priv *priv, struct widget *widget, void *data), void *data);
+void gui_internal_select_waypoint(struct gui_priv *this, const char *title, const char *hint, struct widget *wm_, void (*cmd)(struct gui_priv *priv, struct widget *widget, void *data), void *data);
 void gui_internal_call_linked_on_finish(struct gui_priv *this, struct widget *wm, void *data);
 char *removecase(char *s);
-void gui_internal_cmd_position_do(struct gui_priv *this, struct pcoord *pc_in, struct coord_geo *g_in, struct widget *wm, char *name, int flags);
+void gui_internal_cmd_position_do(struct gui_priv *this, struct pcoord *pc_in, struct coord_geo *g_in, struct widget *wm, const char *name, int flags);
 void gui_internal_cmd_position(struct gui_priv *this, struct widget *wm, void *data);
 void gui_internal_cmd_bookmarks(struct gui_priv *this, struct widget *wm, void *data);
 void gui_internal_keypress_do(struct gui_priv *this, char *key);
diff --git a/navit/gui/internal/gui_internal_search.c b/navit/gui/internal/gui_internal_search.c
index f08b2890..4a564ad7 100644
--- a/navit/gui/internal/gui_internal_search.c
+++ b/navit/gui/internal/gui_internal_search.c
@@ -479,7 +479,7 @@ gui_internal_search_list_destroy(struct gui_priv *this)
 }
 
 void
-gui_internal_search(struct gui_priv *this, char *what, char *type, int flags)
+gui_internal_search(struct gui_priv *this, const char *what, const char *type, int flags)
 {
 	struct widget *wb,*wk,*w,*wr,*we,*wl,*wnext=NULL;
 	char *country;
diff --git a/navit/gui/internal/gui_internal_search.h b/navit/gui/internal/gui_internal_search.h
index a5624eae..6add2832 100644
--- a/navit/gui/internal/gui_internal_search.h
+++ b/navit/gui/internal/gui_internal_search.h
@@ -3,7 +3,7 @@ struct gui_priv;
 struct widget;
 void gui_internal_search_idle_end(struct gui_priv *this);
 void gui_internal_search_list_destroy(struct gui_priv *this);
-void gui_internal_search(struct gui_priv *this, char *what, char *type, int flags);
+void gui_internal_search(struct gui_priv *this, const char *what, const char *type, int flags);
 void gui_internal_search_house_number_in_street(struct gui_priv *this, struct widget *widget, void *data);
 void gui_internal_search_street_in_town(struct gui_priv *this, struct widget *widget, void *data);
 void gui_internal_search_town_in_country(struct gui_priv *this, struct widget *widget);
diff --git a/navit/gui/internal/gui_internal_widget.c b/navit/gui/internal/gui_internal_widget.c
index ec4f5d26..9a0afbc8 100644
--- a/navit/gui/internal/gui_internal_widget.c
+++ b/navit/gui/internal/gui_internal_widget.c
@@ -25,7 +25,7 @@ gui_internal_background_render(struct gui_priv *this, struct widget *w)
 }
 
 struct widget *
-gui_internal_label_font_new(struct gui_priv *this, char *text, int font)
+gui_internal_label_font_new(struct gui_priv *this, const char *text, int font)
 {
 	struct point p[4];
 	int w=0;
@@ -36,7 +36,7 @@ gui_internal_label_font_new(struct gui_priv *this, char *text, int font)
 	widget->font_idx=font;
 	if (text) {
 		widget->text=g_strdup(text);
-		graphics_get_text_bbox(this->gra, this->fonts[font], text, 0x10000, 0x0, p, 0);
+		graphics_get_text_bbox(this->gra, this->fonts[font], widget->text, 0x10000, 0x0, p, 0);
 		w=p[2].x-p[0].x;
 		h=p[0].y-p[2].y;
 	}
@@ -52,16 +52,17 @@ gui_internal_label_font_new(struct gui_priv *this, char *text, int font)
 }
 	
 struct widget *
-gui_internal_label_new(struct gui_priv *this, char *text)
+gui_internal_label_new(struct gui_priv *this, const char *text)
 {
 	return gui_internal_label_font_new(this, text, 0);
 }
 
 struct widget *
-gui_internal_label_new_abbrev(struct gui_priv *this, char *text, int maxwidth)
+gui_internal_label_new_abbrev(struct gui_priv *this, const char *text, int maxwidth)
 {
 	struct widget *ret=NULL;
-	char *tmp=g_malloc(strlen(text)+3), *p;
+	char *tmp=g_malloc(strlen(text)+3);
+	const char *p;
 	p=text+strlen(text);
 	while ((p=g_utf8_find_prev_char(text, p)) >= text) {
 		int i=p-text;
@@ -156,7 +157,7 @@ gui_internal_text_font_new(struct gui_priv *this, const char *text, int font, en
 }
 
 struct widget *
-gui_internal_text_new(struct gui_priv *this, char *text, enum flags flags)
+gui_internal_text_new(struct gui_priv *this, const char *text, enum flags flags)
 {
 	return gui_internal_text_font_new(this, text, 0, flags);
 }
@@ -190,7 +191,7 @@ gui_internal_button_new_with_callback(struct gui_priv *this, const char *text, s
 }
 
 struct widget *
-gui_internal_button_new(struct gui_priv *this, char *text, struct graphics_image *image, enum flags flags)
+gui_internal_button_new(struct gui_priv *this, const char *text, struct graphics_image *image, enum flags flags)
 {
 	return gui_internal_button_new_with_callback(this, text, image, flags, NULL, NULL);
 }
@@ -726,7 +727,7 @@ gui_internal_widget_pack(struct gui_priv *this, struct widget *w)
 }
 
 struct widget *
-gui_internal_button_label(struct gui_priv *this, char *label, int mode)
+gui_internal_button_label(struct gui_priv *this, const char *label, int mode)
 {
 	struct widget *wl,*wlb;
 	struct widget *wb=gui_internal_menu_data(this)->button_bar;
diff --git a/navit/gui/internal/gui_internal_widget.h b/navit/gui/internal/gui_internal_widget.h
index dfa948d0..fb4293b1 100644
--- a/navit/gui/internal/gui_internal_widget.h
+++ b/navit/gui/internal/gui_internal_widget.h
@@ -151,15 +151,15 @@ struct gui_priv;
 struct point;
 struct table_data;
 struct widget;
-struct widget *gui_internal_label_font_new(struct gui_priv *this, char *text, int font);
-struct widget *gui_internal_label_new(struct gui_priv *this, char *text);
-struct widget *gui_internal_label_new_abbrev(struct gui_priv *this, char *text, int maxwidth);
+struct widget *gui_internal_label_font_new(struct gui_priv *this, const char *text, int font);
+struct widget *gui_internal_label_new(struct gui_priv *this, const char *text);
+struct widget *gui_internal_label_new_abbrev(struct gui_priv *this, const char *text, int maxwidth);
 struct widget *gui_internal_image_new(struct gui_priv *this, struct graphics_image *image);
 struct widget *gui_internal_text_font_new(struct gui_priv *this, const char *text, int font, enum flags flags);
-struct widget *gui_internal_text_new(struct gui_priv *this, char *text, enum flags flags);
+struct widget *gui_internal_text_new(struct gui_priv *this, const char *text, enum flags flags);
 struct widget *gui_internal_button_font_new_with_callback(struct gui_priv *this, const char *text, int font, struct graphics_image *image, enum flags flags, void (*func)(struct gui_priv *priv, struct widget *widget, void *data), void *data);
 struct widget *gui_internal_button_new_with_callback(struct gui_priv *this, const char *text, struct graphics_image *image, enum flags flags, void (*func)(struct gui_priv *priv, struct widget *widget, void *data), void *data);
-struct widget *gui_internal_button_new(struct gui_priv *this, char *text, struct graphics_image *image, enum flags flags);
+struct widget *gui_internal_button_new(struct gui_priv *this, const char *text, struct graphics_image *image, enum flags flags);
 struct widget *gui_internal_find_widget(struct widget *wi, struct point *p, int flags);
 void gui_internal_highlight_do(struct gui_priv *this, struct widget *found);
 void gui_internal_highlight(struct gui_priv *this);
@@ -173,7 +173,7 @@ void gui_internal_widget_children_destroy(struct gui_priv *this, struct widget *
 void gui_internal_widget_destroy(struct gui_priv *this, struct widget *w);
 void gui_internal_widget_render(struct gui_priv *this, struct widget *w);
 void gui_internal_widget_pack(struct gui_priv *this, struct widget *w);
-struct widget *gui_internal_button_label(struct gui_priv *this, char *label, int mode);
+struct widget *gui_internal_button_label(struct gui_priv *this, const char *label, int mode);
 struct widget *gui_internal_widget_table_new(struct gui_priv *this, enum flags flags, int buttons);
 void gui_internal_widget_table_clear(struct gui_priv *this, struct widget *table);
 GList *gui_internal_widget_table_next_row(GList *row);