X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Froute.h;h=89788e3b62b477fc945229a96f4e1ede0ecbfc7f;hb=e5cd9e4fbc577036a0385c985b6b65df8218d0a2;hp=bcb76e143635fa4b0180f24e698dfee292509bef;hpb=1ba0bd68483b900a702c7a38f41250b33770503d;p=r2c2.git

diff --git a/source/libmarklin/route.h b/source/libmarklin/route.h
index bcb76e1..89788e3 100644
--- a/source/libmarklin/route.h
+++ b/source/libmarklin/route.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2007-2009  Mikkosoft Productions, Mikko Rasa
+Copyright © 2007-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -11,15 +11,15 @@ Distributed under the GPL
 #include <map>
 #include <set>
 #include <string>
+#include <sigc++/trackable.h>
 #include <msp/datafile/loader.h>
 
 namespace Marklin {
 
 class Layout;
 class Track;
-class Turnout;
 
-class Route
+class Route: public sigc::trackable
 {
 public:
 	class Loader: public Msp::DataFile::BasicLoader<Route>
@@ -31,12 +31,14 @@ public:
 	};
 
 private:
+	Layout &layout;
 	std::string name;
 	std::set<const Track *> tracks;
 	std::map<unsigned, int> turnouts;
 
 public:
 	Route(Layout &, const std::string &);
+	~Route();
 
 	const std::string &get_name() const { return name; }
 	int get_turnout(unsigned) const;
@@ -49,6 +51,10 @@ private:
 	void update_turnouts();
 	unsigned check_validity(const Track &) const;
 	void track_removed(Track &);
+
+public:
+	static Route *find(const Track &, unsigned, const Track &);
+	static Route *find(const Track &, unsigned, const Route &);
 };
 
 } // namespace Marklin