Support more complex article numbers

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

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index beab69a62ae387cf37b54745518472ac14ee0ef9..97a91e23ad2af63081f85b0aa7c62324e196fa29 100644 (file)
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -24,9 +24,9 @@ Catalogue::Catalogue():
 
 Catalogue::~Catalogue()
 {
-       for(map<unsigned, TrackType *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+       for(TrackMap::iterator i=tracks.begin(); i!=tracks.end(); ++i)
                delete i->second;
-       for(map<unsigned, VehicleType *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+       for(VehicleMap::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
                delete i->second;
 }
 
@@ -44,9 +44,9 @@ void Catalogue::add_track(TrackType &track)
        signal_track_added.emit(track);
 }
 
-const TrackType &Catalogue::get_track(unsigned art_nr) const
+const TrackType &Catalogue::get_track(const ArticleNumber &art_nr) const
 {
-       map<unsigned, TrackType *>::const_iterator i=tracks.find(art_nr);
+       TrackMap::const_iterator i=tracks.find(art_nr);
        if(i==tracks.end())
                throw KeyError("Unknown track type");
 
@@ -62,9 +62,9 @@ void Catalogue::add_vehicle(VehicleType &veh)
        signal_vehicle_added.emit(veh);
 }
 
-const VehicleType &Catalogue::get_vehicle(unsigned art_nr) const
+const VehicleType &Catalogue::get_vehicle(const ArticleNumber &art_nr) const
 {
-       map<unsigned, VehicleType *>::const_iterator i = vehicles.find(art_nr);
+       VehicleMap::const_iterator i = vehicles.find(art_nr);
        if(i==vehicles.end())
                throw KeyError("Unknown vehicle type");
 
@@ -80,8 +80,10 @@ Catalogue::Loader::Loader(Catalogue &c):
        add("layout", &Loader::layout);
        add("rail_profile", &Loader::rail_profile);
        add("scale", &Loader::scale);
-       add("track", &Loader::track);
-       add("vehicle", &Loader::vehicle);
+       add("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
+       add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
+       add("vehicle", static_cast<void (Loader::*)(unsigned)>(&Loader::vehicle));
+       add("vehicle", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::vehicle));
 }
 
 void Catalogue::Loader::ballast_profile()
@@ -113,6 +115,11 @@ void Catalogue::Loader::scale(float n, float d)
 }
 
 void Catalogue::Loader::track(unsigned art_nr)
+{
+       track(ArticleNumber(art_nr));
+}
+
+void Catalogue::Loader::track(ArticleNumber art_nr)
 {
        RefPtr<TrackType> trk = new TrackType(art_nr);
        load_sub(*trk);
@@ -121,6 +128,11 @@ void Catalogue::Loader::track(unsigned art_nr)
 }
 
 void Catalogue::Loader::vehicle(unsigned art_nr)
+{
+       vehicle(ArticleNumber(art_nr));
+}
+
+void Catalogue::Loader::vehicle(ArticleNumber art_nr)
 {
        RefPtr<VehicleType> veh = new VehicleType(art_nr);
        load_sub(*veh);