David Culp:

[flightgear.git] / src / AIModel / AIFlightPlan.hxx

diff --git a/src/AIModel/AIFlightPlan.hxx b/src/AIModel/AIFlightPlan.hxx
index a6ae1182e2f137e1f85654d8ff0451d4c7a6f978..17a5d1c277dd6a3d6441b0e08b019abee09fc60d 100644 (file)
--- a/src/AIModel/AIFlightPlan.hxx
+++ b/src/AIModel/AIFlightPlan.hxx
@@ -49,7 +49,7 @@ public:
    bool on_ground;
   } waypoint;
 
-   FGAIFlightPlan(string filename);
+   FGAIFlightPlan(const string& filename);
   FGAIFlightPlan(FGAIModelEntity *entity,
                 double course,
                 time_t start,
@@ -57,42 +57,42 @@ public:
                 FGAirport *arr,
                 bool firstLeg,
                 double radius,
-                string fltType,
-                string acType,
-                string airline);
+                const string& fltType,
+                const string& acType,
+                const string& airline);
    ~FGAIFlightPlan();
 
-   waypoint* getPreviousWaypoint( void );
-   waypoint* getCurrentWaypoint( void );
-   waypoint* getNextWaypoint( void );
+   waypoint* const getPreviousWaypoint( void ) const;
+   waypoint* const getCurrentWaypoint( void ) const;
+   waypoint* const getNextWaypoint( void ) const;
    void IncrementWaypoint( bool erase );
 
-   double getDistanceToGo(double lat, double lon, waypoint* wp);
-   int getLeg () { return leg;};
+   double getDistanceToGo(double lat, double lon, waypoint* wp) const;
+   int getLeg () const { return leg;};
    void setLeadDistance(double speed, double bearing, waypoint* current, waypoint* next);
    void setLeadDistance(double distance_ft);
    double getLeadDistance( void ) const {return lead_distance;}
-   double getBearing(waypoint* previous, waypoint* next);
-   double getBearing(double lat, double lon, waypoint* next);
-  time_t getStartTime() { return start_time; }; 
+   double getBearing(waypoint* previous, waypoint* next) const;
+   double getBearing(double lat, double lon, waypoint* next) const;
+  time_t getStartTime() const { return start_time; }; 
 
   void    create(FGAirport *dep, FGAirport *arr, int leg, double alt, double speed, double lat, double lon,
-                bool firstLeg, double radius, string fltType, string aircraftType, string airline);
+                bool firstLeg, double radius, const string& fltType, const string& aircraftType, const string& airline);
 
   void setLeg(int val) { leg = val;};
   void setTime(time_t st) { start_time = st; };
-  int getGate() { return gateId; };
-  double getLeadInAngle() { return leadInAngle; };
-  string getRunway() { return rwy._rwy_no; };
-  string getRunwayId() { return rwy._id; };
+  int getGate() const { return gateId; };
+  double getLeadInAngle() const { return leadInAngle; };
+  const string& getRunway() const { return rwy._rwy_no; };
+  const string& getRunwayId() const { return rwy._id; };
   void setRepeat(bool r) { repeat = r; };
-  bool getRepeat(void) { return repeat; };
+  bool getRepeat(void) const { return repeat; };
   void restart(void);
 
 private:
   FGRunway rwy;
   typedef vector <waypoint*> wpt_vector_type;
-  typedef wpt_vector_type::iterator wpt_vector_iterator;
+  typedef wpt_vector_type::const_iterator wpt_vector_iterator;
 
   wpt_vector_type       waypoints;
   wpt_vector_iterator   wpt_iterator;
@@ -104,9 +104,10 @@ private:
    time_t start_time;
   int leg;
   int gateId;
+  string activeRunway;
 
-  void createPushBack(bool, FGAirport*, double, double, double, string, string, string);
-  void createTaxi(bool, int, FGAirport *, double, string, string, string);
+  void createPushBack(bool, FGAirport*, double, double, double, const string&, const string&, const string&);
+  void createTaxi(bool, int, FGAirport *, double, double, double, const string&, const string&, const string&);
   void createTakeOff(bool, FGAirport *, double);
   void createClimb(bool, FGAirport *, double, double);
   void createCruise(bool, FGAirport*, FGAirport*, double, double, double, double);
@@ -120,4 +121,3 @@ private:
 
 
 #endif  // _FG_AIFLIGHTPLAN_HXX
-