Net-Namespace auf die neue Signal-Implementierung umgebaut

1 files changed, 4 insertions, 5 deletions

diff --git a/src/Net/Listener.h b/src/Net/Listener.h
index 2f45ea6..600fcf9 100644
--- a/src/Net/Listener.h
+++ b/src/Net/Listener.h
@@ -38,14 +38,13 @@ class Listener : boost::noncopyable {
     boost::asio::ip::tcp::acceptor acceptor;
     boost::asio::ssl::context sslContext;
 
-    std::map<boost::shared_ptr<Connection>, std::pair<Signals::Connection, Signals::Connection> > connections;
+    std::map<boost::shared_ptr<Connection>, std::pair<Signals::Connection2, Signals::Connection2> > connections;
 
-    Signals::Signal1<boost::shared_ptr<Connection> > signal;
+    Signals::Signal21<boost::shared_ptr<Connection> > signal;
 
     void handleAccept(const boost::system::error_code &error, boost::shared_ptr<Connection> con);
 
     void handleConnect(boost::shared_ptr<Connection> con);
-    void doHandleConnect(boost::shared_ptr<Connection> con);
     void handleDisconnect(boost::shared_ptr<Connection> con);
 
   public:
@@ -53,10 +52,10 @@ class Listener : boost::noncopyable {
         const boost::asio::ip::tcp::endpoint &address0 = boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), 6666)) throw(Exception);
     virtual ~Listener();
 
-    Signals::Connection connectSignalNewConnection(const Signals::Signal1<boost::shared_ptr<Connection> >::slot_type &slot) {
+    Signals::Connection2 connectSignalNewConnection(const Signals::Signal21<boost::shared_ptr<Connection> >::slot_type &slot) {
       return signal.connect(slot);
     }
-    void disconnectSignalNewConnection(const Signals::Connection &connection) {
+    void disconnectSignalNewConnection(const Signals::Connection2 &connection) {
       signal.disconnect(connection);
     }
 };