Unify TrackChain names

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

diff --git a/source/libr2c2/block.h b/source/libr2c2/block.h
index c3b7c8742fe8faa247b5af2948c885eea7c522a7..86ad6ce593e0204ee7708fd3ad0a26560547e709 100644 (file)
--- a/source/libr2c2/block.h
+++ b/source/libr2c2/block.h
@@ -32,8 +32,8 @@ public:
 
 private:
        unsigned id;
-       unsigned sensor_id;
-       unsigned turnout_id;
+       unsigned sensor_addr;
+       unsigned turnout_addr;
        bool conflict;
        TrackCircuit *sensor;
        std::vector<Endpoint> endpoints;
@@ -43,14 +43,16 @@ public:
        Block(Layout &, Track &);
        ~Block();
 
+       virtual void set_name(const std::string &);
+
 private:
        virtual void on_track_added(Track &);
        virtual Validity check_validity(Track &) const;
 
 public:
        unsigned get_id() const { return id; }
-       unsigned get_sensor_id() const { return sensor_id; }
-       unsigned get_turnout_id() const { return turnout_id; }
+       unsigned get_sensor_address() const { return sensor_addr; }
+       unsigned get_turnout_address() const { return turnout_addr; }
        TrackCircuit *get_sensor() const { return sensor; }
        const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
        const Endpoint &get_endpoint(unsigned) const;