commradio: improvements for atis speech

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

diff --git a/src/Airports/airports_fwd.hxx b/src/Airports/airports_fwd.hxx
index ecb76a50fcd8a732810d78c8f7cea47e9be85104..a596f3db968aaa7337855a90d927424bca7431a7 100644 (file)
--- a/src/Airports/airports_fwd.hxx
+++ b/src/Airports/airports_fwd.hxx
@@ -1,9 +1,20 @@
-/*
- * airports_fwd.hxx
- *
- *  Created on: 04.03.2013
- *      Author: tom
- */
+// Airports forward declarations
+//
+// Copyright (C) 2013  Thomas Geymayer <tomgey@gmail.com>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef AIRPORTS_FWD_HXX_
 #define AIRPORTS_FWD_HXX_
@@ -14,10 +25,12 @@
 #include <map>
 #include <vector>
 #include <string>
+#include <ctime> // for time_t
 
 // forward decls
 class FGAirport;
 class FGAirportDynamics;
+class FGRunwayBase;
 class FGRunway;
 class FGHelipad;
 class FGTaxiway;
@@ -55,16 +68,25 @@ namespace flightgear {
   typedef std::vector<WayptRef> WayptVec;
 
   typedef SGSharedPtr<CommStation> CommStationRef;
-  typedef std::vector<CommStation*> CommStationList;
+  typedef std::vector<CommStationRef> CommStationList;
   typedef std::map<std::string, FGAirport*> AirportCache;
 }
 
-typedef std::vector<FGRunway*> FGRunwayList;
-typedef std::map<std::string, FGRunway*> FGRunwayMap;
-typedef std::map<std::string, FGHelipad*> FGHelipadMap;
+typedef SGSharedPtr<FGAirport> FGAirportRef;
+typedef SGSharedPtr<FGRunwayBase> FGRunwayBaseRef;
+typedef SGSharedPtr<FGRunway> FGRunwayRef;
+typedef SGSharedPtr<FGHelipad> FGHelipadRef;
+typedef SGSharedPtr<FGTaxiway> FGTaxiwayRef;
+typedef SGSharedPtr<FGPavement> FGPavementRef;
+typedef SGSharedPtr<FGParking> FGParkingRef;
 
-typedef std::vector<FGTaxiway*> FGTaxiwayList;
-typedef std::vector<FGPavement*> FGPavementList;
+typedef std::vector<FGRunwayRef> FGRunwayList;
+typedef std::map<std::string, FGRunwayRef> FGRunwayMap;
+typedef std::map<std::string, FGHelipadRef> FGHelipadMap;
+
+typedef std::vector<FGTaxiwayRef> FGTaxiwayList;
+typedef std::vector<FGPavementRef> FGPavementList;
+typedef std::vector<FGParkingRef> FGParkingList;
 
 typedef std::vector<FGTaxiSegment*>  FGTaxiSegmentVector;
 typedef FGTaxiSegmentVector::iterator FGTaxiSegmentVectorIterator;
@@ -83,10 +105,6 @@ typedef std::vector<time_t>::iterator TimeVectorIterator;
 typedef std::vector<FGTaxiRoute> TaxiRouteVector;
 typedef std::vector<FGTaxiRoute>::iterator TaxiRouteVectorIterator;
 
-typedef std::vector<FGParking*> FGParkingVec;
-typedef FGParkingVec::iterator FGParkingVecIterator;
-typedef FGParkingVec::const_iterator FGParkingVecConstIterator;
-
 typedef std::vector<RunwayList> RunwayListVec;
 typedef std::vector<RunwayList>::iterator RunwayListVectorIterator;
 typedef std::vector<RunwayList>::const_iterator RunwayListVecConstIterator;