diff options
author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-08-11 20:26:37 +0000 |
---|---|---|
committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-08-11 20:26:37 +0000 |
commit | 8bec1a6143f3d8997f5efc7fffb0de4002da7096 (patch) | |
tree | 785be5aa37b943992e641cd4554c9b4846aa8fcf /navit/gui | |
parent | 6767eec3373e6a594cf26df9ac2c51a5564aa08d (diff) | |
download | navit-svn-8bec1a6143f3d8997f5efc7fffb0de4002da7096.tar.gz |
Fix:core:Fix const warnings.|Part of #1154.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5573 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/gui')
-rw-r--r-- | navit/gui/gtk/datawindow.c | 2 | ||||
-rw-r--r-- | navit/gui/gtk/gui_gtk.h | 2 | ||||
-rw-r--r-- | navit/gui/gtk/gui_gtk_statusbar.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/navit/gui/gtk/datawindow.c b/navit/gui/gtk/datawindow.c index 75f43a80..8a132733 100644 --- a/navit/gui/gtk/datawindow.c +++ b/navit/gui/gtk/datawindow.c @@ -182,7 +182,7 @@ static struct datawindow_methods gui_gtk_datawindow_meth = { }; struct datawindow_priv * -gui_gtk_datawindow_new(struct gui_priv *gui, char *name, struct callback *click, struct callback *close, struct datawindow_methods *meth) +gui_gtk_datawindow_new(struct gui_priv *gui, const char *name, struct callback *click, struct callback *close, struct datawindow_methods *meth) { struct datawindow_priv *win; diff --git a/navit/gui/gtk/gui_gtk.h b/navit/gui/gtk/gui_gtk.h index 6168b9ae..10051bea 100644 --- a/navit/gui/gtk/gui_gtk.h +++ b/navit/gui/gtk/gui_gtk.h @@ -56,7 +56,7 @@ void gui_gtk_ui_init(struct gui_priv *this); struct menu_priv *gui_gtk_menubar_new(struct gui_priv *gui, struct menu_methods *meth); struct statusbar_priv *gui_gtk_statusbar_new(struct gui_priv *gui); struct menu_priv *gui_gtk_popup_new(struct gui_priv *gui, struct menu_methods *meth); -struct datawindow_priv *gui_gtk_datawindow_new(struct gui_priv *gui, char *name, struct callback *click, struct callback *close, struct datawindow_methods *meth); +struct datawindow_priv *gui_gtk_datawindow_new(struct gui_priv *gui, const char *name, struct callback *click, struct callback *close, struct datawindow_methods *meth); void gui_gtk_datawindow_destroy(struct datawindow_priv *win); void gui_gtk_datawindow_set_button(struct datawindow_priv *this_, GtkWidget *btn); diff --git a/navit/gui/gtk/gui_gtk_statusbar.c b/navit/gui/gtk/gui_gtk_statusbar.c index 368134a3..0f0dcc0e 100644 --- a/navit/gui/gtk/gui_gtk_statusbar.c +++ b/navit/gui/gtk/gui_gtk_statusbar.c @@ -68,7 +68,7 @@ statusbar_gps_update(struct statusbar_priv *this, int sats, int qual, double lng } #endif -static char *status_fix2str(int type) +static const char *status_fix2str(int type) { switch(type) { case 0: return _("No"); @@ -94,8 +94,8 @@ statusbar_route_update(struct statusbar_priv *this, struct navit *navit, struct double lng, lat, direction=0, height=0, speed=0, hdop=0; int sats=0, qual=0; int status=0; - char *dirs[]={_("N"),_("NE"),_("E"),_("SE"),_("S"),_("SW"),_("W"),_("NW"),_("N")}; - char *dir; + const char *dirs[]={_("N"),_("NE"),_("E"),_("SE"),_("S"),_("SW"),_("W"),_("NW"),_("N")}; + const char *dir; int dir_idx; if (navit) |