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 e08da98918f17a5929d08a4df9185444243e8075..2d83bcaedbd7875f3482a4672937e372c554698b 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -53,7 +53,6 @@ class SGTime;
 class SGEventMgr;
 class SGSubsystemMgr;
 class SGSubsystem;
-class SGSoundMgr;
 
 class FGControls;
 class FGTACANList;
@@ -62,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.
  */
@@ -125,8 +126,6 @@ private:
     // and or flight-plan file during initialization
     string_list *initial_waypoints;
 
-    FGFontCache *fontcache;
-
     // Navigational Aids
     FGTACANList *channellist;
 
@@ -144,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;
@@ -190,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; }
@@ -326,15 +321,13 @@ public:
     }
 
     FGViewMgr *get_viewmgr() const;
-    FGViewer *get_current_view() const;
+    flightgear::View *get_current_view() const;
 
     FGControls *get_controls() const;
 
     FGScenery * get_scenery () const;
 
     FGTileMgr * get_tile_mgr () const;
-
-    inline FGFontCache *get_fontcache() const { return fontcache; }
   
     inline FGTACANList *get_channellist() const { return channellist; }
     inline void set_channellist( FGTACANList *c ) { channellist = c; }
@@ -349,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();