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

diff --git a/source/libmarklin/turnout.h b/source/libmarklin/turnout.h
index edf1c03..dbb689e 100644
--- a/source/libmarklin/turnout.h
+++ b/source/libmarklin/turnout.h
@@ -13,25 +13,25 @@ class Control;
 
 class Turnout
 {
+private:
+	Control  &control;
+	unsigned addr;
+	unsigned route;
+
 public:
 	sigc::signal<void, unsigned> signal_route_changed;
 
 	Turnout(Control &, unsigned);
+
 	void     set_route(unsigned);
 	unsigned get_address() const { return addr; }
 	unsigned get_route() const   { return route; }
 private:
-	Control  &control;
-	unsigned addr;
-	unsigned route;
-
 	void command(bool);
 	void status_reply(Error, const std::string &);
 	bool switch_timeout();
 	void turnout_event(unsigned, bool);
 };
-typedef std::list<Turnout *> TurnoutSeq;
-typedef std::map<unsigned, Turnout *> TurnoutMap;
 
 } // namespace Marklin