X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Flocotype.h;h=8234c4f45d1e85a661462c9bf46b9319a9d01d21;hb=d3907f4b0e60f246a53201b93b06e86062f1b48a;hp=190422ee7ec0b39a67f82169866c98c7646f78be;hpb=3e9c210ddc036cd015228504cc0803c909e27f84;p=r2c2.git

diff --git a/source/libmarklin/locotype.h b/source/libmarklin/locotype.h
index 190422e..8234c4f 100644
--- a/source/libmarklin/locotype.h
+++ b/source/libmarklin/locotype.h
@@ -1,28 +1,24 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #ifndef LIBMARKLIN_LOCOTYPE_H_
 #define LIBMARKLIN_LOCOTYPE_H_
 
-#include <msp/datafile/loader.h>
+#include "vehicletype.h"
 
 namespace Marklin {
 
-class LocoType
+class LocoType: public VehicleType
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public VehicleType::Loader
 	{
-	private:
-		LocoType &ltype;
-
 	public:
 		Loader(LocoType &);
-		LocoType &get_object() const { return ltype; }
 	private:
 		void function(unsigned, const std::string &);
 	};
@@ -34,8 +30,7 @@ private:
 
 public:
 	LocoType(unsigned);
-	unsigned get_article_number() const { return art_nr; }
-	const std::string &get_name() const { return name; }
+	unsigned get_max_function() const;
 	const std::map<unsigned, std::string> &get_functions() const { return funcs; }
 };