apt.dat parser: clearer log and exception messages

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 889fa40aabe5480c8948078e3e82fc1a3ec134e0..2d83bcaedbd7875f3482a4672937e372c554698b 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -46,7 +46,6 @@ typedef std::vector<SGPath> PathList;
 // pointers, we don't need to know anything about the class details
 // anyway.
 
-class SGEphemeris;
 class SGCommandMgr;
 class SGMaterialLib;
 class SGPropertyNode;
@@ -54,7 +53,6 @@ class SGTime;
 class SGEventMgr;
 class SGSubsystemMgr;
 class SGSubsystem;
-class SGSoundMgr;
 
 class FGControls;
 class FGTACANList;
@@ -63,15 +61,17 @@ class FGRouteMgr;
 class FGScenery;
 class FGTileMgr;
 class FGViewMgr;
-class FGViewer;
 class FGRenderer;
-class FGFontCache;
-class FGSampleQueue;
 
 namespace simgear { namespace pkg {
   class Root;
 }}
 
+namespace flightgear
+{
+    class View;
+}
+
 /**
  * Bucket for subsystem pointers representing the sim's state.
  */
@@ -114,18 +114,9 @@ private:
     // Time structure
     SGTime *time_params;
 
-    // Sky structures
-    SGEphemeris *ephem;
-
     // Material properties library
     SGSharedPtr<SGMaterialLib> matlib;
 
-    // Global autopilot "route"
-    FGRouteMgr *route_mgr;
-
-    // viewer manager
-    FGViewMgr *viewmgr;
-
     SGCommandMgr *commands;
 
     // list of serial port-like configurations
@@ -135,14 +126,6 @@ private:
     // and or flight-plan file during initialization
     string_list *initial_waypoints;
 
-    // FlightGear scenery manager
-    SGSharedPtr<FGScenery> _scenery;
-
-    // Tile manager
-    SGSharedPtr<FGTileMgr> _tile_mgr;
-
-    FGFontCache *fontcache;
-
     // Navigational Aids
     FGTACANList *channellist;
 
@@ -160,9 +143,7 @@ private:
      * helper to initialise standard properties on a new property tree
      */
     void initProperties();
-    
-    SGSharedPtr<FGSampleQueue> _chatter_queue;
-    
+        
     void cleanupListeners();
     
     typedef std::vector<SGPropertyChangeListener*> SGPropertyChangeListenerVec;
@@ -206,8 +187,6 @@ public:
 
     SGEventMgr *get_event_mgr () const;
 
-    SGSoundMgr *get_soundmgr () const;
-
     inline double get_sim_time_sec () const { return sim_time_sec; }
     inline void inc_sim_time_sec (double dt) { sim_time_sec += dt; }
     inline void set_sim_time_sec (double t) { sim_time_sec = t; }
@@ -301,16 +280,9 @@ public:
     inline SGTime *get_time_params() const { return time_params; }
     inline void set_time_params( SGTime *t ) { time_params = t; }
 
-    inline SGEphemeris *get_ephem() const { return ephem; }
-    inline void set_ephem( SGEphemeris *e ) { ephem = e; }
-
     inline SGMaterialLib *get_matlib() const { return matlib; }
     void set_matlib( SGMaterialLib *m );
 
-    inline FGViewMgr *get_viewmgr() const { return viewmgr; }
-    inline void set_viewmgr( FGViewMgr *vm ) { viewmgr = vm; }
-    FGViewer *get_current_view() const;
-
     inline SGPropertyNode *get_props () { return props; }
 
     /**
@@ -348,15 +320,14 @@ public:
         initial_waypoints = list;
     }
 
+    FGViewMgr *get_viewmgr() const;
+    flightgear::View *get_current_view() const;
+
     FGControls *get_controls() const;
 
     FGScenery * get_scenery () const;
-    void set_scenery ( FGScenery *s );
 
     FGTileMgr * get_tile_mgr () const;
-    void set_tile_mgr ( FGTileMgr *t );
-
-    inline FGFontCache *get_fontcache() const { return fontcache; }
   
     inline FGTACANList *get_channellist() const { return channellist; }
     inline void set_channellist( FGTACANList *c ) { channellist = c; }
@@ -371,9 +342,6 @@ public:
      */
     void saveUserSettings();
     
-    FGSampleQueue* get_chatter_queue() const;
-    void set_chatter_queue(FGSampleQueue* queue);
-    
     void addListenerToCleanup(SGPropertyChangeListener* l);
   
     simgear::pkg::Root* packageRoot();