summaryrefslogtreecommitdiffstats
path: root/src/Net/Connection.h
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2009-06-02 22:50:28 +0200
committerMatthias Schiffer <matthias@gamezock.de>2009-06-02 22:50:28 +0200
commitf79a215fce13d86a495b6741aae0827ccce43757 (patch)
treeb7a6f61a6ab45cff81e1d7aedb248be56ad2ed7a /src/Net/Connection.h
parent95f2a6b40f5e9dc27be6609d3f7018b3342c4182 (diff)
downloadmad-f79a215fce13d86a495b6741aae0827ccce43757.tar
mad-f79a215fce13d86a495b6741aae0827ccce43757.zip
Net-Namespace auf die neue Signal-Implementierung umgebaut
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 3938140..505dcea 100644
--- a/src/Net/Connection.h
+++ b/src/Net/Connection.h
@@ -70,9 +70,9 @@ class Connection : boost::noncopyable {
Packet::Data header;
- Signals::Signal1<const Packet&> receiveSignal;
- Signals::Signal0 connectedSignal;
- Signals::Signal0 disconnectedSignal;
+ Signals::Signal21<boost::shared_ptr<Packet> > receiveSignal;
+ Signals::Signal20 connectedSignal;
+ Signals::Signal20 disconnectedSignal;
bool receiving;
unsigned long sending;
@@ -171,24 +171,24 @@ class Connection : boost::noncopyable {
bool send(const Packet &packet);
- Signals::Connection connectSignalReceive(const Signals::Signal1<const Packet&>::slot_type &slot) {
+ Signals::Connection2 connectSignalReceive(const Signals::Signal21<boost::shared_ptr<Packet> >::slot_type &slot) {
return receiveSignal.connect(slot);
}
- void disconnectSignalReceive(const Signals::Connection &connection) {
+ void disconnectSignalReceive(const Signals::Connection2 &connection) {
receiveSignal.disconnect(connection);
}
- Signals::Connection connectSignalConnected(const Signals::Signal0::slot_type &slot) {
+ Signals::Connection2 connectSignalConnected(const Signals::Signal20::slot_type &slot) {
return connectedSignal.connect(slot);
}
- void disconnectSignalConnected(const Signals::Connection &connection) {
+ void disconnectSignalConnected(const Signals::Connection2 &connection) {
connectedSignal.disconnect(connection);
}
- Signals::Connection connectSignalDisconnected(const Signals::Signal0::slot_type &slot) {
+ Signals::Connection2 connectSignalDisconnected(const Signals::Signal20::slot_type &slot) {
return disconnectedSignal.connect(slot);
}
- void disconnectSignalDisconnected(const Signals::Connection &connection) {
+ void disconnectSignalDisconnected(const Signals::Connection2 &connection) {
disconnectedSignal.disconnect(connection);
}
};