Add accessors adding things to a Catalogue from the outside

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

diff --git a/source/libmarklin/block.h b/source/libmarklin/block.h
index 770a3520289227830b37d40df45ce1d12ca83cc8..b72215ae03d1608092fd0c41943fdea7b7abeb54 100644 (file)
--- a/source/libmarklin/block.h
+++ b/source/libmarklin/block.h
@@ -25,7 +25,7 @@ public:
                Track *track;
                unsigned track_ep;
                Block *link;
-               unsigned routes;
+               unsigned paths;
 
                Endpoint(Track *, unsigned);
        };
@@ -42,21 +42,20 @@ private:
 public:
        Block(TrafficManager &, Track &);
 
+       unsigned get_id() const { return id; }
        unsigned get_sensor_id() const { return sensor_id; }
        unsigned get_turnout_id() const { return turnout_id; }
        const std::set<Track *> &get_tracks() const { return tracks; }
        const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
        int get_endpoint_by_link(const Block &) const;
-       int traverse(unsigned, float * =0) const;
+       unsigned traverse(unsigned, float * =0) const;
        void check_link(Block &);
        Block *get_link(unsigned) const;
        bool reserve(const Train *);
        const Train *get_train() const { return train; }
        void print_debug();
 private:
-       void find_routes(Track &, unsigned, unsigned, std::set<Track *> &);
-
-       static unsigned next_id;
+       void find_paths(Track &, unsigned, unsigned, std::set<Track *> &);
 };
 
 } // namespace Marklin