summaryrefslogtreecommitdiffstats
path: root/src/Net/Connection.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/Net/Connection.cpp')
-rw-r--r--src/Net/Connection.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Net/Connection.cpp b/src/Net/Connection.cpp
index cf675c9..4e5029f 100644
--- a/src/Net/Connection.cpp
+++ b/src/Net/Connection.cpp
@@ -25,7 +25,7 @@
#include <cstring>
#include <sys/socket.h>
-#include <sigc++/bind.h>
+#include <boost/bind.hpp>
namespace Mad {
namespace Net {
@@ -125,12 +125,12 @@ void Connection::enterReceiveLoop() {
return;
if(_isConnecting())
- ThreadManager::get()->pushWork(sigc::mem_fun(connectedSignal, &sigc::signal<void>::emit));
+ ThreadManager::get()->pushWork(boost::bind((void (boost::signal0<void>::*)())&boost::signal0<void>::operator(), &connectedSignal));
state = PACKET_HEADER;
lock.unlock();
- rawReceive(sizeof(Packet::Data), sigc::mem_fun(this, &Connection::packetHeaderReceiveHandler));
+ rawReceive(sizeof(Packet::Data), boost::bind(&Connection::packetHeaderReceiveHandler, this, _1, _2));
}
void Connection::packetHeaderReceiveHandler(const void *data, unsigned long length) {
@@ -146,13 +146,13 @@ void Connection::packetHeaderReceiveHandler(const void *data, unsigned long leng
header = *(const Packet::Data*)data;
if(header.length == 0) {
- ThreadManager::get()->pushWork(sigc::bind(sigc::mem_fun(receiveSignal, &sigc::signal<void,const Packet&>::emit), Packet(ntohs(header.requestId))));
+ ThreadManager::get()->pushWork(boost::bind((void (boost::signal1<void, const Packet&>::*)(const Packet&))&boost::signal1<void, const Packet&>::operator(), &receiveSignal, Packet(ntohs(header.requestId))));
enterReceiveLoop();
}
else {
state = PACKET_DATA;
- rawReceive(ntohs(header.length), sigc::mem_fun(this, &Connection::packetDataReceiveHandler));
+ rawReceive(ntohs(header.length), boost::bind(&Connection::packetDataReceiveHandler, this, _1, _2));
}
}
@@ -166,7 +166,7 @@ void Connection::packetDataReceiveHandler(const void *data, unsigned long length
return;
}
- ThreadManager::get()->pushWork(sigc::bind(sigc::mem_fun(receiveSignal, &sigc::signal<void,const Packet&>::emit), Packet(ntohs(header.requestId), data, length)));
+ ThreadManager::get()->pushWork(boost::bind((void (boost::signal1<void, const Packet&>::*)(const Packet&))&boost::signal1<void, const Packet&>::operator(), &receiveSignal, Packet(ntohs(header.requestId), data, length)));
enterReceiveLoop();
}
@@ -213,7 +213,7 @@ void Connection::doReceive() {
}
bool Connection::rawReceive(unsigned long length,
- const sigc::slot<void,const void*,unsigned long> &notify)
+ const boost::function2<void,const void*,unsigned long> &notify)
{
if(!isConnected())
return false;
@@ -271,7 +271,7 @@ bool Connection::rawSend(const uint8_t *data, unsigned long length) {
if(!isConnected())
return false;
- Transmission trans = {length, 0, new uint8_t[length], sigc::slot<void,const void*,unsigned long>()};
+ Transmission trans = {length, 0, new uint8_t[length], boost::function2<void,const void*,unsigned long>()};
std::memcpy(trans.data, data, length);
sendLock.lock();
@@ -350,7 +350,7 @@ void Connection::doDisconnect() {
gnutls_deinit(session);
- ThreadManager::get()->pushWork(sigc::mem_fun(disconnectedSignal, &sigc::signal<void>::emit));
+ ThreadManager::get()->pushWork(boost::bind((void (boost::signal0<void>::*)())&boost::signal0<void>::operator(), &disconnectedSignal));
state = DISCONNECTED;
}