From: <ho...@us...> - 2009-04-28 09:02:28
|
Revision: 2241 http://navit.svn.sourceforge.net/navit/?rev=2241&view=rev Author: horwitz Date: 2009-04-28 09:02:13 +0000 (Tue, 28 Apr 2009) Log Message: ----------- Fix:Misc:Fix some more warnings Modified Paths: -------------- trunk/navit/navit/binding/dbus/binding_dbus.c trunk/navit/navit/event.c trunk/navit/navit/event.h trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp trunk/navit/navit/osd/core/osd_core.c trunk/navit/navit/osd.h Modified: trunk/navit/navit/binding/dbus/binding_dbus.c =================================================================== --- trunk/navit/navit/binding/dbus/binding_dbus.c 2009-04-28 06:54:45 UTC (rev 2240) +++ trunk/navit/navit/binding/dbus/binding_dbus.c 2009-04-28 09:02:13 UTC (rev 2241) @@ -693,7 +693,7 @@ char *result; struct attr attr; DBusMessage *reply; - int error; + int *error; navit = object_get_from_message(message, "navit"); if (! navit) @@ -706,7 +706,7 @@ result=command_evaluate_to_string(&attr, command, &error); reply = dbus_message_new_method_return(message); if (error) - dbus_message_append_args(reply, DBUS_TYPE_INT32, &error, DBUS_TYPE_INVALID); + dbus_message_append_args(reply, DBUS_TYPE_INT32, error, DBUS_TYPE_INVALID); else dbus_message_append_args(reply, DBUS_TYPE_STRING, &result, DBUS_TYPE_INVALID); dbus_connection_send (connection, reply, NULL); Modified: trunk/navit/navit/event.c =================================================================== --- trunk/navit/navit/event.c 2009-04-28 06:54:45 UTC (rev 2240) +++ trunk/navit/navit/event.c 2009-04-28 09:02:13 UTC (rev 2241) @@ -24,8 +24,8 @@ #include "debug.h" static struct event_methods event_methods; -static char *e_requestor; -static char *e_system; +static const char *e_requestor; +static const char *e_system; void event_main_loop_run(void) { @@ -85,7 +85,7 @@ } int -event_request_system(char *system, char *requestor) +event_request_system(const char *system, const char *requestor) { void (*event_type_new)(struct event_methods *meth); if (e_system) { Modified: trunk/navit/navit/event.h =================================================================== --- trunk/navit/navit/event.h 2009-04-28 06:54:45 UTC (rev 2240) +++ trunk/navit/navit/event.h 2009-04-28 09:02:13 UTC (rev 2241) @@ -56,7 +56,7 @@ void event_remove_timeout(struct event_timeout *ev); struct event_idle *event_add_idle(int priority, struct callback *cb); void event_remove_idle(struct event_idle *ev); -int event_request_system(char *system, char *requestor); +int event_request_system(const char *system, const char *requestor); void event_call_callback(struct callback_list *cb); /* end of prototypes */ #ifdef __cplusplus Modified: trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c =================================================================== --- trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2009-04-28 06:54:45 UTC (rev 2240) +++ trunk/navit/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c 2009-04-28 09:02:13 UTC (rev 2241) @@ -33,6 +33,7 @@ #ifndef _WIN32 #include <gdk/gdkx.h> #endif +#include "event.h" #include "debug.h" #include "point.h" #include "graphics.h" @@ -160,7 +161,7 @@ } static void -gc_set_stipple(struct graphics_gc_priv *gc, struct graphics_image *img) +gc_set_stipple(struct graphics_gc_priv *gc, struct graphics_image_priv *img) { char data[2]={0x2,0x1}; gdk_gc_set_fill(gc->gc, GDK_STIPPLED); @@ -187,8 +188,6 @@ return gc; } - - static struct graphics_image_priv * image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *name, int *w, int *h, struct point *hot, int rotation) { Modified: trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp =================================================================== --- trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp 2009-04-28 06:54:45 UTC (rev 2240) +++ trunk/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp 2009-04-28 09:02:13 UTC (rev 2241) @@ -197,7 +197,7 @@ struct graphics_priv *overlay=NULL; if (! gr->overlay_disable) overlay=gr->overlays; - if (gr->p.x || gr->p.y && gr->background_gc) { + if ((gr->p.x || gr->p.y) && gr->background_gc) { painter.setPen(*gr->background_gc->pen); painter.fillRect(0, 0, gr->widget->pixmap->width(), gr->widget->pixmap->height(), *gr->background_gc->brush); } Modified: trunk/navit/navit/osd/core/osd_core.c =================================================================== --- trunk/navit/navit/osd/core/osd_core.c 2009-04-28 06:54:45 UTC (rev 2240) +++ trunk/navit/navit/osd/core/osd_core.c 2009-04-28 09:02:13 UTC (rev 2241) @@ -224,7 +224,7 @@ this->osd_item.h = 80; this->osd_item.navit = nav; this->osd_item.font_size = 200; - this->osd_item.meth.draw = &osd_compass_draw; + this->osd_item.meth.draw = osd_draw_cast(osd_compass_draw); osd_set_std_attr(attrs, &this->osd_item, 2); navit_add_callback(nav, callback_new_attr_1(callback_cast(osd_compass_init), attr_navit, this)); return (struct osd_priv *) this; @@ -288,7 +288,7 @@ struct attr *attr; this->item.navit = nav; - this->item.meth.draw = &osd_button_draw; + this->item.meth.draw = osd_draw_cast(osd_button_draw); osd_set_std_attr(attrs, &this->item, 1); @@ -432,7 +432,7 @@ this->osd_item.navit = nav; this->osd_item.h = 70; this->osd_item.font_size = 200; - this->osd_item.meth.draw = &osd_nav_next_turn_draw; + this->osd_item.meth.draw = osd_draw_cast(osd_nav_next_turn_draw); osd_set_std_attr(attrs, &this->osd_item, 0); this->icon_w = -1; @@ -555,7 +555,7 @@ this->item.p.x = -64; this->item.navit = nav; this->item.p.y = 76; - this->item.meth.draw = &osd_nav_toggle_announcer_draw; + this->item.meth.draw = osd_draw_cast(osd_nav_toggle_announcer_draw); osd_set_std_attr(attrs, &this->item, 0); @@ -633,7 +633,7 @@ this->item.navit = nav; this->item.h=60; this->active=-1; - this->item.meth.draw = &osd_speed_warner_draw; + this->item.meth.draw = osd_draw_cast(osd_speed_warner_draw); osd_set_std_attr(attrs, &this->item, 2); this->d=this->item.w; if (this->item.h < this->d) @@ -994,7 +994,7 @@ this->osd_item.h = 20; this->osd_item.navit = nav; this->osd_item.font_size = 200; - this->osd_item.meth.draw = &osd_text_draw; + this->osd_item.meth.draw = osd_draw_cast(osd_text_draw); osd_set_std_attr(attrs, &this->osd_item, 2); this->active = -1; @@ -1099,7 +1099,7 @@ this->osd_item.navit = nav; this->osd_item.h = 40; this->osd_item.font_size = 200; - this->osd_item.meth.draw = &osd_gps_status_draw; + this->osd_item.meth.draw = osd_draw_cast(osd_gps_status_draw); osd_set_std_attr(attrs, &this->osd_item, 0); this->icon_w = -1; @@ -1202,7 +1202,7 @@ this->osd_item.navit = nav; this->osd_item.h = 40; this->osd_item.font_size = 200; - this->osd_item.meth.draw = &osd_volume_draw; + this->osd_item.meth.draw = osd_draw_cast(osd_volume_draw); osd_set_std_attr(attrs, &this->osd_item, 0); this->icon_w = -1; Modified: trunk/navit/navit/osd.h =================================================================== --- trunk/navit/navit/osd.h 2009-04-28 06:54:45 UTC (rev 2240) +++ trunk/navit/navit/osd.h 2009-04-28 09:02:13 UTC (rev 2241) @@ -26,6 +26,8 @@ void (*osd_destroy)(struct osd_priv *osd); }; +#define osd_draw_cast(x) (void (*)(struct osd_priv *osd, struct navit *navit, struct vehicle *v))(x) + struct osd_item_methods { void (*draw)(struct osd_priv *osd, struct navit *navit, struct vehicle *v); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |