Merge branch 'maint' into next

[flightgear.git] / src / FDM / flight.hxx

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index 4a47eeac3f0cd21870257ec580fe2564cb2ceca3..017ab0a55f22fa38caf79147fdd2445011070ce6 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -40,12 +40,6 @@
    `FGInterface::get_Psi ()'
    `FGInterface::get_V_equiv_kts ()'
 
-   `FGInterface::get_Mass ()'
-   `FGInterface::get_I_xx ()'
-   `FGInterface::get_I_yy ()'
-   `FGInterface::get_I_zz ()'
-   `FGInterface::get_I_xz ()'
-   
    `FGInterface::get_V_north ()'
    `FGInterface::get_V_east ()'
    `FGInterface::get_V_down ()'
@@ -90,9 +84,9 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <FDM/groundcache.hxx>
 
-SG_USING_STD(list);
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::list;
+using std::vector;
+using std::string;
 
 // This is based heavily on LaRCsim/ls_generic.h
 class FGInterface : public SGSubsystem {
@@ -146,9 +140,6 @@ private:
     SGGeoc geocentric_position_v;
     SGVec3d euler_angles_v;
 
-    // Inertias
-    double mass, i_xx, i_yy, i_zz, i_xz;
-
     // Normal Load Factor
     double nlf;
 
@@ -199,15 +190,6 @@ public:
     void _updateGeocentricPosition( double lat_geoc, double lon, double alt );
     void _update_ground_elev_at_pos( void );
 
-    inline void _set_Inertias( double m, double xx, double yy, 
-                             double zz, double xz)
-    {
-       mass = m;
-       i_xx = xx;
-       i_yy = yy;
-       i_zz = zz;
-       i_xz = xz;
-    }
     inline void _set_CG_Position( double dx, double dy, double dz ) {
        d_cg_rp_body_v[0] = dx;
        d_cg_rp_body_v[1] = dy;
@@ -450,13 +432,6 @@ public:
 
     // ========== Mass properties and geometry values ==========
 
-    // Inertias
-    inline double get_Mass() const { return mass; }
-    inline double get_I_xx() const { return i_xx; }
-    inline double get_I_yy() const { return i_yy; }
-    inline double get_I_zz() const { return i_zz; }
-    inline double get_I_xz() const { return i_xz; }
-
     // CG position w.r.t. ref. point
     inline double get_Dx_cg() const { return d_cg_rp_body_v[0]; }
     inline double get_Dy_cg() const { return d_cg_rp_body_v[1]; }