Fix for bug 1304 - crash loading XML route

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

diff --git a/src/Network/props.hxx b/src/Network/props.hxx
index 866baefbd19ae75fb2aa4b9c62cea315d5b59d97..9e7405583ee3480df5d59338a06db61c1bfbb0fa 100644 (file)
--- a/src/Network/props.hxx
+++ b/src/Network/props.hxx
@@ -4,7 +4,7 @@
 // Written by Curtis Olson, started September 2000.
 // Modified by Bernie Bright, May 2002.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -18,7 +18,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -27,13 +27,10 @@
 #define _FG_PROPS_HXX
 
 #include <simgear/compiler.h>
-#include STL_STRING
+#include <string>
 #include <vector>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
-
-#include <plib/netChannel.h>
+#include <simgear/io/sg_netChannel.hxx>
 
 #include "protocol.hxx"
 
@@ -43,7 +40,8 @@ SG_USING_STD(vector);
  * FlightGear properties.
  */
 class FGProps : public FGProtocol,
-               public netChannel
+               public simgear::NetChannel,
+               public SGPropertyChangeListener // for subscriptions
 {
 private:
 
@@ -51,14 +49,14 @@ private:
      * Server port to listen on.
      */
     int port;
-
+    simgear::NetChannelPoller poller;
 public:
     /**
      * Create a new TCP server.
      * 
      * @param tokens Tokenized configuration parameters
      */
-    FGProps( const vector<string>& tokens );
+    FGProps( const std::vector<std::string>& tokens );
 
     /**
      * Destructor.