Simplify some interfaces by using track and block iterators

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

diff --git a/source/libr2c2/timetable.h b/source/libr2c2/timetable.h
index 9c9970590ec94245f5cc829d9865834e82779a92..84a39cd9c92d04de396638baa84c0f9bc999fe07 100644 (file)
--- a/source/libr2c2/timetable.h
+++ b/source/libr2c2/timetable.h
@@ -29,7 +29,6 @@ public:
                void route(const std::string &);
                void reverse();
                void speed(unsigned);
-               void tag(const std::string &);
                void travel_to(unsigned);
                void travel_past(unsigned);
                void wait(unsigned);
@@ -98,13 +97,13 @@ public:
        void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
        void save(std::list<Msp::DataFile::Statement> &) const;
 private:
-       Track &get_sensor(unsigned);
+       Block &get_sensor(unsigned);
        Track &get_turnout(unsigned);
        Zone &get_zone(const std::string &);
        void block_state_changed(Block &, Block::State);
        void block_reserved(Block &, Train *);
        void train_advanced(Block &);
-       void train_arrived();
+       void event(TrainAI &, const Message &);
 };
 
 } // namespace R2C2