Simplify some interfaces by using track and block iterators

[r2c2.git] / source / libr2c2 / route.h

diff --git a/source/libr2c2/route.h b/source/libr2c2/route.h
index 5ea86be167781d3f4ca4b400b5f20bb3207c5a3c..e5164ce06a283f854d5ce2f7e1881bbac159610f 100644 (file)
--- a/source/libr2c2/route.h
+++ b/source/libr2c2/route.h
@@ -5,7 +5,7 @@
 #include <set>
 #include <string>
 #include <sigc++/trackable.h>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 
 namespace R2C2 {
 
@@ -39,7 +39,7 @@ class Route: public sigc::trackable
 public:
        typedef std::map<unsigned, int> TurnoutMap;
 
-       class Loader: public Msp::DataFile::BasicLoader<Route>
+       class Loader: public Msp::DataFile::ObjectLoader<Route>
        {
        private:
                TurnoutMap turnouts;
@@ -75,7 +75,7 @@ public:
        const std::map<unsigned, int> &get_turnouts() const { return turnouts; }
        void add_track(Track &);
        void add_tracks(const std::set<Track *> &);
-       void add_track_chain(Track &, unsigned, const TurnoutMap &);
+       void add_track_chain(const TrackIter &, const TurnoutMap &);
        const std::set<Track *> &get_tracks() const { return tracks; }
        bool has_track(Track &) const;
        void save(std::list<Msp::DataFile::Statement> &) const;