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

diff --git a/source/serial/serial.h b/source/serial/serial.h
index e03bb50..d2ae4dd 100644
--- a/source/serial/serial.h
+++ b/source/serial/serial.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef SERIAL_H_
 #define SERIAL_H_
 
@@ -12,28 +5,26 @@ Distributed under the GPL
 #include <msp/io/serial.h>
 #include "network/client.h"
 
-class Serial: public Msp::Application
+class Serial: public Msp::RegisteredApplication<Serial>
 {
 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;
 
-	static Msp::Application::RegApp<Serial> reg;
-
 public:
 	Serial(int, char **);
 
 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();