summaryrefslogtreecommitdiffstats
path: root/src/Net/Signals/GenericSignal.h
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2009-06-04 22:32:56 +0200
committerMatthias Schiffer <matthias@gamezock.de>2009-06-04 22:32:56 +0200
commitd3a7b7c10b0ef7a3d8c8ea7f1aef2468702dd8f4 (patch)
tree5bc2a48eb2a03ae03e321d7d576658eeabad688d /src/Net/Signals/GenericSignal.h
parent0b27c37fe95c6aced613d51a3624f8930a96ad3f (diff)
downloadmad-d3a7b7c10b0ef7a3d8c8ea7f1aef2468702dd8f4.tar
mad-d3a7b7c10b0ef7a3d8c8ea7f1aef2468702dd8f4.zip
Alte Signal-Implementierung entfernt
Diffstat (limited to 'src/Net/Signals/GenericSignal.h')
-rw-r--r--src/Net/Signals/GenericSignal.h12
1 files changed, 6 insertions, 6 deletions
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);