Substantial rewrite of FGNewMat, the material class. Most of the

[flightgear.git] / src / Network / protocol.cxx

diff --git a/src/Network/protocol.cxx b/src/Network/protocol.cxx
index 07fc52c6612d99ec0c3c585da84cf30f76ec7fdb..ea1e66678123bebd40ed28c96d3372a28acf8b5f 100644 (file)
--- a/src/Network/protocol.cxx
+++ b/src/Network/protocol.cxx
@@ -22,8 +22,8 @@
 
 
 #include <simgear/debug/logstream.hxx>
+#include <simgear/io/iochannel.hxx>
 
-#include "iochannel.hxx"
 #include "protocol.hxx"
 
 
@@ -42,15 +42,15 @@ FGProtocol::~FGProtocol() {
 // standard I/O channel open routine
 bool FGProtocol::open() {
     if ( is_enabled() ) {
-       FG_LOG( FG_IO, FG_ALERT, "This shouldn't happen, but the channel " 
+       SG_LOG( SG_IO, SG_ALERT, "This shouldn't happen, but the channel " 
                << "is already in use, ignoring" );
        return false;
     }
 
-    FGIOChannel *io = get_io_channel();
+    SGIOChannel *io = get_io_channel();
 
     if ( ! io->open( get_direction() ) ) {
-       FG_LOG( FG_IO, FG_ALERT, "Error opening channel communication layer." );
+       SG_LOG( SG_IO, SG_ALERT, "Error opening channel communication layer." );
        return false;
     }
 
@@ -62,21 +62,21 @@ bool FGProtocol::open() {
 
 // dummy process routine
 bool FGProtocol::process() {
-    FG_LOG( FG_IO, FG_INFO, "dummy FGProtocol::process()" );
+    SG_LOG( SG_IO, SG_INFO, "dummy FGProtocol::process()" );
     return false;
 }
 
 
 // dummy close routine
 bool FGProtocol::close() {
-    FG_LOG( FG_IO, FG_INFO, "dummy FGProtocol::close()" );
+    SG_LOG( SG_IO, SG_INFO, "dummy FGProtocol::close()" );
     return false;
 }
 
 
 // standard I/O channel close routine
 bool FGProtocol::gen_message() {
-    FGIOChannel *io = get_io_channel();
+    SGIOChannel *io = get_io_channel();
 
     set_enabled( false );
 
@@ -90,7 +90,7 @@ bool FGProtocol::gen_message() {
 
 // dummy close routine
 bool FGProtocol::parse_message() {
-    FG_LOG( FG_IO, FG_INFO, "dummy FGProtocol::close()" );
+    SG_LOG( SG_IO, SG_INFO, "dummy FGProtocol::close()" );
     return false;
 }