Remove deprecated datafile statement aliases

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

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index 0d62d72a85c6076eabc85cf4c0a4c5708596848c..ec3e95a7d00a2ed45c222a2932c9d5c66491d1ab 100644 (file)
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -75,11 +75,9 @@ Catalogue::Loader::Loader(Catalogue &c):
        add("rail_profile", &Loader::rail_profile);
        add("scale", &Loader::scale);
        add("signal", &Loader::signal);
-       add("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
-       add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
+       add("track", &Loader::track);
        add("track_technique", &Catalogue::track_technique);
-       add("vehicle", static_cast<void (Loader::*)(unsigned)>(&Loader::vehicle));
-       add("vehicle", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::vehicle));
+       add("vehicle", &Loader::vehicle);
 }
 
 void Catalogue::Loader::ballast_profile()
@@ -120,11 +118,6 @@ void Catalogue::Loader::signal(ArticleNumber art_nr)
        obj.add_signal(*sig.release());
 }
 
-void Catalogue::Loader::track(unsigned art_nr)
-{
-       track(ArticleNumber(art_nr));
-}
-
 void Catalogue::Loader::track(ArticleNumber art_nr)
 {
        if(obj.tracks.count(art_nr))
@@ -135,11 +128,6 @@ void Catalogue::Loader::track(ArticleNumber art_nr)
        obj.add_track(*trk.release());
 }
 
-void Catalogue::Loader::vehicle(unsigned art_nr)
-{
-       vehicle(ArticleNumber(art_nr));
-}
-
 void Catalogue::Loader::vehicle(ArticleNumber art_nr)
 {
        if(obj.vehicles.count(art_nr))