From d3a7b7c10b0ef7a3d8c8ea7f1aef2468702dd8f4 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 4 Jun 2009 22:32:56 +0200 Subject: Alte Signal-Implementierung entfernt --- src/Net/Signals/Connection.h | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'src/Net/Signals/Connection.h') diff --git a/src/Net/Signals/Connection.h b/src/Net/Signals/Connection.h index 0e66611..7730e13 100644 --- a/src/Net/Signals/Connection.h +++ b/src/Net/Signals/Connection.h @@ -20,22 +20,30 @@ #ifndef MAD_NET_SIGNALS_CONNECTION_H_ #define MAD_NET_SIGNALS_CONNECTION_H_ -#include - namespace Mad { namespace Net { namespace Signals { -template class SignalBase; +class SignalBase; class Connection { private: - template friend class SignalBase; + friend class SignalBase; + + SignalBase *signal; + unsigned long id; + + Connection(SignalBase *signal0, unsigned long id0) + : signal(signal0), id(id0) {} - boost::signals::connection connection; + public: + bool operator==(const Connection &o) const { + return (signal == o.signal && id == o.id); + } - Connection(const boost::signals::connection &connection0) - : connection(connection0) {} + bool operator<(const Connection &o) const { + return (signal != o.signal) ? (signal < o.signal) : (id < o.id); + } }; } -- cgit v1.2.3