X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FTraffic%2FSchedFlight.hxx;h=751d95895c4e6af3df88c666fc84d8a9e2770747;hb=cff6b2034de866df70a2b29feb3383ee8ccbbef6;hp=0567102fb89930307b107ca4a2a5ccfb269f4c0d;hpb=808c4c635d9d07f812041169d4b30257fd80742f;p=flightgear.git

diff --git a/src/Traffic/SchedFlight.hxx b/src/Traffic/SchedFlight.hxx
index 0567102fb..751d95895 100644
--- a/src/Traffic/SchedFlight.hxx
+++ b/src/Traffic/SchedFlight.hxx
@@ -40,22 +40,18 @@
 #ifndef _FGSCHEDFLIGHT_HXX_
 #define _FGSCHEDFLIGHT_HXX_
 
-
-using namespace std;
-
-using std::vector;
-
+class FGAirport;
 
 class FGScheduledFlight
 {
 private:
-  string callsign;
-  string fltRules;
+  std::string callsign;
+  std::string fltRules;
   FGAirport *departurePort;
   FGAirport *arrivalPort;
-  string depId;
-  string arrId;
-  string requiredAircraft;
+  std::string depId;
+  std::string arrId;
+  std::string requiredAircraft;
   time_t departureTime;
   time_t arrivalTime;
   time_t repeatPeriod;
@@ -69,29 +65,29 @@ private:
 public:
   FGScheduledFlight();
   FGScheduledFlight(const FGScheduledFlight &other);
-  //  FGScheduledFlight(const string);
-  FGScheduledFlight(const string& cs,
-		     const string& fr,
-		     const string& depPrt,
-		     const string& arrPrt,
-		     int cruiseAlt,
-		     const string& deptime,
-		     const string& arrtime,
-		     const string& rep,
-                     const string& reqAC
-		     );
+  //  FGScheduledFlight(const std::string);
+  FGScheduledFlight(const std::string& cs,
+                    const std::string& fr,
+                    const std::string& depPrt,
+                    const std::string& arrPrt,
+                    int cruiseAlt,
+                    const std::string& deptime,
+                    const std::string& arrtime,
+                    const std::string& rep,
+                    const std::string& reqAC
+  );
   ~FGScheduledFlight();
 
   void update();
-   bool initializeAirports();
+  bool initializeAirports();
   
   void adjustTime(time_t now);
 
   time_t getDepartureTime() { return departureTime; };
   time_t getArrivalTime  () { return arrivalTime;   };
   
-  void setDepartureAirport(string port) { depId = port; };
-  void setArrivalAirport  (string port) { arrId = port; };
+  void setDepartureAirport(const std::string& port) { depId = port; };
+  void setArrivalAirport  (const std::string& port) { arrId = port; };
   FGAirport *getDepartureAirport();
   FGAirport *getArrivalAirport  ();
 
@@ -101,23 +97,23 @@ public:
   { 
     return (departureTime < other.departureTime); 
   };
-  string& getFlightRules() { return fltRules; };
+  const std::string& getFlightRules() { return fltRules; };
 
-  time_t processTimeString(const string& time);
-  const string& getCallSign() {return callsign; };
-  const string& getRequirement() { return requiredAircraft; }
+  time_t processTimeString(const std::string& time);
+  const std::string& getCallSign() {return callsign; };
+  const std::string& getRequirement() { return requiredAircraft; }
 
-  void lock() { available = false; };
-  void release() { available = true; };
+  void lock()    { available = false; };
+  void release() { available = true;  };
 
   bool isAvailable() { return available; };
 
-  void setCallSign(string val)    { callsign = val; };
-  void setFlightRules(string val) { fltRules = val; };
+  void setCallSign(const std::string& val)    { callsign = val; };
+  void setFlightRules(const std::string& val) { fltRules = val; };
 };
 
-typedef vector<FGScheduledFlight*>           FGScheduledFlightVec;
-typedef vector<FGScheduledFlight*>::iterator FGScheduledFlightVecIterator;
+typedef std::vector<FGScheduledFlight*>           FGScheduledFlightVec;
+typedef std::vector<FGScheduledFlight*>::iterator FGScheduledFlightVecIterator;
 
 typedef std::map < std::string, FGScheduledFlightVec > FGScheduledFlightMap;