small cleanup to vivian's patch

diff --git a/projects/VC7.1/FlightGear.vcproj b/projects/VC7.1/FlightGear.vcproj
index 92b70f5c49e64807c354ebb4fc834ceef940bcc0..8a02a8ceee6a3983453682d7cf40f925aaa8b82c 100755 (executable)
--- a/projects/VC7.1/FlightGear.vcproj
+++ b/projects/VC7.1/FlightGear.vcproj
@@ -2729,6 +2729,13 @@
                        <File
                                RelativePath="..\..\src\AIModel\AICarrier.hxx">
                        </File>
+                       <File
+                               RelativePath="..\..\src\AIModel\AIEscort.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\AIModel\AIEscort.hxx">
+                       </File>
+
                        <File
                                RelativePath="..\..\src\AIModel\AIFlightPlan.cxx">
                        </File>

diff --git a/projects/VC90/FlightGear/FlightGear.vcproj b/projects/VC90/FlightGear/FlightGear.vcproj
index 1be40009cfceacdd83accfc260eb1668ab324884..3b7d587ff7f5dfc31efefb3ab85c967c718cb146 100644 (file)
--- a/projects/VC90/FlightGear/FlightGear.vcproj
+++ b/projects/VC90/FlightGear/FlightGear.vcproj
@@ -3901,6 +3901,14 @@
                                RelativePath="..\..\..\src\AIModel\AICarrier.hxx"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\..\src\AIModel\AIEscort.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\..\src\AIModel\AIEscort.hxx"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\..\src\AIModel\AIFlightPlan.cxx"
                                >

diff --git a/src/AIModel/AIEscort.cxx b/src/AIModel/AIEscort.cxx
index 80ef3232579af69fa89973d241c883a3f21aab7a..760378e78e6155206f830bb425877e4bb385e5e1 100644 (file)
--- 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 fec8498673aba6967c56f8d249e7a95cd61c5d80..ebc4424751ab6260148bb9066b7fbda856b4c5be 100644 (file)
--- a/src/AIModel/AIEscort.hxx
+++ b/src/AIModel/AIEscort.hxx
@@ -26,9 +26,6 @@
 
 #include <simgear/compiler.h>
 
-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 c8259e28af1e7a6401d58b2d0a1f15864399e445..7681cb4fe5964e5134941c87dd5ddedbe31231d5 100644 (file)
--- 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 1bac75e8b54e7ef752453953328f878c45016425..376410d1732e0d0bb638a17927eeb39212f3b46a 100644 (file)
--- a/src/Instrumentation/wxradar.hxx
+++ b/src/Instrumentation/wxradar.hxx
@@ -33,11 +33,9 @@
 #include <simgear/environment/visual_enviro.hxx>
 
 #include <vector>
-#include <queue>
 #include <string>
 
 using std::vector;
-using std::queue;
 using std::string;
 
 class FGODGauge;