Alte Signal-Implementierung entfernt

3 files changed, 9 insertions, 9 deletions

diff --git a/src/Common/Connection.h b/src/Common/Connection.h
index 6f1cffd..c8ff3e8 100644
--- a/src/Common/Connection.h
+++ b/src/Common/Connection.h
@@ -39,7 +39,7 @@ class Connection : private boost::noncopyable {
   private:
     bool authenticated;
 
-    Net::Signals::Signal22<boost::shared_ptr<const XmlPacket>, uint16_t> signalReceive;
+    Net::Signals::Signal2<boost::shared_ptr<const XmlPacket>, uint16_t> signalReceive;
 
   protected:
     Connection() : authenticated(0) {}
@@ -53,10 +53,10 @@ class Connection : private boost::noncopyable {
 
     bool sendPacket(const XmlPacket &packet, uint16_t requestId);
 
-    Net::Signals::Connection2 connectSignalReceive(const Net::Signals::Signal22<boost::shared_ptr<const XmlPacket>, uint16_t>::slot_type &slot) {
+    Net::Signals::Connection connectSignalReceive(const Net::Signals::Signal2<boost::shared_ptr<const XmlPacket>, uint16_t>::slot_type &slot) {
       return signalReceive.connect(slot);
     }
-    void disconnectSignalReceive(const Net::Signals::Connection2 &con) {
+    void disconnectSignalReceive(const Net::Signals::Connection &con) {
       signalReceive.disconnect(con);
     }
 
diff --git a/src/Common/Request.h b/src/Common/Request.h
index b8477f7..4698ae5 100644
--- a/src/Common/Request.h
+++ b/src/Common/Request.h
@@ -44,7 +44,7 @@ class Request : public RequestHandler {
     boost::shared_ptr<const XmlPacket> packet;
     Net::Exception exception;
 
-    Net::Signals::Signal22<boost::shared_ptr<const XmlPacket>, Net::Exception> finished;
+    Net::Signals::Signal2<boost::shared_ptr<const XmlPacket>, Net::Exception> finished;
 
   protected:
     Request() : isFinished(false) {}
@@ -80,10 +80,10 @@ class Request : public RequestHandler {
     virtual void handlePacket(boost::shared_ptr<const XmlPacket> packet);
 
   public:
-    Net::Signals::Connection2 connectSignalFinished(const Net::Signals::Signal22<boost::shared_ptr<const XmlPacket>, Net::Exception>::slot_type &slot) {
+    Net::Signals::Connection connectSignalFinished(const Net::Signals::Signal2<boost::shared_ptr<const XmlPacket>, Net::Exception>::slot_type &slot) {
       return finished.connect(slot);
     }
-    void disconnectSignalFinished(const Net::Signals::Connection2 &con) {
+    void disconnectSignalFinished(const Net::Signals::Connection &con) {
       finished.disconnect(con);
     }
 
diff --git a/src/Common/RequestHandler.h b/src/Common/RequestHandler.h
index 87fccba..917649e 100644
--- a/src/Common/RequestHandler.h
+++ b/src/Common/RequestHandler.h
@@ -41,7 +41,7 @@ class RequestHandler : private boost::noncopyable {
 
     boost::mutex mutex;
 
-    Net::Signals::Signal20 finished;
+    Net::Signals::Signal0 finished;
 
     void callHandlePacket(boost::shared_ptr<const XmlPacket> packet) {
       boost::lock_guard<boost::mutex> lock(mutex);
@@ -64,10 +64,10 @@ class RequestHandler : private boost::noncopyable {
   public:
     virtual ~RequestHandler() {}
 
-    Net::Signals::Connection2 connectSignalFinished(const Net::Signals::Signal20::slot_type &slot) {
+    Net::Signals::Connection connectSignalFinished(const Net::Signals::Signal0::slot_type &slot) {
       return finished.connect(slot);
     }
-    void disconnectSignalFinished(const Net::Signals::Connection2 &con) {
+    void disconnectSignalFinished(const Net::Signals::Connection &con) {
       finished.disconnect(con);
     }
 };