Make use of the unified storage class for other parts of Layout

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

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index f9a2ba1bd5f7cf73f06dbd39956c0afa4166cffb..204a60f6d90b9e64718386cbeb384c3f511fa570 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -18,6 +18,7 @@ class Object;
 class Route;
 class Signal;
 class Track;
+class TrackChain;
 class Train;
 class Vehicle;
 class Zone;
@@ -68,15 +69,12 @@ private:
        };
 
 public:
-       typedef std::set<Zone *> ZoneSet;
        typedef std::vector<Zone *> ZoneArray;
 
        sigc::signal<void, Object &> signal_object_added;
        sigc::signal<void, Object &> signal_object_removed;
-       sigc::signal<void, Route &> signal_route_added;
-       sigc::signal<void, Route &> signal_route_removed;
-       sigc::signal<void, Zone &> signal_zone_added;
-       sigc::signal<void, Zone &> signal_zone_removed;
+       sigc::signal<void, TrackChain &> signal_track_chain_added;
+       sigc::signal<void, TrackChain &> signal_track_chain_removed;
        sigc::signal<void, Train &> signal_train_added;
        sigc::signal<void, Train &> signal_train_removed;
        sigc::signal<void, Block &, Train *> signal_block_reserved;
@@ -88,10 +86,8 @@ private:
        Driver *driver;
        std::string base;
        Storage<Object> objects;
-       std::set<Route *> routes;
-       ZoneSet zones;
-       std::set<Block *> blocks;
-       std::set<Sensor *> sensors;
+       Storage<TrackChain> track_chains;
+       Storage<Sensor> sensors;
        std::map<unsigned, Train *> trains;
        Msp::Time::TimeStamp last_tick;
        unsigned next_turnout_id;
@@ -107,6 +103,9 @@ public:
 
        void add(Object &);
        void add(Track &);
+       void add(TrackChain &);
+       void add(Block &);
+       void add(Sensor &);
 
        template<typename T>
        const std::set<T *> &get_all() const;
@@ -116,36 +115,26 @@ public:
 
        void remove(Object &);
        void remove(Track &);
+       void remove(TrackChain &);
+       void remove(Sensor &);
 
        unsigned allocate_turnout_id();
 
-       void add_block(Block &);
        Block &get_block(unsigned) const;
-       const std::set<Block *> &get_blocks() const { return blocks; }
        void create_blocks();
        void create_blocks(Track &);
-       void remove_block(Block &);
 
-       void add_route(Route &);
-       const std::set<Route *> &get_routes() const { return routes; }
        Route &get_route(const std::string &) const;
        void update_routes();
-       void remove_route(Route &);
 
-       void add_zone(Zone &);
-       const ZoneSet &get_zones() const { return zones; }
        ZoneArray get_zones(const std::string &) const;
        Zone &get_zone(const std::string &, unsigned) const;
-       void remove_zone(Zone &);
 
        void add_train(Train &);
        Train &get_train(unsigned) const;
        const std::map<unsigned, Train *> &get_trains() const { return trains; }
        void remove_train(Train &);
 
-       void add_sensor(Sensor &);
-       void remove_sensor(Sensor &);
-
        void tick();
        void emergency(const std::string &);