Merge branch 'work4' into next

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

diff --git a/src/Network/lfsglass.hxx b/src/Network/lfsglass.hxx
index 6a496f984d054c7a3ef5b6bd965f86054222a8f4..6844ed3784181e81accd3f358cff64ce977f26fa 100644 (file)
--- a/src/Network/lfsglass.hxx
+++ b/src/Network/lfsglass.hxx
@@ -28,15 +28,14 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
-#include <FDM/flight.hxx>
 #include <Main/fg_props.hxx>
 
 #include "protocol.hxx"
 #include "lfsglass_data.hxx"
 
-class FGLFSGlass : public FGProtocol, public FGInterface {
+class FGLFSGlass : public FGProtocol {
 
     FGLFSGlassData buf;
     int length;
@@ -155,7 +154,7 @@ public:
     // close the channel
     bool close();
 
-    void collect_data( const FGInterface *fdm, FGLFSGlassData *data );
+    void collect_data(FGLFSGlassData *data );
 };
 
 #endif // _FG_LFSGlass_HXX