summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Session')
-rw-r--r--Swiften/Session/Session.h10
-rw-r--r--Swiften/Session/SessionStream.h14
2 files changed, 12 insertions, 12 deletions
diff --git a/Swiften/Session/Session.h b/Swiften/Session/Session.h
index 911bd34..23cc656 100644
--- a/Swiften/Session/Session.h
+++ b/Swiften/Session/Session.h
@@ -9,10 +9,10 @@
#include <memory>
#include <boost/optional.hpp>
+#include <boost/signals2.hpp>
#include <Swiften/Base/API.h>
#include <Swiften/Base/SafeByteArray.h>
-#include <Swiften/Base/boost_bsignals.h>
#include <Swiften/Elements/ToplevelElement.h>
#include <Swiften/JID/JID.h>
#include <Swiften/Network/Connection.h>
@@ -64,10 +64,10 @@ namespace Swift {
return remoteJID;
}
- boost::signal<void (std::shared_ptr<ToplevelElement>)> onElementReceived;
- boost::signal<void (const boost::optional<SessionError>&)> onSessionFinished;
- boost::signal<void (const SafeByteArray&)> onDataWritten;
- boost::signal<void (const SafeByteArray&)> onDataRead;
+ boost::signals2::signal<void (std::shared_ptr<ToplevelElement>)> onElementReceived;
+ boost::signals2::signal<void (const boost::optional<SessionError>&)> onSessionFinished;
+ boost::signals2::signal<void (const SafeByteArray&)> onDataWritten;
+ boost::signals2::signal<void (const SafeByteArray&)> onDataRead;
protected:
void setRemoteJID(const JID& j) {
diff --git a/Swiften/Session/SessionStream.h b/Swiften/Session/SessionStream.h
index 4b86cee..f56f495 100644
--- a/Swiften/Session/SessionStream.h
+++ b/Swiften/Session/SessionStream.h
@@ -9,11 +9,11 @@
#include <memory>
#include <boost/optional.hpp>
+#include <boost/signals2.hpp>
#include <Swiften/Base/API.h>
#include <Swiften/Base/Error.h>
#include <Swiften/Base/SafeByteArray.h>
-#include <Swiften/Base/boost_bsignals.h>
#include <Swiften/Elements/ProtocolHeader.h>
#include <Swiften/Elements/ToplevelElement.h>
#include <Swiften/TLS/Certificate.h>
@@ -74,12 +74,12 @@ namespace Swift {
virtual ByteArray getTLSFinishMessage() const = 0;
- boost::signal<void (const ProtocolHeader&)> onStreamStartReceived;
- boost::signal<void (std::shared_ptr<ToplevelElement>)> onElementReceived;
- boost::signal<void (std::shared_ptr<Error>)> onClosed;
- boost::signal<void ()> onTLSEncrypted;
- boost::signal<void (const SafeByteArray&)> onDataRead;
- boost::signal<void (const SafeByteArray&)> onDataWritten;
+ boost::signals2::signal<void (const ProtocolHeader&)> onStreamStartReceived;
+ boost::signals2::signal<void (std::shared_ptr<ToplevelElement>)> onElementReceived;
+ boost::signals2::signal<void (std::shared_ptr<Error>)> onClosed;
+ boost::signals2::signal<void ()> onTLSEncrypted;
+ boost::signals2::signal<void (const SafeByteArray&)> onDataRead;
+ boost::signals2::signal<void (const SafeByteArray&)> onDataWritten;
protected:
CertificateWithKey::ref getTLSCertificate() const {