X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fcatalogue.h;h=4ce6fb1b712de8daa3d32f988d5ec5d43f0b6623;hb=6109a2122226e1c71e9cc71e4c21036e99e43601;hp=4179ea75aa339ceedb781d147d3338a33b152b52;hpb=447d621e93e71b710fed0920b473350122426b97;p=r2c2.git

diff --git a/source/libmarklin/catalogue.h b/source/libmarklin/catalogue.h
index 4179ea7..4ce6fb1 100644
--- a/source/libmarklin/catalogue.h
+++ b/source/libmarklin/catalogue.h
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef LIBMARKLIN_CATALOGUE_H_
 #define LIBMARKLIN_CATALOGUE_H_
 
@@ -12,13 +19,11 @@ class TrackType;
 class Catalogue
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public Msp::DataFile::BasicLoader<Catalogue>
 	{
 	public:
 		Loader(Catalogue &);
 	private:
-		Catalogue &cat;
-
 		void locomotive(unsigned);
 		void track(unsigned);
 	};
@@ -34,7 +39,6 @@ public:
 	const std::map<unsigned, TrackType *> &get_tracks() const { return tracks; }
 	LocoType &get_locomotive(unsigned) const;
 	const std::map<unsigned, LocoType *> &get_locomotives() const { return locos; }
-	void  load(const std::string &);
 };
 
 } // namespace Marklin