Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Network / opengc.hxx

diff --git a/src/Network/opengc.hxx b/src/Network/opengc.hxx
index c7d1ac9d5fb3b573bbf4004c5f70b3d16bd95288..6371e1d0ae98bf91f3e4a2ac0fe313c22cdff95b 100644 (file)
--- a/src/Network/opengc.hxx
+++ b/src/Network/opengc.hxx
@@ -28,18 +28,20 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
-#include <FDM/flight.hxx>
 #include <Main/fg_props.hxx>
 
 #include "protocol.hxx"
 #include "opengc_data.hxx"
 
-class FGOpenGC : public FGProtocol, public FGInterface {
+class FlightProperties;
+
+class FGOpenGC : public FGProtocol
+{
 
     ogcFGData buf;
-    int length;
+    FlightProperties* fdm;
     
     // Environment
     SGPropertyNode_ptr press_node;
@@ -155,7 +157,7 @@ public:
     // close the channel
     bool close();
 
-    void collect_data( const FGInterface *fdm, ogcFGData *data );
+    void collect_data(ogcFGData *data );
 };
 
 #endif // _FG_OPENGC_HXX