Remove a bunch of unneede files.

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

diff --git a/src/FDM/JSBSim/JSBSim.hxx b/src/FDM/JSBSim/JSBSim.hxx
index 623cc69c4228a40e8c7cff3a79597f165e4f91cf..5bd13816b26b176962fc4220abe1863406141dd1 100644 (file)
--- a/src/FDM/JSBSim/JSBSim.hxx
+++ b/src/FDM/JSBSim/JSBSim.hxx
@@ -72,7 +72,8 @@ class FGOutput;
 class FGInitialCondition;
 }
 
-using namespace JSBSim;
+// Adding it here will cause a namespace clash in FlightGear -EMH-
+// using namespace JSBSim;
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DOCUMENTATION
@@ -206,20 +207,20 @@ public:
     void update_ic(void);
 
 private:
-    FGFDMExec *fdmex;
-    FGInitialCondition *fgic;
+    JSBSim::FGFDMExec *fdmex;
+    JSBSim::FGInitialCondition *fgic;
     bool needTrim;
 
-    FGState*        State;
-    FGAtmosphere*   Atmosphere;
-    FGFCS*          FCS;
-    FGPropulsion*   Propulsion;
-    FGMassBalance*  MassBalance;
-    FGAircraft*     Aircraft;
-    FGPropagate*    Propagate;
-    FGAuxiliary*    Auxiliary;
-    FGAerodynamics* Aerodynamics;
-    FGGroundReactions *GroundReactions;
+    JSBSim::FGState*        State;
+    JSBSim::FGAtmosphere*   Atmosphere;
+    JSBSim::FGFCS*          FCS;
+    JSBSim::FGPropulsion*   Propulsion;
+    JSBSim::FGMassBalance*  MassBalance;
+    JSBSim::FGAircraft*     Aircraft;
+    JSBSim::FGPropagate*    Propagate;
+    JSBSim::FGAuxiliary*    Auxiliary;
+    JSBSim::FGAerodynamics* Aerodynamics;
+    JSBSim::FGGroundReactions *GroundReactions;
 
     int runcount;
     double trim_elev;