Remove remaining includes of simgear/waypoint

diff --git a/src/AIModel/AIAircraft.cxx b/src/AIModel/AIAircraft.cxx
index 0a1050863d88b5359939be8687629209ab73a1ac..180f0bfc8b27809e6f500e81d62d8165b0f89cd6 100644 (file)
--- a/src/AIModel/AIAircraft.cxx
+++ b/src/AIModel/AIAircraft.cxx
@@ -22,7 +22,6 @@
 #  include <config.h>
 #endif
 
-#include <simgear/route/waypoint.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
 #include <Viewer/viewer.hxx>

diff --git a/src/AIModel/AIFlightPlan.cxx b/src/AIModel/AIFlightPlan.cxx
index 1e03b8835b829b48a9dab549de612a0a733593b2..f8f7c57636f3ec39f3de1265df69c719021480ef 100644 (file)
--- a/src/AIModel/AIFlightPlan.cxx
+++ b/src/AIModel/AIFlightPlan.cxx
@@ -24,7 +24,6 @@
 
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/route/waypoint.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/structure/exception.hxx>
 #include <simgear/constants.h>

diff --git a/src/AIModel/AIFlightPlanCreateCruise.cxx b/src/AIModel/AIFlightPlanCreateCruise.cxx
index c611f2095433acc38bfc1fa26e4295531c67511c..5807b9ae22c6c80495239b18bbdd9b259445c26a 100644 (file)
--- a/src/AIModel/AIFlightPlanCreateCruise.cxx
+++ b/src/AIModel/AIFlightPlanCreateCruise.cxx
@@ -25,7 +25,6 @@
 
 #include <fstream>
 #include <iostream>
-#include <simgear/route/waypoint.hxx>
 
 #include <Airports/simple.hxx>
 #include <Airports/runways.hxx>

diff --git a/src/Airports/dynamics.cxx b/src/Airports/dynamics.cxx
index 5a077968d1cad8f7bbc1d9ff456fd7b6e108e452..b4e91554e92ee75fda649abcc2e7f6776c557d9a 100644 (file)
--- a/src/Airports/dynamics.cxx
+++ b/src/Airports/dynamics.cxx
@@ -32,7 +32,6 @@
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/route/waypoint.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Airports/runways.hxx>

diff --git a/src/Airports/groundnetwork.cxx b/src/Airports/groundnetwork.cxx
index 3d710e6a7c0d1488d7d320a69dece5aa9b7fc77f..a63002eac87ed95e4cb24aee6e6ef4886fa89270 100644 (file)
--- a/src/Airports/groundnetwork.cxx
+++ b/src/Airports/groundnetwork.cxx
@@ -35,7 +35,6 @@
 #include <osg/Shape>
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/route/waypoint.hxx>
 #include <simgear/scene/material/EffectGeode.hxx>
 #include <simgear/scene/material/matlib.hxx>
 #include <simgear/scene/material/mat.hxx>

diff --git a/src/Airports/groundnetwork.hxx b/src/Airports/groundnetwork.hxx
index 78f1282d6d1b35ba298519e43afd404c32fb5f80..61555dc50a1f8b04c3cd3780a7c2712cfa953699 100644 (file)
--- a/src/Airports/groundnetwork.hxx
+++ b/src/Airports/groundnetwork.hxx
@@ -31,7 +31,6 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/route/waypoint.hxx>
 
 #include <string>
 #include <vector>

diff --git a/src/Autopilot/route_mgr.hxx b/src/Autopilot/route_mgr.hxx
index f3c939f0ecd23bcbe1ab3a99b130c7957d3fb398..babfe31eff773cc0a1820ce9a3ce39d4cae40fff 100644 (file)
--- a/src/Autopilot/route_mgr.hxx
+++ b/src/Autopilot/route_mgr.hxx
@@ -25,7 +25,6 @@
 #define _ROUTE_MGR_HXX 1
 
 #include <simgear/props/props.hxx>
-#include <simgear/route/waypoint.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
 #include <Navaids/route.hxx>

diff --git a/src/GUI/MapWidget.cxx b/src/GUI/MapWidget.cxx
index 99e536a4f4fd8b060d1a0353d005ab6e474193ec..5a53ffe7f889d6f7ab9385dd6ef89ad6dacd84c3 100644 (file)
--- a/src/GUI/MapWidget.cxx
+++ b/src/GUI/MapWidget.cxx
@@ -8,8 +8,6 @@
 #include <algorithm> // for std::sort
 #include <plib/puAux.h>
 
-#include <simgear/sg_inlines.h>
-#include <simgear/route/waypoint.hxx>
 #include <simgear/sg_inlines.h>
 #include <simgear/misc/strutils.hxx>
 #include <simgear/magvar/magvar.hxx>

diff --git a/src/GUI/WaypointList.cxx b/src/GUI/WaypointList.cxx
index 01911c989bb41c8d801c0104d206347f72fd965a..e8e5b36dcb40e2625d1225095519182884e225f1 100644 (file)
--- a/src/GUI/WaypointList.cxx
+++ b/src/GUI/WaypointList.cxx
@@ -11,7 +11,6 @@
 
 #include <plib/puAux.h>
 
-#include <simgear/route/waypoint.hxx>
 #include <simgear/structure/callback.hxx>
 #include <simgear/sg_inlines.h>
 

diff --git a/src/Navaids/waypoint.cxx b/src/Navaids/waypoint.cxx
index dd1ae7a96c4afd14838eb97d2a93b4bcd899fdcc..ede0f026d5d6ae8504a028a35d36f06117a1ba4d 100644 (file)
--- a/src/Navaids/waypoint.cxx
+++ b/src/Navaids/waypoint.cxx
@@ -24,7 +24,6 @@
 #include "waypoint.hxx"
 
 #include <simgear/structure/exception.hxx>
-#include <simgear/route/waypoint.hxx>
 
 #include <Airports/simple.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) :
   Waypt(aOwner)
 {

diff --git a/src/Navaids/waypoint.hxx b/src/Navaids/waypoint.hxx
index 47dd7810502885fe6dbe10f21a9f6fd0453923e5..d01070b6f7f6b023354e06849abb209ff31f988d 100644 (file)
--- a/src/Navaids/waypoint.hxx
+++ b/src/Navaids/waypoint.hxx
@@ -25,21 +25,17 @@
 
 class FGAirport;
 typedef SGSharedPtr<FGAirport> FGAirportRef;
-class SGWayPoint;
 class FGRunway;
 
 namespace flightgear
 {
 
-
 class BasicWaypt : public Waypt
 {
 public:
   
   BasicWaypt(const SGGeod& aPos, const std::string& aIdent, RouteBase* aOwner);
-  
-  BasicWaypt(const SGWayPoint& aWP, RouteBase* aOwner);
-  
+    
   BasicWaypt(RouteBase* aOwner);
   
   virtual SGGeod position() const

diff --git a/src/Traffic/SchedFlight.cxx b/src/Traffic/SchedFlight.cxx
index 5339a292ff0231f0853153d3e34d21310893a984..e04f1d8a4a3fcc3a6770eaa518ab56b0d8d741c1 100644 (file)
--- a/src/Traffic/SchedFlight.cxx
+++ b/src/Traffic/SchedFlight.cxx
@@ -51,7 +51,6 @@
 
 #include <simgear/compiler.h>
 #include <simgear/props/props.hxx>
-#include <simgear/route/waypoint.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/xml/easyxml.hxx>

diff --git a/src/Traffic/Schedule.cxx b/src/Traffic/Schedule.cxx
index 760a04a339425e37e86ebb38cebea61545665b18..9af6a0c2725e0d0a0cc44325332c244aae41822a 100644 (file)
--- a/src/Traffic/Schedule.cxx
+++ b/src/Traffic/Schedule.cxx
@@ -41,7 +41,6 @@
 #include <simgear/sg_inlines.h>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/props/props.hxx>
-#include <simgear/route/waypoint.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/xml/easyxml.hxx>
 

diff --git a/src/Traffic/TrafficMgr.cxx b/src/Traffic/TrafficMgr.cxx
index 43f3acefe8cd41a317597a74dc873b5efc03d4a9..a4562d3b49a924a4a1dcfc152a5c2bf5b4719819 100644 (file)
--- a/src/Traffic/TrafficMgr.cxx
+++ b/src/Traffic/TrafficMgr.cxx
@@ -56,7 +56,6 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/misc/sg_dir.hxx>
 #include <simgear/props/props.hxx>
-#include <simgear/route/waypoint.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/xml/easyxml.hxx>