diff --git a/projects/VC7.1/FlightGear.vcproj b/projects/VC7.1/FlightGear.vcproj index 92b70f5c4..8a02a8cee 100755 --- a/projects/VC7.1/FlightGear.vcproj +++ b/projects/VC7.1/FlightGear.vcproj @@ -2729,6 +2729,13 @@ + + + + + diff --git a/projects/VC90/FlightGear/FlightGear.vcproj b/projects/VC90/FlightGear/FlightGear.vcproj index 1be40009c..3b7d587ff 100644 --- a/projects/VC90/FlightGear/FlightGear.vcproj +++ b/projects/VC90/FlightGear/FlightGear.vcproj @@ -3901,6 +3901,14 @@ RelativePath="..\..\..\src\AIModel\AICarrier.hxx" > + + + + diff --git a/src/AIModel/AIEscort.cxx b/src/AIModel/AIEscort.cxx index 80ef32325..760378e78 100644 --- a/src/AIModel/AIEscort.cxx +++ b/src/AIModel/AIEscort.cxx @@ -39,6 +39,8 @@ #include "AIEscort.hxx" +using std::string; + FGAIEscort::FGAIEscort() : FGAIShip(otEscort), diff --git a/src/AIModel/AIEscort.hxx b/src/AIModel/AIEscort.hxx index fec849867..ebc442475 100644 --- a/src/AIModel/AIEscort.hxx +++ b/src/AIModel/AIEscort.hxx @@ -26,9 +26,6 @@ #include -using std::string; -using std::list; - #include "AIBase.hxx" #include "AIShip.hxx" @@ -53,7 +50,7 @@ private: virtual void reinit() { init(); } virtual void update (double dt); - void setParentName(const string& p); + void setParentName(const std::string& p); void setParent(); void setStnRange(double r); void setStnBrg(double y); @@ -102,7 +99,7 @@ private: bool _MPControl, _patrol, _stn_deg_true; - string _parent; + std::string _parent; }; diff --git a/src/Instrumentation/wxradar.cxx b/src/Instrumentation/wxradar.cxx index c8259e28a..7681cb4fe 100644 --- a/src/Instrumentation/wxradar.cxx +++ b/src/Instrumentation/wxradar.cxx @@ -73,16 +73,16 @@ static const char *DEFAULT_FONT = "typewriter.txf"; wxRadarBg::wxRadarBg(SGPropertyNode *node) : -_name(node->getStringValue("name", "radar")), -_num(node->getIntValue("number", 0)), -_interval(node->getDoubleValue("update-interval-sec", 1.0)), -_time(0.0), -_sim_init_done(false), -_odg(0), -_last_switchKnob("off"), -_resultTexture(0), -_wxEcho(0), -_antenna_ht(node->getDoubleValue("antenna-ht-ft", 0.0)) + _name(node->getStringValue("name", "radar")), + _num(node->getIntValue("number", 0)), + _interval(node->getDoubleValue("update-interval-sec", 1.0)), + _time(0.0), + _sim_init_done(false), + _odg(0), + _last_switchKnob("off"), + _resultTexture(0), + _wxEcho(0), + _antenna_ht(node->getDoubleValue("antenna-ht-ft", 0.0)) { string branch; branch = "/instrumentation/" + _name; diff --git a/src/Instrumentation/wxradar.hxx b/src/Instrumentation/wxradar.hxx index 1bac75e8b..376410d17 100644 --- a/src/Instrumentation/wxradar.hxx +++ b/src/Instrumentation/wxradar.hxx @@ -33,11 +33,9 @@ #include #include -#include #include using std::vector; -using std::queue; using std::string; class FGODGauge;