Strip Id tags and copyright notices from files

[r2c2.git] / source / network / train.h

diff --git a/source/network/train.h b/source/network/train.h
index 74c6ccb6cae38d28d3216f0ed6d6dd53cc5dd7b7..948af2f82b5dfc45d94da55e8bcfcdcc139559ac 100644 (file)
--- a/source/network/train.h
+++ b/source/network/train.h
@@ -1,18 +1,11 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2009  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
-#ifndef MARKLINNET_TRAIN_H_
-#define MARKLINNET_TRAIN_H_
+#ifndef R2C2_NET_TRAIN_H_
+#define R2C2_NET_TRAIN_H_
 
 #include <sigc++/signal.h>
-#include "libmarklin/locotype.h"
+#include "libr2c2/vehicletype.h"
 #include "packets.h"
 
-namespace Marklin {
+namespace R2C2 {
 
 class Client;
 
@@ -27,7 +20,7 @@ public:
 
 private:
        Client &client;
-       const LocoType &loco_type;
+       const VehicleType &loco_type;
        unsigned address;
        std::string name;
        std::map<std::string, float> controls;
@@ -38,7 +31,7 @@ private:
 public:
        NetTrain(Client &, const TrainInfoPacket &);
 
-       const LocoType &get_loco_type() const { return loco_type; }
+       const VehicleType &get_loco_type() const { return loco_type; }
        unsigned get_address() const { return address; }
        const std::string &get_name() const { return name; }
        void set_control(const std::string &, float);
@@ -54,6 +47,6 @@ public:
        void process_packet(const TrainStatusPacket &);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif