Merge branch 'jt/runway' into next

[flightgear.git] / src / Main / globals.hxx

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 0d830b3bb7ada01763d25fae814cc5dfe8c86ba0..d962bae2c2937bbc6e2f12de46e177e6ac6d0f53 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -24,23 +24,14 @@
 #ifndef _GLOBALS_HXX
 #define _GLOBALS_HXX
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
-#include <simgear/structure/callback.hxx>
+#include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/structure/event_mgr.hxx>
 
 #include <vector>
-#include STL_STRING
-
-SG_USING_STD( vector );
-SG_USING_STD( string );
-
-typedef vector<string> string_list;
+#include <string>
 
+typedef std::vector<std::string> string_list;
 
 // Forward declarations
 
@@ -53,17 +44,16 @@ typedef vector<string> string_list;
 // anyway.
 
 class SGEphemeris;
-
 class SGCommandMgr;
 class SGMagVar;
 class SGMaterialLib;
 class SGPropertyNode;
 class SGTime;
 class SGSoundMgr;
+class SGEventMgr;
+class SGSubsystemMgr;
+class SGSubsystem;
 
-
-class FGAirportList;
-class FGRunwayList;
 class FGAIMgr;
 class FGATCMgr;
 class FGAircraftModel;
@@ -73,7 +63,6 @@ class FGIO;
 class FGNavList;
 class FGAirwayNetwork;
 class FGTACANList;
-class FGFixList;
 class FGLight;
 class FGModelMgr;
 class FGRouteMgr;
@@ -111,17 +100,12 @@ private:
     double sim_time_sec;
 
     // Root of FlightGear data tree
-    string fg_root;
+    std::string fg_root;
 
     // Roots of FlightGear scenery tree
     string_list fg_scenery;
 
-    string browser;
-
-    // Fullscreen mode for old 3DFX cards.
-#if defined(FX) && defined(XMESA)
-    bool fullscreen;
-#endif
+    std::string browser;
 
     // An offset in seconds from the true time.  Allows us to adjust
     // the effective time of day.
@@ -152,12 +136,6 @@ private:
     // sound manager
     SGSoundMgr *soundmgr;
 
-    // Simple Airport List
-    FGAirportList *airports;
-
-    // Runway List
-    FGRunwayList *runways;
-
     // ATC manager
     FGATCMgr *ATC_mgr;
 
@@ -201,11 +179,9 @@ private:
     FGNavList *loclist;
     FGNavList *gslist;
     FGNavList *dmelist;
-    FGNavList *mkrlist;
     FGNavList *tacanlist;
     FGNavList *carrierlist;
     FGTACANList *channellist;
-    FGFixList *fixlist;
     FGAirwayNetwork *airwaynet;
 
     //Mulitplayer managers
@@ -234,19 +210,14 @@ public:
     inline void inc_sim_time_sec (double dt) { sim_time_sec += dt; }
     inline void set_sim_time_sec (double t) { sim_time_sec = t; }
 
-    inline const string &get_fg_root () const { return fg_root; }
-    void set_fg_root (const string &root);
+    inline const std::string &get_fg_root () const { return fg_root; }
+    void set_fg_root (const std::string &root);
 
     inline const string_list &get_fg_scenery () const { return fg_scenery; }
-    void set_fg_scenery (const string &scenery);
-
-    inline const string &get_browser () const { return browser; }
-    void set_browser (const string &b) { browser = b; }
+    void set_fg_scenery (const std::string &scenery);
 
-#if defined(FX) && defined(XMESA)
-    inline bool get_fullscreen() const { return fullscreen; }
-    inline bool set_fullscreen( bool f ) { fullscreen = f; }
-#endif
+    inline const std::string &get_browser () const { return browser; }
+    void set_browser (const std::string &b) { browser = b; }
 
     inline long int get_warp() const { return warp; }
     inline void set_warp( long int w ) { warp = w; }
@@ -268,12 +239,6 @@ public:
     inline SGMaterialLib *get_matlib() const { return matlib; }
     inline void set_matlib( SGMaterialLib *m ) { matlib = m; }
 
-    inline FGAirportList *get_airports() const { return airports; }
-    inline void set_airports( FGAirportList *a ) {airports = a; }
-
-    inline FGRunwayList *get_runways() const { return runways; }
-    inline void set_runways( FGRunwayList *r ) {runways = r; }
-
     inline FGATCMgr *get_ATC_mgr() const { return ATC_mgr; }
     inline void set_ATC_mgr( FGATCMgr *a ) {ATC_mgr = a; }
 
@@ -358,10 +323,6 @@ public:
     inline void set_tacanlist( FGNavList *n ) { tacanlist = n; }
     inline FGNavList *get_carrierlist() const { return carrierlist; }
     inline void set_carrierlist( FGNavList *n ) { carrierlist = n; }
-    inline FGNavList *get_mkrlist() const { return mkrlist; }
-    inline void set_mkrlist( FGNavList *n ) { mkrlist = n; }
-    inline FGFixList *get_fixlist() const { return fixlist; }
-    inline void set_fixlist( FGFixList *f ) { fixlist = f; }
     inline FGTACANList *get_channellist() const { return channellist; }
     inline void set_channellist( FGTACANList *c ) { channellist = c; }