Major architecture rework

[r2c2.git] / source / network / server.h

diff --git a/source/network/server.h b/source/network/server.h
index 7c3dce959c300e9fbb1226e3797b0bd02b60cdd2..41bb8e9b50bc9765767efa7ae5a1c09868e66d13 100644 (file)
--- a/source/network/server.h
+++ b/source/network/server.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2009  Mikkosoft Productions, Mikko Rasa
+Copyright © 2009-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -12,7 +12,7 @@ Distributed under the GPL
 #include <msp/net/communicator.h>
 #include <msp/net/streamsocket.h>
 #include <msp/net/streamlistensocket.h>
-#include "libmarklin/trafficmanager.h"
+#include "libmarklin/layout.h"
 #include "packets.h"
 #include "protocol.h"
 
@@ -42,13 +42,13 @@ private:
        };
 
        Protocol proto;
-       TrafficManager &trfc_mgr;
+       Layout &layout;
        Msp::Net::StreamListenSocket listen_sock;
        Msp::IO::EventDispatcher *event_disp;
        std::vector<Connection *> connections;
 
 public:
-       Server(TrafficManager &);
+       Server(Layout &);
        void use_event_dispatcher(Msp::IO::EventDispatcher &);
 private:
        void incoming_connection();