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 4951792c98ba77b59883300b8dbe70c813284d60..2d83bcaedbd7875f3482a4672937e372c554698b 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -61,14 +61,17 @@ class FGRouteMgr;
 class FGScenery;
 class FGTileMgr;
 class FGViewMgr;
-class FGViewer;
 class FGRenderer;
-class FGSampleQueue;
 
 namespace simgear { namespace pkg {
   class Root;
 }}
 
+namespace flightgear
+{
+    class View;
+}
+
 /**
  * Bucket for subsystem pointers representing the sim's state.
  */
@@ -140,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;
@@ -320,7 +321,7 @@ public:
     }
 
     FGViewMgr *get_viewmgr() const;
-    FGViewer *get_current_view() const;
+    flightgear::View *get_current_view() const;
 
     FGControls *get_controls() const;
 
@@ -341,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();