- Removed redundant FG*:: qualifications from class members

- Fixed comparisons between signed and unsigned ints

diff --git a/src/Airports/runways.hxx b/src/Airports/runways.hxx
index 49fd41d0f8641fbb6fd89c6b3a021c17f41b6df4..041e904765ca367a37afa3b13d9097088fcc603a 100644 (file)
--- a/src/Airports/runways.hxx
+++ b/src/Airports/runways.hxx
@@ -130,7 +130,7 @@ public:
     bool search( const string& aptid, const int hdg, FGRunway* runway );
 
     // Return the runway number of the runway closest to a given heading
-    string FGRunways::search( const string& aptid, const int tgt_hdg );
+    string search( const string& aptid, const int tgt_hdg );
 
     FGRunway search( const string& aptid );
     bool next( FGRunway* runway );

diff --git a/src/FDM/External.hxx b/src/FDM/External.hxx
index 5ebad88e3b8eaa67b9b945a0243512dfd8614a62..2cc20b4250f7ce1b623143652ff0de1a96da2109 100644 (file)
--- a/src/FDM/External.hxx
+++ b/src/FDM/External.hxx
@@ -31,8 +31,8 @@
 class FGExternal: public FGInterface {
 
 public:
-    FGExternal::FGExternal( double dt );
-    FGExternal::~FGExternal();
+    FGExternal( double dt );
+    ~FGExternal();
 
     // reset flight params to a specific position 
     void init();

diff --git a/src/FDM/IO360.hxx b/src/FDM/IO360.hxx
index ce459e02e6ecdfc811376707cdab459685a0a398..6eccec8509293b292995af51d5a673b245d47d78 100644 (file)
--- a/src/FDM/IO360.hxx
+++ b/src/FDM/IO360.hxx
@@ -158,16 +158,16 @@ private:
     float Calculate_Delta_T_Exhaust(void);
 
     // Calculate cylinder head temperature
-    void FGNewEngine::Calc_CHT(void);
+    void Calc_CHT(void);
 
     // Calculate exhaust gas temperature
-    void FGNewEngine::Calc_EGT(void);
+    void Calc_EGT(void);
 
     // Calculate fuel flow in gals/hr
-    void FGNewEngine::Calc_Fuel_Flow_Gals_Hr(void);
+    void Calc_Fuel_Flow_Gals_Hr(void);
 
     // Calculate current percentage power
-    void FGNewEngine::Calc_Percentage_Power(bool mag_left, bool mag_right);
+    void Calc_Percentage_Power(bool mag_left, bool mag_right);
 
     // Calculate Oil Temperature
     float Calc_Oil_Temp (float oil_temp);
@@ -176,7 +176,7 @@ private:
     float Calc_Oil_Press (float Oil_Temp, float Engine_RPM);
 
     // Propeller calculations.
-    void FGNewEngine::Do_Prop_Calcs(void);
+    void Do_Prop_Calcs(void);
 
 public:
 

diff --git a/src/FDM/JSBSim.hxx b/src/FDM/JSBSim.hxx
index 8e58aa9d806af20de13403934528dcc3d2bb001b..b2da20edf6d127a574b07be343063e1ac2f5679e 100644 (file)
--- a/src/FDM/JSBSim.hxx
+++ b/src/FDM/JSBSim.hxx
@@ -99,9 +99,9 @@ class FGJSBsim: public FGInterface {
 
 public:
     /// Constructor
-    FGJSBsim::FGJSBsim( double dt );
+    FGJSBsim( double dt );
     /// Destructor
-    FGJSBsim::~FGJSBsim();
+    ~FGJSBsim();
 
     /// copy FDM state to LaRCsim structures
     bool copy_to_JSBsim();

diff --git a/src/FDM/MagicCarpet.hxx b/src/FDM/MagicCarpet.hxx
index 12d3c656e8bc394f48db9f46f99b2d085428c0b9..32fa71f241d94ba76b8084ca4ad360485cd224c4 100644 (file)
--- a/src/FDM/MagicCarpet.hxx
+++ b/src/FDM/MagicCarpet.hxx
@@ -31,8 +31,8 @@
 class FGMagicCarpet: public FGInterface {
 
 public:
-    FGMagicCarpet::FGMagicCarpet( double dt );
-    FGMagicCarpet::~FGMagicCarpet();
+    FGMagicCarpet( double dt );
+    ~FGMagicCarpet();
 
     // reset flight params to a specific position 
     void init();

diff --git a/src/FDM/NullFDM.hxx b/src/FDM/NullFDM.hxx
index c970d4dbf1fa51a113b057bb9e8f5b8500081da1..1d2dd2844846c7125f2d2f0db337526661093314 100644 (file)
--- a/src/FDM/NullFDM.hxx
+++ b/src/FDM/NullFDM.hxx
@@ -32,8 +32,8 @@
 class FGNullFDM: public FGInterface {
 
 public:
-    FGNullFDM::FGNullFDM( double dt );
-    FGNullFDM::~FGNullFDM();
+    FGNullFDM( double dt );
+    ~FGNullFDM();
 
     // reset flight params to a specific position 
     void init();

diff --git a/src/FDM/YASim/YASim.cxx b/src/FDM/YASim/YASim.cxx
index 4041386537f2834c31ef74c19d2ac017cfb5452c..3253715a574aa5a6c49a8936aafdff3f75ec2735 100644 (file)
--- a/src/FDM/YASim/YASim.cxx
+++ b/src/FDM/YASim/YASim.cxx
@@ -223,7 +223,12 @@ void YASim::copyToYASim(bool copyState)
     wind[0] = get_V_north_airmass() * FT2M;
     wind[1] = get_V_east_airmass() * FT2M;
     wind[2] = get_V_down_airmass() * FT2M;
-    double ground = get_Runway_altitude() * FT2M;
+
+    // The ground elevation doesn't come from FGInterface; query it
+    // from the scenery and set it for others to find.
+    double ground = scenery.get_cur_elev();
+    set_Runway_altitude(ground * FT2M);
+    // cout << "YASIM: ground = " << ground << endl;
 
     // You'd this this would work, but it doesn't.  These values are
     // always zero.  Use a "standard" pressure intstead.

diff --git a/src/Navaids/mkrbeacons.hxx b/src/Navaids/mkrbeacons.hxx
index b573f7202601b859800f46604f1d8635b203fe8b..619f88cea071081415389c618dac6784960a47a5 100644 (file)
--- a/src/Navaids/mkrbeacons.hxx
+++ b/src/Navaids/mkrbeacons.hxx
@@ -90,8 +90,7 @@ class FGMarkerBeacons {
     beacon_map_type beacon_map;
 
     // real add a marker beacon
-    bool FGMarkerBeacons::real_add( const int master_index,
-                                   const FGMkrBeacon& b );
+    bool real_add( const int master_index, const FGMkrBeacon& b );
 
 public:
 

diff --git a/src/Objects/matlib.cxx b/src/Objects/matlib.cxx
index 859f1c0eaeb0639fa5c616f4f90ad84363f5dd8f..0ea5d7b90e2e19bb4232c07be8808a0758081433 100644 (file)
--- a/src/Objects/matlib.cxx
+++ b/src/Objects/matlib.cxx
@@ -86,7 +86,7 @@ bool FGMaterialLib::load( const string& mpath ) {
       FGNewMat * m = new FGNewMat(node);
 
       vector<const SGPropertyNode *>names = node->getChildren("name");
-      for (int j = 0; j < names.size(); j++) {
+      for (unsigned int j = 0; j < names.size(); j++) {
        m->ref();
        matlib[names[j]->getStringValue()] = m;
        SG_LOG( SG_TERRAIN, SG_INFO, "  Loading material "

diff --git a/src/WeatherCM/FGWeatherParse.cpp b/src/WeatherCM/FGWeatherParse.cpp
index 7fb7bf2a97667bbd21a3a3a55a0c55385f36c1ba..2172ab89078f925ec00be85ea1aa6df084010da6 100644 (file)
--- a/src/WeatherCM/FGWeatherParse.cpp
+++ b/src/WeatherCM/FGWeatherParse.cpp
@@ -112,7 +112,7 @@ void FGWeatherParse::input(const char *file)
            in >> temp.airpressure_history[2]; 
            in >> temp.airpressure_history[3]; 
            
-           for (int i = 0; i < weather_station.size(); i++)
+           for (unsigned int i = 0; i < weather_station.size(); i++)
            {
                if ((weather_station[i].lat == temp.lat) && (weather_station[i].lon == temp.lon))
                {