X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fblock.h;h=7c0f8ac2aff063f1c4bee3558df8119a3cb4cb49;hb=c47f3fad07af11210c9cbd65d87964794189065e;hp=68c57b88e39c102f8d38e5f8b75f00c93fd51afd;hpb=7839b7c3d782abb5c98a24d51cae109407068c02;p=r2c2.git

diff --git a/source/libmarklin/block.h b/source/libmarklin/block.h
index 68c57b8..7c0f8ac 100644
--- a/source/libmarklin/block.h
+++ b/source/libmarklin/block.h
@@ -22,22 +22,22 @@ class Block
 public:
 	struct Endpoint
 	{
-		Track    *track;
+		Track *track;
 		unsigned track_ep;
-		Block    *link;
-		unsigned routes;
+		Block *link;
+		unsigned paths;
 
 		Endpoint(Track *, unsigned);
 	};
 
 private:
 	TrafficManager &trfc_mgr;
-	unsigned       id;
-	unsigned       sensor_id;
-	unsigned       turnout_id;
-	std::set<Track *>     tracks;
+	unsigned id;
+	unsigned sensor_id;
+	unsigned turnout_id;
+	std::set<Track *> tracks;
 	std::vector<Endpoint> endpoints;
-	const Train    *train;
+	const Train *train;
 
 public:
 	Block(TrafficManager &, Track &);
@@ -47,14 +47,14 @@ public:
 	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 *> &);
+	void find_paths(Track &, unsigned, unsigned, std::set<Track *> &);
 
 	static unsigned next_id;
 };