X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Froute.h;h=0b036371e2cf29bb922249015e8dad9f6f265440;hb=8e3009751ee81e0e5312cae53ee844bdd9e49628;hp=3825c7eb286b233ef9bb29f291db2b3633460484;hpb=0e691a3893a07dc362c733869760e0d7d1109ea8;p=r2c2.git

diff --git a/source/libmarklin/route.h b/source/libmarklin/route.h
index 3825c7e..0b03637 100644
--- a/source/libmarklin/route.h
+++ b/source/libmarklin/route.h
@@ -18,6 +18,7 @@ namespace Marklin {
 
 class Layout;
 class Track;
+class TrackIter;
 
 class Route: public sigc::trackable
 {
@@ -42,7 +43,7 @@ private:
 	Layout &layout;
 	std::string name;
 	bool temporary;
-	std::set<const Track *> tracks;
+	std::set<Track *> tracks;
 	TurnoutMap turnouts;
 
 public:
@@ -56,20 +57,22 @@ public:
 	void set_turnout(unsigned, unsigned);
 	void update_turnouts();
 	int get_turnout(unsigned) const;
+	unsigned get_path(Track &) const;
 	const std::map<unsigned, int> &get_turnouts() const { return turnouts; }
-	void add_track(const Track &);
-	void add_tracks(const std::set<const Track *> &);
-	void add_track_chain(const Track &, unsigned, const TurnoutMap &);
-	const std::set<const Track *> &get_tracks() const { return tracks; }
+	void add_track(Track &);
+	void add_tracks(const std::set<Track *> &);
+	void add_track_chain(Track &, unsigned, const TurnoutMap &);
+	const std::set<Track *> &get_tracks() const { return tracks; }
+	bool has_track(Track &) const;
 	void save(std::list<Msp::DataFile::Statement> &) const;
 private:
-	unsigned check_validity(const Track &) const;
+	unsigned check_validity(Track &) const;
 	void track_removed(Track &);
 
 public:
-	static Route *find(const Track &, unsigned, const Track &);
-	static Route *find(const Track &, unsigned, const Route &);
-	static Route *find(const Track &, unsigned, const std::set<const Track *> &);
+	static Route *find(const TrackIter &, Track &);
+	static Route *find(const TrackIter &, const Route &);
+	static Route *find(const TrackIter &, const std::set<Track *> &);
 };
 
 } // namespace Marklin