Remove deprecated datafile statement aliases

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

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 46a43a8353fffd8cccc266f418dbaa7bb117bcd3..40863237081c9677a6451eadf29de9584f51bf80 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -503,17 +503,12 @@ Layout::Loader::Loader(Layout &l):
        new_tracks(false)
 {
        add("base",  &Layout::base);
-       add("route", static_cast<void (Loader::*)()>(&Loader::route));
+       add("route", &Loader::route);
        add("signal", &Loader::signal);
-       add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
-       add("train", static_cast<void (Loader::*)(ArticleNumber, unsigned, const std::string &)>(&Loader::train));
+       add("track", &Loader::track);
+       add("train", &Loader::train);
        add("turnout", &Loader::turnout);
        add("zone",  &Loader::zone);
-
-       // Deprecated aliases
-       add("route", static_cast<void (Loader::*)(const string &)>(&Loader::route));
-       add("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
-       add("train", static_cast<void (Loader::*)(unsigned, unsigned, const std::string &)>(&Loader::train));
 }
 
 void Layout::Loader::route()
@@ -522,24 +517,12 @@ void Layout::Loader::route()
        load_sub(*rte);
 }
 
-void Layout::Loader::route(const string &n)
-{
-       Route *rte = new Route(obj);
-       rte->set_name(n);
-       load_sub(*rte);
-}
-
 void Layout::Loader::signal(ArticleNumber art_nr)
 {
        Signal *sig = new Signal(obj, obj.catalogue.get_signal(art_nr));
        load_sub(*sig);
 }
 
-void Layout::Loader::track(unsigned art_nr)
-{
-       track(ArticleNumber(art_nr));
-}
-
 void Layout::Loader::track(ArticleNumber art_nr)
 {
        Track *trk = new Track(obj, obj.catalogue.get_track(art_nr));
@@ -551,11 +534,6 @@ void Layout::Loader::track(ArticleNumber art_nr)
                        trk->link_to(**i);
 }
 
-void Layout::Loader::train(unsigned art_nr, unsigned addr, const std::string &proto)
-{
-       train(ArticleNumber(art_nr), addr, proto);
-}
-
 void Layout::Loader::train(ArticleNumber art_nr, unsigned addr, const std::string &proto)
 {
        Train *trn = new Train(obj, obj.catalogue.get_vehicle(art_nr), addr, proto);