From 86136c4a5346c5177c985b064cbeeb40edf0e0c3 Mon Sep 17 00:00:00 2001 From: akashihi Date: Fri, 3 Sep 2010 11:47:22 +0000 Subject: [PATCH] Fix:core:Made route.h vehicle.h C++ friendly git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3555 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/route.h | 28 ++++++++++++++-------------- navit/navit/vehicle.h | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/navit/navit/route.h b/navit/navit/route.h index 0781339..c8ff022 100644 --- a/navit/navit/route.h +++ b/navit/navit/route.h @@ -82,21 +82,21 @@ struct street_data; struct tracking; struct vehicleprofile; struct route *route_new(struct attr *parent, struct attr **attrs); -void route_set_mapset(struct route *this, struct mapset *ms); -void route_set_profile(struct route *this, struct vehicleprofile *prof); -struct mapset *route_get_mapset(struct route *this); -struct route_info *route_get_pos(struct route *this); -struct route_info *route_get_dst(struct route *this); -int route_get_path_set(struct route *this); -int route_contains(struct route *this, struct item *item); -int route_destination_reached(struct route *this); -void route_set_position(struct route *this, struct pcoord *pos); -void route_set_position_from_tracking(struct route *this, struct tracking *tracking, enum projection pro); +void route_set_mapset(struct route *this_, struct mapset *ms); +void route_set_profile(struct route *this_, struct vehicleprofile *prof); +struct mapset *route_get_mapset(struct route *this_); +struct route_info *route_get_pos(struct route *this_); +struct route_info *route_get_dst(struct route *this_); +int route_get_path_set(struct route *this_); +int route_contains(struct route *this_, struct item *item); +int route_destination_reached(struct route *this_); +void route_set_position(struct route *this_, struct pcoord *pos); +void route_set_position_from_tracking(struct route *this_, struct tracking *tracking, enum projection pro); struct map_selection *route_rect(int order, struct coord *c1, struct coord *c2, int rel, int abs); -void route_set_destinations(struct route *this, struct pcoord *dst, int count, int async); -int route_get_destinations(struct route *this, struct pcoord *pc, int count); -void route_set_destination(struct route *this, struct pcoord *dst, int async); -void route_remove_waypoint(struct route *this); +void route_set_destinations(struct route *this_, struct pcoord *dst, int count, int async); +int route_get_destinations(struct route *this_, struct pcoord *pc, int count); +void route_set_destination(struct route *this_, struct pcoord *dst, int async); +void route_remove_waypoint(struct route *this_); struct coord route_get_coord_dist(struct route *this_, int dist); struct street_data *street_get_data(struct item *item); struct street_data *street_data_dup(struct street_data *orig); diff --git a/navit/navit/vehicle.h b/navit/navit/vehicle.h index 7caf057..3c1dcda 100644 --- a/navit/navit/vehicle.h +++ b/navit/navit/vehicle.h @@ -51,7 +51,7 @@ int vehicle_add_attr(struct vehicle *this_, struct attr *attr); int vehicle_remove_attr(struct vehicle *this_, struct attr *attr); void vehicle_set_cursor(struct vehicle *this_, struct cursor *cursor); void vehicle_draw(struct vehicle *this_, struct graphics *gra, struct point *pnt, int lazy, int angle, int speed); -int vehicle_get_cursor_data(struct vehicle *this, struct point *pnt, int *angle, int *speed); +int vehicle_get_cursor_data(struct vehicle *this_, struct point *pnt, int *angle, int *speed); void vehicle_log_gpx_add_tag(char *tag, char **logstr); /* end of prototypes */ -- 2.7.4