fly/flightgear
1
0
Fork 0
Code Activity

Remove remaining includes of simgear/waypoint

Browse source
This commit is contained in:
James Turner 2012-05-11 23:49:12 +01:00
parent acd8fa25e6
commit b0384d035f
14 changed files with 1 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/AIModel/AIAircraft.cxx
View file

@ -22,7 +22,6 @@
# include <config.h> # include <config.h>
#endif #endif
#include <simgear/route/waypoint.hxx>
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include <Viewer/viewer.hxx> #include <Viewer/viewer.hxx>

1
src/AIModel/AIFlightPlan.cxx
View file

@ -24,7 +24,6 @@
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/route/waypoint.hxx>
#include <simgear/math/sg_geodesy.hxx> #include <simgear/math/sg_geodesy.hxx>
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>
#include <simgear/constants.h> #include <simgear/constants.h>

1
src/AIModel/AIFlightPlanCreateCruise.cxx
View file

@ -25,7 +25,6 @@
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <simgear/route/waypoint.hxx>
#include <Airports/simple.hxx> #include <Airports/simple.hxx>
#include <Airports/runways.hxx> #include <Airports/runways.hxx>

1
src/Airports/dynamics.cxx
View file

@ -32,7 +32,6 @@
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/structure/subsystem_mgr.hxx> #include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/route/waypoint.hxx>
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <Airports/runways.hxx> #include <Airports/runways.hxx>

1
src/Airports/groundnetwork.cxx
View file

@ -35,7 +35,6 @@
#include <osg/Shape> #include <osg/Shape>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/route/waypoint.hxx>
#include <simgear/scene/material/EffectGeode.hxx> #include <simgear/scene/material/EffectGeode.hxx>
#include <simgear/scene/material/matlib.hxx> #include <simgear/scene/material/matlib.hxx>
#include <simgear/scene/material/mat.hxx> #include <simgear/scene/material/mat.hxx>

1
src/Airports/groundnetwork.hxx
View file

@ -31,7 +31,6 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/route/waypoint.hxx>
#include <string> #include <string>
#include <vector> #include <vector>

1
src/Autopilot/route_mgr.hxx
View file

@ -25,7 +25,6 @@
#define _ROUTE_MGR_HXX 1 #define _ROUTE_MGR_HXX 1
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/route/waypoint.hxx>
#include <simgear/structure/subsystem_mgr.hxx> #include <simgear/structure/subsystem_mgr.hxx>
#include <Navaids/route.hxx> #include <Navaids/route.hxx>

2
src/GUI/MapWidget.cxx
View file

@ -8,8 +8,6 @@
#include <algorithm> // for std::sort #include <algorithm> // for std::sort
#include <plib/puAux.h> #include <plib/puAux.h>
#include <simgear/sg_inlines.h>
#include <simgear/route/waypoint.hxx>
#include <simgear/sg_inlines.h> #include <simgear/sg_inlines.h>
#include <simgear/misc/strutils.hxx> #include <simgear/misc/strutils.hxx>
#include <simgear/magvar/magvar.hxx> #include <simgear/magvar/magvar.hxx>

1
src/GUI/WaypointList.cxx
View file

@ -11,7 +11,6 @@
#include <plib/puAux.h> #include <plib/puAux.h>
#include <simgear/route/waypoint.hxx>
#include <simgear/structure/callback.hxx> #include <simgear/structure/callback.hxx>
#include <simgear/sg_inlines.h> #include <simgear/sg_inlines.h>

8
src/Navaids/waypoint.cxx
View file

@ -24,7 +24,6 @@
#include "waypoint.hxx" #include "waypoint.hxx"
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>
#include <simgear/route/waypoint.hxx>
#include <Airports/simple.hxx> #include <Airports/simple.hxx>
#include <Airports/runways.hxx> #include <Airports/runways.hxx>
@ -44,13 +43,6 @@ BasicWaypt::BasicWaypt(const SGGeod& aPos, const string& aIdent, RouteBase* aOwn
} }
} }
BasicWaypt::BasicWaypt(const SGWayPoint& aWP, RouteBase* aOwner) :
Waypt(aOwner),
_pos(aWP.get_target()),
_ident(aWP.get_id())
{
}
BasicWaypt::BasicWaypt(RouteBase* aOwner) : BasicWaypt::BasicWaypt(RouteBase* aOwner) :
Waypt(aOwner) Waypt(aOwner)
{ {

6
src/Navaids/waypoint.hxx
View file

@ -25,21 +25,17 @@
class FGAirport; class FGAirport;
typedef SGSharedPtr<FGAirport> FGAirportRef; typedef SGSharedPtr<FGAirport> FGAirportRef;
class SGWayPoint;
class FGRunway; class FGRunway;
namespace flightgear namespace flightgear
{ {
class BasicWaypt : public Waypt class BasicWaypt : public Waypt
{ {
public: public:
BasicWaypt(const SGGeod& aPos, const std::string& aIdent, RouteBase* aOwner); BasicWaypt(const SGGeod& aPos, const std::string& aIdent, RouteBase* aOwner);
BasicWaypt(const SGWayPoint& aWP, RouteBase* aOwner);
BasicWaypt(RouteBase* aOwner); BasicWaypt(RouteBase* aOwner);
virtual SGGeod position() const virtual SGGeod position() const

1
src/Traffic/SchedFlight.cxx
View file

@ -51,7 +51,6 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/route/waypoint.hxx>
#include <simgear/structure/subsystem_mgr.hxx> #include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/timing/sg_time.hxx> #include <simgear/timing/sg_time.hxx>
#include <simgear/xml/easyxml.hxx> #include <simgear/xml/easyxml.hxx>

1
src/Traffic/Schedule.cxx
View file

@ -41,7 +41,6 @@
#include <simgear/sg_inlines.h> #include <simgear/sg_inlines.h>
#include <simgear/math/sg_geodesy.hxx> #include <simgear/math/sg_geodesy.hxx>
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/route/waypoint.hxx>
#include <simgear/structure/subsystem_mgr.hxx> #include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/xml/easyxml.hxx> #include <simgear/xml/easyxml.hxx>

1
src/Traffic/TrafficMgr.cxx
View file

@ -56,7 +56,6 @@
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/misc/sg_dir.hxx> #include <simgear/misc/sg_dir.hxx>
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/route/waypoint.hxx>
#include <simgear/structure/subsystem_mgr.hxx> #include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/xml/easyxml.hxx> #include <simgear/xml/easyxml.hxx>