X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fcatalogue.cpp;h=55a5a440a3903efbff54e86b61dc8fa7382e654d;hb=a448b6ac73e0eb19980e69b095136eabe95d2534;hp=1b181dffc0ec856ba76f87a6af54f8697971c968;hpb=65cbaf88a03497df08243ac27354b0c0ea1f640b;p=r2c2.git diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp index 1b181df..55a5a44 100644 --- a/source/libmarklin/catalogue.cpp +++ b/source/libmarklin/catalogue.cpp @@ -20,6 +20,8 @@ Catalogue::~Catalogue() { for(map::iterator i=tracks.begin(); i!=tracks.end(); ++i) delete i->second; + for(map::iterator i=locos.begin(); i!=locos.end(); ++i) + delete i->second; } TrackType &Catalogue::get_track(unsigned art_nr) const @@ -53,9 +55,9 @@ void Catalogue::Loader::locomotive(unsigned art_nr) if(obj.locos.count(art_nr)) throw Exception("Duplicate locomotive number"); - RefPtr loco=new LocoType(art_nr); + RefPtr 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) @@ -63,9 +65,9 @@ void Catalogue::Loader::track(unsigned art_nr) if(obj.tracks.count(art_nr)) throw Exception("Duplicate track number"); - RefPtr trk=new TrackType(art_nr); + RefPtr trk = new TrackType(art_nr); load_sub(*trk); - obj.tracks[art_nr]=trk.release(); + obj.tracks[art_nr] = trk.release(); } } // namespace Marklin