X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Flayout.h;h=e96bc951298c385d7906075238a092a738a5ff16;hb=e9653dffd0026fb3c02c91a4c0feca688a86c721;hp=f820cb5dc73e6c6fc05166ab6816de11b7922c06;hpb=f409cd39a687900724d987c9db629cbff0dd49be;p=r2c2.git

diff --git a/source/libmarklin/layout.h b/source/libmarklin/layout.h
index f820cb5..e96bc95 100644
--- a/source/libmarklin/layout.h
+++ b/source/libmarklin/layout.h
@@ -35,6 +35,7 @@ public:
 		Loader(Layout &);
 	private:
 		virtual void finish();
+		void route();
 		void route(const std::string &);
 		void track(unsigned);
 		void train(unsigned, unsigned);
@@ -57,7 +58,7 @@ private:
 	Driver *driver;
 	std::string base;
 	std::set<Track *> tracks;
-	std::map<std::string, Route *> routes;
+	std::set<Route *> routes;
 	std::set<Block *> blocks;
 	std::map<unsigned, Train *> trains;
 	std::set<Vehicle *> vehicles;
@@ -76,18 +77,17 @@ public:
 	void add_track(Track &);
 	const std::set<Track *> &get_tracks() const { return tracks; }
 	void remove_track(Track &);
-	unsigned allocate_turnout_id();
+	unsigned allocate_turnout_id(bool);
 
 	void add_block(Block &);
 	Block &get_block(unsigned) const;
-	Block &get_block_by_track(const Track &) const;
 	const std::set<Block *> &get_blocks() const { return blocks; }
 	void create_blocks();
-	void create_blocks(const Track &);
+	void create_blocks(Track &);
 	void remove_block(Block &);
 
 	void add_route(Route &);
-	const std::map<std::string, Route *> &get_routes() const { return routes; }
+	const std::set<Route *> &get_routes() const { return routes; }
 	Route &get_route(const std::string &) const;
 	void update_routes();
 	void remove_route(Route &);