Thread-sichere Signale implementiert

1 files changed, 6 insertions, 10 deletions

diff --git a/src/Common/Connection.h b/src/Common/Connection.h
index 5ac46a2..2d74548 100644
--- a/src/Common/Connection.h
+++ b/src/Common/Connection.h
@@ -20,11 +20,11 @@
 #ifndef MAD_COMMON_CONNECTION_H_
 #define MAD_COMMON_CONNECTION_H_
 
+#include <Net/Signals/Signals.h>
+
 #include <stdint.h>
 #include <sys/types.h>
 
-#include <boost/signal.hpp>
-
 namespace Mad {
 
 namespace Net {
@@ -35,15 +35,11 @@ namespace Common {
 
 class XmlPacket;
 
-class Connection {
+class Connection : private boost::noncopyable {
   private:
     bool authenticated;
 
-    boost::signal2<void, const XmlPacket&, uint16_t> signal;
-
-    // Prevent shallow copy
-    Connection(const Connection &o);
-    Connection& operator=(const Connection &o);
+    Net::Signals::Signal2<void, const XmlPacket&, uint16_t> signalReceive;
 
   protected:
     Connection() : authenticated(0) {}
@@ -57,8 +53,8 @@ class Connection {
 
     bool sendPacket(const XmlPacket &packet, uint16_t requestId);
 
-    boost::signal2<void, const XmlPacket&, uint16_t>& signalReceive() {
-      return signal;
+    Net::Signals::Connection connectSignalReceive(const Net::Signals::Signal2<void, const XmlPacket&, uint16_t>::slot_type &slot) {
+      return signalReceive.connect(slot);
     }
 
     virtual bool disconnect() = 0;