Change terminology to better distinguish routes on the layout from paths across track...

[r2c2.git] / source / libmarklin / catalogue.cpp

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index 1b181dffc0ec856ba76f87a6af54f8697971c968..55a5a440a3903efbff54e86b61dc8fa7382e654d 100644 (file)
--- 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
@@ -53,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)
@@ -63,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