From 0c8c8380b1037ca52725e4703cf87ffb6aee77eb Mon Sep 17 00:00:00 2001
From: jmt <jmt>
Date: Sat, 19 Sep 2009 18:41:55 +0000
Subject: [PATCH] Break viewmgr.hxx dependency on on viewer.hxx.

---
 src/Cockpit/cockpit.cxx         |  1 +
 src/Cockpit/hud.cxx             |  1 +
 src/Cockpit/hud_ladr.cxx        |  2 +-
 src/Cockpit/hud_rwy.cxx         |  1 +
 src/Cockpit/panel.cxx           |  1 +
 src/Instrumentation/HUD/HUD.cxx |  1 +
 src/Main/fg_commands.cxx        |  1 +
 src/Main/main.cxx               |  2 +-
 src/Main/options.cxx            |  2 +-
 src/Main/renderer.cxx           |  1 +
 src/Main/viewmgr.cxx            | 58 +++++++++++++++++++++++++++++++++
 src/Main/viewmgr.hxx            | 49 +++++++---------------------
 12 files changed, 79 insertions(+), 41 deletions(-)

diff --git a/src/Cockpit/cockpit.cxx b/src/Cockpit/cockpit.cxx
index 4e7651f7c..0414a0f6a 100644
--- a/src/Cockpit/cockpit.cxx
+++ b/src/Cockpit/cockpit.cxx
@@ -44,6 +44,7 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/viewmgr.hxx>
+#include <Main/viewer.hxx>
 #include <Scenery/scenery.hxx>
 #include <GUI/gui.h>
 
diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx
index f9b9f3a97..6673184e4 100644
--- a/src/Cockpit/hud.cxx
+++ b/src/Cockpit/hud.cxx
@@ -48,6 +48,7 @@
 #include <Main/globals.hxx>
 #include <Scenery/scenery.hxx>
 #include <Airports/runways.hxx>
+#include <Main/viewer.hxx>
 
 #include "hud.hxx"
 
diff --git a/src/Cockpit/hud_ladr.cxx b/src/Cockpit/hud_ladr.cxx
index e2306b427..38def8d9d 100644
--- a/src/Cockpit/hud_ladr.cxx
+++ b/src/Cockpit/hud_ladr.cxx
@@ -6,7 +6,7 @@
 
 #include "hud.hxx"
 #include "panel.hxx"
-
+#include <Main/viewer.hxx>
 
 // FIXME
 extern float get_roll(void);
diff --git a/src/Cockpit/hud_rwy.cxx b/src/Cockpit/hud_rwy.cxx
index d4b56356b..2bc15bcd1 100644
--- a/src/Cockpit/hud_rwy.cxx
+++ b/src/Cockpit/hud_rwy.cxx
@@ -31,6 +31,7 @@
 #include <Environment/environment.hxx>
 #include <Environment/environment_mgr.hxx>
 #include <ATCDCL/ATCutils.hxx>
+#include <Main/viewer.hxx>
 
 #include <osg/GLU>
 
diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index cd68b342a..43711d529 100644
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -55,6 +55,7 @@
 #include <Main/viewmgr.hxx>
 #include <Time/light.hxx>
 #include <GUI/new_gui.hxx>	// FGFontCache
+#include <Main/viewer.hxx>
 
 #include "hud.hxx"
 #include "panel.hxx"
diff --git a/src/Instrumentation/HUD/HUD.cxx b/src/Instrumentation/HUD/HUD.cxx
index 65543dea3..d37f28a3d 100644
--- a/src/Instrumentation/HUD/HUD.cxx
+++ b/src/Instrumentation/HUD/HUD.cxx
@@ -35,6 +35,7 @@
 
 #include <Main/globals.hxx>
 #include <Main/viewmgr.hxx>
+#include <Main/viewer.hxx>
 
 #include "HUD.hxx"
 
diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index e92cb0f52..3f36555a0 100644
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -47,6 +47,7 @@
 #include "util.hxx"
 #include "viewmgr.hxx"
 #include "main.hxx"
+#include <Main/viewer.hxx>
 
 using std::string;
 using std::ifstream;
diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index a982888c0..7937a6661 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -81,7 +81,7 @@
 #include "fg_init.hxx"
 #include "fg_os.hxx"
 #include "WindowSystemAdapter.hxx"
-
+#include <Main/viewer.hxx>
 
 static double real_delta_time_sec = 0.0;
 double delta_time_sec = 0.0;
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 26054af82..ad17068e6 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -60,7 +60,7 @@
 #include "options.hxx"
 #include "util.hxx"
 #include "viewmgr.hxx"
-
+#include <Main/viewer.hxx>
 
 using std::string;
 using std::sort;
diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx
index 7bde729aa..ef3fe6e10 100644
--- a/src/Main/renderer.cxx
+++ b/src/Main/renderer.cxx
@@ -99,6 +99,7 @@
 #include "main.hxx"
 #include "CameraGroup.hxx"
 #include "FGEventHandler.hxx"
+#include <Main/viewer.hxx>
 
 using namespace osg;
 using namespace simgear;
diff --git a/src/Main/viewmgr.cxx b/src/Main/viewmgr.cxx
index fd6f25fd9..596f343ae 100644
--- a/src/Main/viewmgr.cxx
+++ b/src/Main/viewmgr.cxx
@@ -341,6 +341,64 @@ FGViewMgr::copyToCurrent()
                 get_current_view()->getInternal());
 }
 
+void FGViewMgr::clear()
+{
+  views.clear();
+}
+
+FGViewer*
+FGViewMgr::get_current_view()
+{
+	if ( current < (int)views.size() ) {
+	    return views[current];
+	} else {
+	    return NULL;
+	}
+}
+
+const FGViewer*
+FGViewMgr::get_current_view() const
+{
+	if ( current < (int)views.size() ) {
+	    return views[current];
+	} else {
+	    return NULL;
+	}
+}
+
+
+FGViewer*
+FGViewMgr::get_view( int i )
+{
+	if ( i < 0 ) { i = 0; }
+	if ( i >= (int)views.size() ) { i = views.size() - 1; }
+	return views[i];
+}
+
+const FGViewer*
+FGViewMgr::get_view( int i ) const
+{
+	if ( i < 0 ) { i = 0; }
+	if ( i >= (int)views.size() ) { i = views.size() - 1; }
+	return views[i];
+}
+
+FGViewer*
+FGViewMgr::next_view()
+{
+	setView((current+1 < (int)views.size()) ? (current + 1) : 0);
+	view_number->fireValueChanged();
+	return views[current];
+}
+
+FGViewer*
+FGViewMgr::prev_view()
+{
+	setView((0 < current) ? (current - 1) : (views.size() - 1));
+	view_number->fireValueChanged();
+	return views[current];
+}
+
 void
 FGViewMgr::add_view( FGViewer * v )
 {
diff --git a/src/Main/viewmgr.hxx b/src/Main/viewmgr.hxx
index 8053a1a9d..2955ac845 100644
--- a/src/Main/viewmgr.hxx
+++ b/src/Main/viewmgr.hxx
@@ -30,8 +30,6 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/math/SGMath.hxx>
 
-#include <Main/viewer.hxx> // FIXME - remove inlines here.
-
 // forward decls
 class FGViewer;
 typedef SGSharedPtr<FGViewer> FGViewerPtr;
@@ -57,43 +55,18 @@ public:
     // getters
     inline int size() const { return views.size(); }
     inline int get_current() const { return current; }
-    inline FGViewer *get_current_view() {
-	if ( current < (int)views.size() ) {
-	    return views[current];
-	} else {
-	    return NULL;
-	}
-    }
-    inline const FGViewer *get_current_view() const {
-	if ( current < (int)views.size() ) {
-	    return views[current];
-	} else {
-	    return NULL;
-	}
-    }
-    inline FGViewer *get_view( int i ) {
-	if ( i < 0 ) { i = 0; }
-	if ( i >= (int)views.size() ) { i = views.size() - 1; }
-	return views[i];
-    }
-    inline const FGViewer *get_view( int i ) const {
-	if ( i < 0 ) { i = 0; }
-	if ( i >= (int)views.size() ) { i = views.size() - 1; }
-	return views[i];
-    }
-    inline FGViewer *next_view() {
-	setView((current+1 < (int)views.size()) ? (current + 1) : 0);
-	view_number->fireValueChanged();
-	return views[current];
-    }
-    inline FGViewer *prev_view() {
-	setView((0 < current) ? (current - 1) : (views.size() - 1));
-	view_number->fireValueChanged();
-	return views[current];
-    }
-
+    
+    FGViewer *get_current_view();
+    const FGViewer *get_current_view() const;
+    
+    FGViewer *get_view( int i ); 
+    const FGViewer *get_view( int i ) const;
+      
+    FGViewer *next_view();
+    FGViewer *prev_view();
+      
     // setters
-    inline void clear() { views.clear(); }
+    void clear();
     inline void set_view( const int v ) { current = v; }
     void add_view( FGViewer * v );