diff options
Diffstat (limited to 'Swiften/Jingle')
-rw-r--r-- | Swiften/Jingle/FakeJingleSession.h | 2 | ||||
-rw-r--r-- | Swiften/Jingle/JingleSession.h | 2 | ||||
-rw-r--r-- | Swiften/Jingle/JingleSessionImpl.h | 2 | ||||
-rw-r--r-- | Swiften/Jingle/JingleSessionManager.h | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Swiften/Jingle/FakeJingleSession.h b/Swiften/Jingle/FakeJingleSession.h index d961d1d..6218544 100644 --- a/Swiften/Jingle/FakeJingleSession.h +++ b/Swiften/Jingle/FakeJingleSession.h @@ -16,12 +16,12 @@ #include <string> #include <vector> +#include <boost/signals2.hpp> #include <boost/variant.hpp> #include <Swiften/Base/API.h> #include <Swiften/Base/Override.h> #include <Swiften/Base/SimpleIDGenerator.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/JinglePayload.h> #include <Swiften/JID/JID.h> #include <Swiften/Jingle/JingleContentID.h> diff --git a/Swiften/Jingle/JingleSession.h b/Swiften/Jingle/JingleSession.h index 993e8de..22e6901 100644 --- a/Swiften/Jingle/JingleSession.h +++ b/Swiften/Jingle/JingleSession.h @@ -11,10 +11,10 @@ #include <vector> #include <boost/optional.hpp> +#include <boost/signals2.hpp> #include <Swiften/Base/API.h> #include <Swiften/Base/Listenable.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/JinglePayload.h> #include <Swiften/JID/JID.h> diff --git a/Swiften/Jingle/JingleSessionImpl.h b/Swiften/Jingle/JingleSessionImpl.h index 4dd32ed..b42b790 100644 --- a/Swiften/Jingle/JingleSessionImpl.h +++ b/Swiften/Jingle/JingleSessionImpl.h @@ -44,7 +44,7 @@ namespace Swift { private: IQRouter *iqRouter; JID peerJID; - typedef std::map<RequestRef, boost::bsignals::connection > RequestsMap; + typedef std::map<RequestRef, boost::signals2::connection > RequestsMap; RequestsMap pendingRequests; }; } diff --git a/Swiften/Jingle/JingleSessionManager.h b/Swiften/Jingle/JingleSessionManager.h index 0c0f775..f67a0fe 100644 --- a/Swiften/Jingle/JingleSessionManager.h +++ b/Swiften/Jingle/JingleSessionManager.h @@ -9,8 +9,9 @@ #include <map> #include <memory> +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Jingle/JingleSessionImpl.h> namespace Swift { |