X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainproperties.h;h=8cd0b2f9c3d7e3d080e596cb13e3dda0c2fcae4d;hb=ca9d278f9472206ad9a01190dcef9f0eb1bcc274;hp=465154d2948789734672233ad7b0f39d8766978f;hpb=975ea87cc7be179618b06291cb2506a2523cad1f;p=r2c2.git

diff --git a/source/engineer/trainproperties.h b/source/engineer/trainproperties.h
index 465154d..8cd0b2f 100644
--- a/source/engineer/trainproperties.h
+++ b/source/engineer/trainproperties.h
@@ -1,16 +1,9 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef TRAINPROPERTIES_H_
 #define TRAINPROPERTIES_H_
 
 #include <msp/gltk/dropdown.h>
 #include <msp/gltk/entry.h>
-#include <libmarklin/train.h>
+#include <libr2c2/train.h>
 #include "dialog.h"
 
 class Engineer;
@@ -19,7 +12,7 @@ class TrainProperties: public Dialog
 {
 private:
 	Engineer &engineer;
-	Marklin::Train *train;
+	R2C2::Train *train;
 	Msp::GLtk::Entry *ent_addr;
 	Msp::GLtk::Dropdown *drp_protocol;
 	Msp::GLtk::Dropdown *drp_type;
@@ -27,16 +20,16 @@ private:
 	Msp::GLtk::Dropdown *drp_priority;
 	Msp::GLtk::List *lst_vehicles;
 	Msp::GLtk::Dropdown *drp_new_vehicle;
-	std::vector<const Marklin::VehicleType *> add_vehicles;
+	std::vector<const R2C2::VehicleType *> add_vehicles;
 	std::set<unsigned> rem_vehicles;
 
 public:
-	TrainProperties(Engineer &, Marklin::Train *);
+	TrainProperties(Engineer &, R2C2::Train *);
 private:
 	virtual void on_ok_clicked();
 	void new_vehicle_selected(unsigned, const std::string &);
 	void remove_vehicle_clicked();
-	const Marklin::VehicleType &get_vehicle_type(unsigned, bool);
+	const R2C2::VehicleType &get_vehicle_type(unsigned, bool);
 };
 
 #endif