Remove unused variables

[flightgear.git] / src / Traffic / SchedFlight.hxx

diff --git a/src/Traffic/SchedFlight.hxx b/src/Traffic/SchedFlight.hxx
index 5f01f346ebd980b06ac6ea140ebee27afa0dbf2f..4f85ed9931d098d53dc1d3bcd78c1be204791e3a 100644 (file)
--- a/src/Traffic/SchedFlight.hxx
+++ b/src/Traffic/SchedFlight.hxx
@@ -14,7 +14,7 @@
  *
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *
  **************************************************************************/
@@ -51,32 +51,35 @@ class FGScheduledFlight
 private:
   string callsign;
   string fltRules;
-  FGAirport departurePort;
-  FGAirport arrivalPort;
+  FGAirport *departurePort;
+  FGAirport *arrivalPort;
+  string depId;
+  string arrId;
   time_t departureTime;
   time_t arrivalTime;
   time_t repeatPeriod;
   int cruiseAltitude;
   bool initialized;
 
-  void initializeAirports();
+ 
  
 public:
   FGScheduledFlight();
   FGScheduledFlight(const FGScheduledFlight &other);
   //  FGScheduledFlight(const string);
-  FGScheduledFlight::FGScheduledFlight(string cs,
-                    string fr,
-                    string depPrt,
-                    string arrPrt,
+  FGScheduledFlight(const string& cs,
+                    const string& fr,
+                    const string& depPrt,
+                    const string& arrPrt,
                     int cruiseAlt,
-                    string deptime,
-                    string arrtime,
-                    string rep
+                    const string& deptime,
+                    const string& arrtime,
+                    const string& rep
                     );
   ~FGScheduledFlight();
 
   void update();
+   bool initializeAirports();
   
   void adjustTime(time_t now);
 
@@ -92,13 +95,16 @@ public:
   { 
     return (departureTime < other.departureTime); 
   };
+  string& getFlightRules() { return fltRules; };
 
-  time_t processTimeString(string time);
-  
+  time_t processTimeString(const string& time);
+  const string& getCallSign() {return callsign; };
 };
 
-typedef vector<FGScheduledFlight>           FGScheduledFlightVec;
-typedef vector<FGScheduledFlight>::iterator FGScheduledFlightVecIterator;
+typedef vector<FGScheduledFlight*>           FGScheduledFlightVec;
+typedef vector<FGScheduledFlight*>::iterator FGScheduledFlightVecIterator;
+
+bool compareScheduledFlights(FGScheduledFlight *a, FGScheduledFlight *b);
 
 
 #endif