turn a few #include paths from the "foo" form to <foo>

[flightgear.git] / src / Cockpit / hud.hxx

diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx
index 69759dd4fdf86158d69360dd4f337d3afdff4b76..0ce27ec3003883ce621793cc2cb23a435f16090b 100644 (file)
--- a/src/Cockpit/hud.hxx
+++ b/src/Cockpit/hud.hxx
@@ -34,8 +34,8 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
+#ifdef __CYGWIN__
+#include <ieeefp.h>
 #endif
 
 #include <stdlib.h>
@@ -44,9 +44,11 @@
 #include <algorithm>    // for_each()
 #include <vector>       // STL vector
 #include <deque>        // STL double ended queue
-#include STL_FSTREAM
+#include <fstream>
 
-#include <osg/State>
+namespace osg {
+    class State;
+}
 
 #include <simgear/math/SGMath.hxx>
 #include <simgear/constants.h>
@@ -59,13 +61,11 @@
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
 #include <Main/viewmgr.hxx>
-#include <Airports/runways.hxx>
 
-#include <plib/sg.h>
+class FGRunway;
 
-SG_USING_STD(deque);
-SG_USING_STD(vector);
-SG_USING_NAMESPACE(std);
+using std::deque;
+using std::vector;
 
 #define float_to_int(v) SGMiscf::roundToInt(v)
 
@@ -367,7 +367,7 @@ extern fgLineList         HUD_LineList;
 extern fgLineList         HUD_StippleLineList;
 
 
-class instr_item {  // An Abstract Base Class (ABC)
+class instr_item : public SGReferenced {  // An Abstract Base Class (ABC)
 private:
     static UINT        instances;     // More than 64K instruments? Nah!
     static int         brightness;
@@ -508,7 +508,7 @@ private:
         bool drawLine(const sgdVec3& a1, const sgdVec3& a2,
                 const sgdVec3& p1, const sgdVec3& p2);
         void drawArrow();
-        bool get_active_runway(FGRunway& rwy);
+        FGRunway* get_active_runway();
         void get_rwy_points(sgdVec3 *points);
         void setLineWidth(void);
 
@@ -516,7 +516,7 @@ private:
         double mm[16],pm[16], arrowScale, arrowRad, lnScale;
         double scaleDist, default_pitch, default_heading;
         GLint view[4];
-        FGRunway runway;
+        FGRunway* runway;
         FGViewer* cockpit_view;
         unsigned short stippleOut, stippleCen;
         bool drawIA, drawIAAlways;