X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAIShip.hxx;h=009b735f58311f92944ee7d0c03d9832e2dc52c6;hb=d035fdf3a949e62f0c8e772e100d14087b6d4ba9;hp=74a5ca2e710b4861be2b7b2ec9d888abb4e90cc7;hpb=0abf252ec8bc933b9b7c045f8782cfc7f16c0465;p=flightgear.git diff --git a/src/AIModel/AIShip.hxx b/src/AIModel/AIShip.hxx index 74a5ca2e7..009b735f5 100644 --- a/src/AIModel/AIShip.hxx +++ b/src/AIModel/AIShip.hxx @@ -52,9 +52,9 @@ public: void YawTo(double angle); void ClimbTo(double altitude); void TurnTo(double heading); - void setCurrName(const string&); - void setNextName(const string&); - void setPrevName(const string&); + void setCurrName(const std::string&); + void setNextName(const std::string&); + void setPrevName(const std::string&); void setLeadAngleGain(double g); void setLeadAngleLimit(double l); void setLeadAngleProp(double p); @@ -99,20 +99,18 @@ private: void setServiceable(bool s); void Run(double dt); - void setStartTime(const string&); - void setUntilTime(const string&); + void setStartTime(const std::string&); + void setUntilTime(const std::string&); //void setWPPos(); void setWPAlt(); void setXTrackError(); SGGeod wppos; - const SGMaterial* _material; - double getRange(double lat, double lon, double lat2, double lon2) const; double getCourse(double lat, double lon, double lat2, double lon2) const; double getDaySeconds(); - double processTimeString(const string& time); + double processTimeString(const std::string& time); bool initFlightPlan(); bool advanceFlightPlan (double elapsed_sec, double day_sec); @@ -131,9 +129,9 @@ private: double _xtrack_error; double _curr_alt, _prev_alt; - string _prev_name, _curr_name, _next_name; - string _path; - string _start_time, _until_time; + std::string _prev_name, _curr_name, _next_name; + std::string _path; + std::string _start_time, _until_time; bool _repeat; bool _fp_init;