Change a few functions in Train to take Block reference instead of pointer

[r2c2.git] / source / libmarklin / train.h

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 3fc71316371bb5fb3a11d59ddb434005bccdc174..5f75a2a82bf837004352a7b537f841512a1f974d 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -90,9 +90,9 @@ public:
        const Route *get_route() const { return route; }
        const std::string &get_status() const { return status; }
        const Point &get_position() const { return pos; }
-       void place(Block *, unsigned);
-       bool free_block(Block *);
-       int get_entry_to_block(Block *) const;
+       void place(Block &, unsigned);
+       bool free_block(Block &);
+       int get_entry_to_block(Block &) const;
        void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
        void save(std::list<Msp::DataFile::Statement> &) const;
 private:
@@ -106,7 +106,7 @@ private:
        unsigned find_speed(float) const;
        void set_status(const std::string &);
        void set_position(const Block::Endpoint &);
-       void release_reserved_blocks();
+       void release_blocks(std::list<BlockRef> &);
 };
 
 } // namespace Marklin