summaryrefslogtreecommitdiffstats
path: root/src/Net/Connection.h
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2009-05-18 19:53:51 +0200
committerMatthias Schiffer <matthias@gamezock.de>2009-05-18 19:53:51 +0200
commitfc3c50063f659584b2145addab8236a479a031b7 (patch)
tree0aa7057cb9fa7523ace98e0776d46609de58954e /src/Net/Connection.h
parenta3e566c4d3631076e29f3651554603184b6351a7 (diff)
downloadmad-fc3c50063f659584b2145addab8236a479a031b7.tar
mad-fc3c50063f659584b2145addab8236a479a031b7.zip
Von sigc++ auf boost-signals migriert
Diffstat (limited to 'src/Net/Connection.h')
-rw-r--r--src/Net/Connection.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Net/Connection.h b/src/Net/Connection.h
index 1a3e72b..a0b95ea 100644
--- a/src/Net/Connection.h
+++ b/src/Net/Connection.h
@@ -27,9 +27,9 @@
#include <queue>
#include <string>
#include <gnutls/gnutls.h>
-#include <sigc++/signal.h>
#include <poll.h>
+#include <boost/signal.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/shared_mutex.hpp>
@@ -61,7 +61,7 @@ class Connection {
uint8_t *data;
- sigc::slot<void,const void*,unsigned long> notify;
+ boost::function2<void,const void*,unsigned long> notify;
};
boost::mutex receiveLock;
@@ -72,9 +72,9 @@ class Connection {
Packet::Data header;
- sigc::signal<void,const Packet&> receiveSignal;
- sigc::signal<void> connectedSignal;
- sigc::signal<void> disconnectedSignal;
+ boost::signal1<void,const Packet&> receiveSignal;
+ boost::signal0<void> connectedSignal;
+ boost::signal0<void> disconnectedSignal;
void doHandshake();
@@ -129,7 +129,7 @@ class Connection {
virtual void connectionHeader() = 0;
- bool rawReceive(unsigned long length, const sigc::slot<void,const void*,unsigned long> &notify);
+ bool rawReceive(unsigned long length, const boost::function2<void,const void*,unsigned long> &notify);
bool rawSend(const uint8_t *data, unsigned long length);
void enterReceiveLoop();
@@ -190,9 +190,9 @@ class Connection {
bool send(const Packet &packet);
- sigc::signal<void,const Packet&> signalReceive() const {return receiveSignal;}
- sigc::signal<void> signalConnected() const {return connectedSignal;}
- sigc::signal<void> signalDisconnected() const {return disconnectedSignal;}
+ boost::signal1<void,const Packet&>& signalReceive() {return receiveSignal;}
+ boost::signal0<void>& signalConnected() {return connectedSignal;}
+ boost::signal0<void>& signalDisconnected() {return disconnectedSignal;}
};
}