X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Flayout.h;h=1ec1012c431d098c9ef1078fa621b2302f8bd53f;hb=8e3009751ee81e0e5312cae53ee844bdd9e49628;hp=4e7bcd96ce83a8da61cd1396cfab41d90168cd3a;hpb=707a611dae600333f3a9bd6421176f242fe49907;p=r2c2.git

diff --git a/source/libmarklin/layout.h b/source/libmarklin/layout.h
index 4e7bcd9..1ec1012 100644
--- a/source/libmarklin/layout.h
+++ b/source/libmarklin/layout.h
@@ -15,6 +15,7 @@ Distributed under the GPL
 
 namespace Marklin {
 
+class ArticleNumber;
 class Block;
 class Catalogue;
 class Driver;
@@ -38,7 +39,9 @@ public:
 		void route();
 		void route(const std::string &);
 		void track(unsigned);
+		void track(ArticleNumber);
 		void train(unsigned, unsigned);
+		void train(ArticleNumber, unsigned);
 	};
 
 public:
@@ -77,14 +80,13 @@ 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 &);