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

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index 8faaa10..55a5a44 100644
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -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,15 +42,6 @@ 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):
 	DataFile::BasicLoader<Catalogue>(c)
@@ -62,9 +55,9 @@ void Catalogue::Loader::locomotive(unsigned art_nr)
 	if(obj.locos.count(art_nr))
 		throw Exception("Duplicate locomotive number");
 
-	RefPtr<LocoType> loco=new LocoType(art_nr);
+	RefPtr<LocoType> loco = new LocoType(art_nr);
 	load_sub(*loco);
-	obj.locos[art_nr]=loco.release();
+	obj.locos[art_nr] = loco.release();
 }
 
 void Catalogue::Loader::track(unsigned art_nr)
@@ -72,9 +65,9 @@ void Catalogue::Loader::track(unsigned art_nr)
 	if(obj.tracks.count(art_nr))
 		throw Exception("Duplicate track number");
 
-	RefPtr<TrackType> trk=new TrackType(art_nr);
+	RefPtr<TrackType> trk = new TrackType(art_nr);
 	load_sub(*trk);
-	obj.tracks[art_nr]=trk.release();
+	obj.tracks[art_nr] = trk.release();
 }
 
 } // namespace Marklin