From d3a7b7c10b0ef7a3d8c8ea7f1aef2468702dd8f4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Thu, 4 Jun 2009 22:32:56 +0200
Subject: Alte Signal-Implementierung entfernt

---
 src/Net/Signals/GenericSignal.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/Net/Signals/GenericSignal.h')

diff --git a/src/Net/Signals/GenericSignal.h b/src/Net/Signals/GenericSignal.h
index d4fa8df..aa6cfa1 100644
--- a/src/Net/Signals/GenericSignal.h
+++ b/src/Net/Signals/GenericSignal.h
@@ -20,7 +20,7 @@
 #ifndef MAD_NET_SIGNALS_GENERICSIGNAL_H_
 #define MAD_NET_SIGNALS_GENERICSIGNAL_H_
 
-#include "SignalBase2.h"
+#include "SignalBase.h"
 
 #include <map>
 #include <boost/thread/locks.hpp>
@@ -30,24 +30,24 @@ namespace Net {
 namespace Signals {
 
 template <typename FunctionType>
-class GenericSignal : protected SignalBase2 {
+class GenericSignal : protected SignalBase {
   public:
     typedef FunctionType slot_type;
 
   protected:
-    std::map<Connection2, slot_type> handlers;
+    std::map<Connection, slot_type> handlers;
 
   public:
-    Connection2 connect(const slot_type &slot) {
+    Connection connect(const slot_type &slot) {
       boost::lock_guard<boost::mutex> lock(mutex);
 
-      Connection2 con = getNewConnection();
+      Connection con = getNewConnection();
       handlers.insert(std::make_pair(con, slot));
 
       return con;
     }
 
-    bool disconnect(const Connection2 &connection) {
+    bool disconnect(const Connection &connection) {
       boost::lock_guard<boost::mutex> lock(mutex);
 
       return handlers.erase(connection);
-- 
cgit v1.2.3