X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fserial%2Fserial.h;h=b40a0b9136221746e1d2bd8f8fbdfc850356d3f4;hb=1ff06c5bc46a677fa389ef86c6b26664368f1653;hp=e03bb50d08c5e95bfc132d93957894b72067261c;hpb=9b05c573a38639827697fe393d55b7c76f5bde45;p=r2c2.git

diff --git a/source/serial/serial.h b/source/serial/serial.h
index e03bb50..b40a0b9 100644
--- a/source/serial/serial.h
+++ b/source/serial/serial.h
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -16,10 +16,10 @@ class Serial: public Msp::Application
 {
 private:
 	Msp::IO::EventDispatcher event_disp;
-	Marklin::Catalogue catalogue;
-	Marklin::Client client;
+	R2C2::Catalogue catalogue;
+	R2C2::Client client;
 	Msp::IO::Serial serial_port;
-	Marklin::NetTrain *train;
+	R2C2::NetTrain *train;
 	bool reverse;
 	char rx_buf[3];
 	unsigned rx_fill;
@@ -31,9 +31,9 @@ public:
 
 private:
 	virtual void tick();
-	void train_added(Marklin::NetTrain &);
+	void train_added(R2C2::NetTrain &);
 	void error(const std::string &);
-	void set_train(Marklin::NetTrain *);
+	void set_train(R2C2::NetTrain *);
 	void next_train();
 	void prev_train();
 	void data_available();