X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Froute.h;h=6d2d71034d532fa55301bf619b033d8f31e29489;hb=25b79ab38c2be2e5c89b8240504f641fd9c4899c;hp=f5b760265b5b30159fe44e2103ffe7691af81850;hpb=6c61179fe09af2f5366d50f10aadbf5f83438087;p=r2c2.git

diff --git a/source/libmarklin/route.h b/source/libmarklin/route.h
index f5b7602..6d2d710 100644
--- a/source/libmarklin/route.h
+++ b/source/libmarklin/route.h
@@ -2,26 +2,27 @@
 #define LIBMARKLIN_ROUTE_H_
 
 #include <list>
+#include <map>
+#include <set>
 #include <string>
-#include "track.h"
 
 namespace Marklin {
 
+class Track;
+class Turnout;
+
 class Route
 {
 public:
-	typedef std::map<unsigned, unsigned> TurnoutMap;
-
 	Route();
-	const TurnoutMap &get_turnouts() const { return turnouts; }
+	const std::map<unsigned, Turnout *> &get_turnouts() const { return turnouts; }
 	void add_track(Track *);
 	~Route();
 private:
 	std::string name;
-	TrackSeq    tracks;
-	TurnoutMap  turnouts;
+	std::set<Track *> tracks;
+	std::map<unsigned, Turnout *> turnouts;
 };
-typedef std::list<Route *> RouteSeq;
 
 } // namespace Marklin