X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fcatalogue.cpp;h=55a5a440a3903efbff54e86b61dc8fa7382e654d;hb=6dc18b0e518407bd2a86602bae1e9bbae05da7c8;hp=c8ed80c9c137703901238b266f0f052746d3c361;hpb=3e9c210ddc036cd015228504cc0803c909e27f84;p=r2c2.git

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index c8ed80c..55a5a44 100644
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -1,7 +1,7 @@
 /* $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
 */
 
@@ -20,6 +20,8 @@ Catalogue::~Catalogue()
 {
 	for(map<unsigned, TrackType *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		delete i->second;
+	for(map<unsigned, LocoType *>::iterator i=locos.begin(); i!=locos.end(); ++i)
+		delete i->second;
 }
 
 TrackType &Catalogue::get_track(unsigned art_nr) const
@@ -40,45 +42,32 @@ LocoType &Catalogue::get_locomotive(unsigned art_nr) const
 	return *i->second;
 }
 
-void Catalogue::load(const string &fn)
-{
-	IO::File in(fn.c_str());
-
-	DataFile::Parser parser(in, fn);
-	Loader loader(*this);
-	loader.load(parser);
-}
-
 
 Catalogue::Loader::Loader(Catalogue &c):
-	cat(c)
+	DataFile::BasicLoader<Catalogue>(c)
 {
 	add("locomotive", &Loader::locomotive);
 	add("track", &Loader::track);
 }
 
-void Catalogue::Loader::locomotive(unsigned art_no)
+void Catalogue::Loader::locomotive(unsigned art_nr)
 {
-	map<unsigned, LocoType *>::iterator i=cat.locos.find(art_no);
-	if(i!=cat.locos.end())
+	if(obj.locos.count(art_nr))
 		throw Exception("Duplicate locomotive number");
 
-	RefPtr<LocoType> loco=new LocoType(art_no);
+	RefPtr<LocoType> loco = new LocoType(art_nr);
 	load_sub(*loco);
-	unsigned art_nr=loco->get_article_number();
-	cat.locos[art_nr]=loco.release();
+	obj.locos[art_nr] = loco.release();
 }
 
-void Catalogue::Loader::track(unsigned art_no)
+void Catalogue::Loader::track(unsigned art_nr)
 {
-	map<unsigned, TrackType *>::iterator i=cat.tracks.find(art_no);
-	if(i!=cat.tracks.end())
+	if(obj.tracks.count(art_nr))
 		throw Exception("Duplicate track number");
 
-	RefPtr<TrackType> trk=new TrackType(art_no);
+	RefPtr<TrackType> trk = new TrackType(art_nr);
 	load_sub(*trk);
-	unsigned art_nr=trk->get_article_number();
-	cat.tracks[art_nr]=trk.release();
+	obj.tracks[art_nr] = trk.release();
 }
 
 } // namespace Marklin