commradio: improvements for atis speech

[flightgear.git] / src / Airports / groundnetwork.hxx

diff --git a/src/Airports/groundnetwork.hxx b/src/Airports/groundnetwork.hxx
index de8d94ed44a5008af63bf98f341b5a2a585d2abd..76eaa899e4e71f0f498c46332607588c2dd32003 100644 (file)
--- a/src/Airports/groundnetwork.hxx
+++ b/src/Airports/groundnetwork.hxx
@@ -27,26 +27,11 @@
 #include <simgear/compiler.h>
 
 #include <string>
-#include <vector>
-#include <list>
-#include <map>
 
 #include "gnnode.hxx"
 #include "parking.hxx"
 #include <ATC/trafficcontrol.hxx>
 
-
-class Block;
-class FGRunway;
-class FGTaxiSegment; // forward reference
-class FGAIFlightPlan; // forward reference
-class FGAirport;      // forward reference
-
-typedef std::vector<FGTaxiSegment*>  FGTaxiSegmentVector;
-typedef FGTaxiSegmentVector::iterator FGTaxiSegmentVectorIterator;
-
-typedef std::map<int, FGTaxiNode_ptr> IndexTaxiNodeMap;
-
 class Block
 {
 private:
@@ -63,9 +48,6 @@ public:
     bool operator< (const Block &other) const { return blocktime < other.blocktime; };
 };
 
-typedef std::vector<Block> BlockList;
-typedef BlockList::iterator BlockListIterator;
-
 /***************************************************************************************
  * class FGTaxiSegment
  **************************************************************************************/
@@ -94,8 +76,8 @@ public:
     void unblock(time_t now); 
     bool hasBlock(time_t now);
 
-    FGTaxiNode * getEnd() const;
-    FGTaxiNode * getStart() const;
+    FGTaxiNodeRef getEnd() const;
+    FGTaxiNodeRef getStart() const;
   
     double getLength() const;
   
@@ -119,14 +101,6 @@ public:
     };
 };
 
-
-
-
-typedef std::vector<int> intVec;
-typedef std::vector<int>::iterator intVecIterator;
-
-
-
 /***************************************************************************************
  * class FGTaxiRoute
  **************************************************************************************/
@@ -181,9 +155,6 @@ public:
     };
 };
 
-typedef std::vector<FGTaxiRoute> TaxiRouteVector;
-typedef std::vector<FGTaxiRoute>::iterator TaxiRouteVectorIterator;
-
 /**************************************************************************************
  * class FGGroundNetWork
  *************************************************************************************/
@@ -202,7 +173,6 @@ private:
     TrafficVector activeTraffic;
     TrafficVectorIterator currTraffic;
 
-    bool foundRoute;
     double totalDistance, maxDistance;
     FGTowerController *towerController;
     FGAirport *parent;
@@ -237,7 +207,7 @@ public:
     int findNearestNode(const SGGeod& aGeod) const;
     int findNearestNodeOnRunway(const SGGeod& aGeod, FGRunway* aRunway = NULL) const;
 
-    FGTaxiNode *findNode(PositionedID idx) const;
+    FGTaxiNodeRef findNode(PositionedID idx) const;
     FGTaxiSegment *findSegment(unsigned idx) const;
   
     /**