diff options
Diffstat (limited to 'Swiften/Roster')
-rw-r--r-- | Swiften/Roster/RosterPushResponder.h | 5 | ||||
-rw-r--r-- | Swiften/Roster/SetRosterRequest.h | 5 | ||||
-rw-r--r-- | Swiften/Roster/XMPPRoster.h | 12 | ||||
-rw-r--r-- | Swiften/Roster/XMPPRosterController.h | 3 |
4 files changed, 14 insertions, 11 deletions
diff --git a/Swiften/Roster/RosterPushResponder.h b/Swiften/Roster/RosterPushResponder.h index 10986f5..00411df 100644 --- a/Swiften/Roster/RosterPushResponder.h +++ b/Swiften/Roster/RosterPushResponder.h @@ -6,8 +6,9 @@ #pragma once +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/RosterPayload.h> #include <Swiften/Queries/SetResponder.h> @@ -17,7 +18,7 @@ namespace Swift { RosterPushResponder(IQRouter* router) : SetResponder<RosterPayload>(router) {} public: - boost::signal<void (std::shared_ptr<RosterPayload>)> onRosterReceived; + boost::signals2::signal<void (std::shared_ptr<RosterPayload>)> onRosterReceived; private: virtual bool handleSetRequest(const JID& from, const JID&, const std::string& id, std::shared_ptr<RosterPayload> payload) { diff --git a/Swiften/Roster/SetRosterRequest.h b/Swiften/Roster/SetRosterRequest.h index 7615abc..0f71ab7 100644 --- a/Swiften/Roster/SetRosterRequest.h +++ b/Swiften/Roster/SetRosterRequest.h @@ -8,8 +8,9 @@ #include <memory> +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/RosterPayload.h> #include <Swiften/Queries/Request.h> @@ -35,6 +36,6 @@ namespace Swift { } public: - boost::signal<void (ErrorPayload::ref)> onResponse; + boost::signals2::signal<void (ErrorPayload::ref)> onResponse; }; } diff --git a/Swiften/Roster/XMPPRoster.h b/Swiften/Roster/XMPPRoster.h index 5e3a6b1..ae2dbc7 100644 --- a/Swiften/Roster/XMPPRoster.h +++ b/Swiften/Roster/XMPPRoster.h @@ -11,9 +11,9 @@ #include <vector> #include <boost/optional.hpp> +#include <boost/signals2.hpp> #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/RosterItemPayload.h> #include <Swiften/JID/JID.h> #include <Swiften/Roster/XMPPRosterItem.h> @@ -69,30 +69,30 @@ namespace Swift { /** * Emitted when the given JID is added to the roster. */ - boost::signal<void (const JID&)> onJIDAdded; + boost::signals2::signal<void (const JID&)> onJIDAdded; /** * Emitted when the given JID is removed from the roster. */ - boost::signal<void (const JID&)> onJIDRemoved; + boost::signals2::signal<void (const JID&)> onJIDRemoved; /** * Emitted when the name or the groups of the roster item with the * given JID changes. */ - boost::signal<void (const JID&, const std::string&, const std::vector<std::string>&)> onJIDUpdated; + boost::signals2::signal<void (const JID&, const std::string&, const std::vector<std::string>&)> onJIDUpdated; /** * Emitted when the roster is reset (e.g. due to logging in/logging out). * After this signal is emitted, the roster is empty. It will be repopulated through * onJIDAdded and onJIDRemoved events. */ - boost::signal<void ()> onRosterCleared; + boost::signals2::signal<void ()> onRosterCleared; /** * Emitted after the last contact of the initial roster request response * was added. */ - boost::signal<void ()> onInitialRosterPopulated; + boost::signals2::signal<void ()> onInitialRosterPopulated; }; } diff --git a/Swiften/Roster/XMPPRosterController.h b/Swiften/Roster/XMPPRosterController.h index 3803cd5..f952c60 100644 --- a/Swiften/Roster/XMPPRosterController.h +++ b/Swiften/Roster/XMPPRosterController.h @@ -9,8 +9,9 @@ #include <memory> #include <string> +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/IQ.h> #include <Swiften/Elements/RosterPayload.h> #include <Swiften/JID/JID.h> |