X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fclient.h;h=02295dfa32690aeb9a2d2610269fd4132ce83254;hb=b41c7409da959420aed91e8a2e1fdab95ef473c4;hp=39c7eb035c16ae82bacab2a12f2f7c803e34276c;hpb=2e3ad91af312aaf20b10f1cbe6096cda7e8a97d1;p=r2c2.git

diff --git a/source/network/client.h b/source/network/client.h
index 39c7eb0..02295df 100644
--- a/source/network/client.h
+++ b/source/network/client.h
@@ -1,25 +1,25 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2009  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
-#ifndef MARKLINNET_CLIENT_H_
-#define MARKLINNET_CLIENT_H_
+#ifndef R2C2_NET_CLIENT_H_
+#define R2C2_NET_CLIENT_H_
 
 #include <msp/io/eventdispatcher.h>
 #include <msp/net/communicator.h>
-#include "libmarklin/catalogue.h"
+#include "libr2c2/catalogue.h"
 #include "packets.h"
 #include "protocol.h"
 #include "train.h"
 
-namespace Marklin {
+namespace R2C2 {
 
 class Client: public Msp::Net::PacketReceiver<TrainInfoPacket>,
-	Msp::Net::PacketReceiver<TrainSpeedPacket>,
 	Msp::Net::PacketReceiver<TrainFunctionPacket>,
+	Msp::Net::PacketReceiver<TrainControlPacket>,
 	Msp::Net::PacketReceiver<TrainStatusPacket>,
 	Msp::Net::PacketReceiver<RouteInfoPacket>,
 	Msp::Net::PacketReceiver<TrainRoutePacket>,
@@ -56,7 +56,7 @@ public:
 
 private:
 	virtual void receive(const TrainInfoPacket &);
-	virtual void receive(const TrainSpeedPacket &);
+	virtual void receive(const TrainControlPacket &);
 	virtual void receive(const TrainFunctionPacket &);
 	virtual void receive(const TrainStatusPacket &);
 	virtual void receive(const RouteInfoPacket &);
@@ -64,6 +64,6 @@ private:
 	virtual void receive(const ErrorPacket &);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif