Von sigc++ auf boost-signals migriert

1 files changed, 6 insertions, 8 deletions

diff --git a/src/Net/Listener.cpp b/src/Net/Listener.cpp
index 5bcc353..11cbaf5 100644
--- a/src/Net/Listener.cpp
+++ b/src/Net/Listener.cpp
@@ -27,8 +27,6 @@
 #include <cstring>
 #include <fcntl.h>
 
-#include <sigc++/bind.h>
-
 namespace Mad {
 namespace Net {
 
@@ -40,8 +38,8 @@ void Listener::acceptHandler(int) {
 
   while((sd = accept(sock, (struct sockaddr*)&sa, &addrlen)) >= 0) {
     ServerConnection *con = new ServerConnection(sd, IPAddress(sa), dh_params, x905CertFile, x905KeyFile);
-    sigc::connection con1 = con->signalConnected().connect(sigc::bind(sigc::mem_fun(this, &Listener::connectHandler), con));
-    sigc::connection con2 = con->signalDisconnected().connect(sigc::bind(sigc::mem_fun(this, &Listener::disconnectHandler), con));
+    boost::signals::connection con1 = con->signalConnected().connect(boost::bind(&Listener::connectHandler, this, con));
+    boost::signals::connection con2 = con->signalDisconnected().connect(boost::bind(&Listener::disconnectHandler, this, con));
 
     connections.insert(std::make_pair(con, std::make_pair(con1, con2)));
 
@@ -51,7 +49,7 @@ void Listener::acceptHandler(int) {
 
 
 void Listener::connectHandler(ServerConnection *con) {
-  std::map<ServerConnection*, std::pair<sigc::connection, sigc::connection> >::iterator it = connections.find(con);
+  std::map<ServerConnection*, std::pair<boost::signals::connection, boost::signals::connection> >::iterator it = connections.find(con);
 
   if(it == connections.end())
     return;
@@ -65,7 +63,7 @@ void Listener::connectHandler(ServerConnection *con) {
 }
 
 void Listener::disconnectHandler(ServerConnection *con) {
-  std::map<ServerConnection*, std::pair<sigc::connection, sigc::connection> >::iterator it = connections.find(con);
+  std::map<ServerConnection*, std::pair<boost::signals::connection, boost::signals::connection> >::iterator it = connections.find(con);
 
   if(it == connections.end())
     return;
@@ -112,11 +110,11 @@ Listener::Listener(const std::string &x905CertFile0, const std::string &x905KeyF
     throw Exception("listen()", Exception::INTERNAL_ERRNO, errno);
   }
 
-  FdManager::get()->registerFd(sock, sigc::mem_fun(this, &Listener::acceptHandler), POLLIN);
+  FdManager::get()->registerFd(sock, boost::bind(&Listener::acceptHandler, this, _1), POLLIN);
 }
 
 Listener::~Listener() {
-  for(std::map<ServerConnection*,std::pair<sigc::connection, sigc::connection> >::iterator con = connections.begin(); con != connections.end(); ++con) {
+  for(std::map<ServerConnection*,std::pair<boost::signals::connection, boost::signals::connection> >::iterator con = connections.begin(); con != connections.end(); ++con) {
     con->first->disconnect();
     delete con->first;
   }