using boost::signals2 with compatibility for older swiften

11 files changed, 10 insertions, 27 deletions

diff --git a/spectrum/src/frontends/slack/SlackAPI.h b/spectrum/src/frontends/slack/SlackAPI.h
index 49f3a0c6..c6e10da3 100644
--- a/spectrum/src/frontends/slack/SlackAPI.h
+++ b/spectrum/src/frontends/slack/SlackAPI.h
@@ -28,8 +28,6 @@
 #include <algorithm>
 #include <map>
 
-#include <boost/signal.hpp>
-
 namespace Transport {
 
 class Component;
diff --git a/spectrum/src/frontends/slack/SlackIdManager.h b/spectrum/src/frontends/slack/SlackIdManager.h
index edcbfd59..4d4c58d2 100644
--- a/spectrum/src/frontends/slack/SlackIdManager.h
+++ b/spectrum/src/frontends/slack/SlackIdManager.h
@@ -47,8 +47,6 @@
 #include <algorithm>
 #include <map>
 
-#include <boost/signal.hpp>
-
 namespace Transport {
 
 class SlackIdManager {
diff --git a/spectrum/src/frontends/slack/SlackRTM.h b/spectrum/src/frontends/slack/SlackRTM.h
index b25cce00..f5ce755a 100644
--- a/spectrum/src/frontends/slack/SlackRTM.h
+++ b/spectrum/src/frontends/slack/SlackRTM.h
@@ -47,8 +47,6 @@
 #include <algorithm>
 #include <map>
 
-#include <boost/signal.hpp>
-
 namespace Transport {
 
 class Component;
@@ -70,13 +68,13 @@ class SlackRTM {
 
 		void sendMessage(const std::string &channel, const std::string &message);
 
-		boost::signal<void ()> onRTMStarted;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onRTMStarted;
 
 		SlackAPI *getAPI() {
 			return m_api;
 		}
 
-		boost::signal<void (const std::string &channel, const std::string &user, const std::string &text, const std::string &ts)> onMessageReceived;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const std::string &channel, const std::string &user, const std::string &text, const std::string &ts)> onMessageReceived;
 
 #ifndef LIBTRANSPORT_TEST
 	private:
diff --git a/spectrum/src/frontends/slack/SlackSession.h b/spectrum/src/frontends/slack/SlackSession.h
index b74b302c..4332d2a9 100644
--- a/spectrum/src/frontends/slack/SlackSession.h
+++ b/spectrum/src/frontends/slack/SlackSession.h
@@ -31,8 +31,6 @@
 #include "Swiften/Network/Timer.h"
 #include "Swiften/SwiftenCompat.h"
 
-#include <boost/signal.hpp>
-
 namespace Transport {
 
 class Component;
@@ -49,7 +47,7 @@ class SlackSession {
 
 		virtual ~SlackSession();
 
-		boost::signal<void (const std::string &user)> onInstallationDone;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const std::string &user)> onInstallationDone;
 
 		void sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Message> message);
 
diff --git a/spectrum/src/frontends/slack/SlackUserRegistration.h b/spectrum/src/frontends/slack/SlackUserRegistration.h
index a0369f8b..8ed24386 100644
--- a/spectrum/src/frontends/slack/SlackUserRegistration.h
+++ b/spectrum/src/frontends/slack/SlackUserRegistration.h
@@ -22,8 +22,6 @@
 
 #include "transport/UserRegistration.h"
 
-#include <boost/signal.hpp>
-
 namespace Transport {
 
 struct UserInfo;
diff --git a/spectrum/src/frontends/xmpp/RosterResponder.h b/spectrum/src/frontends/xmpp/RosterResponder.h
index 27b6bf8c..fe040ddc 100644
--- a/spectrum/src/frontends/xmpp/RosterResponder.h
+++ b/spectrum/src/frontends/xmpp/RosterResponder.h
@@ -25,8 +25,6 @@
 #include "Swiften/Elements/RosterPayload.h"
 #include "Swiften/SwiftenCompat.h"
 
-#include <boost/signal.hpp>
-
 namespace Transport {
 
 class UserManager;
@@ -37,11 +35,11 @@ class RosterResponder : public Swift::Responder<Swift::RosterPayload> {
 		RosterResponder(Swift::IQRouter *router, UserManager *userManager);
 		~RosterResponder();
 
-		boost::signal<void (Buddy *, const Swift::RosterItemPayload &item)> onBuddyUpdated;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Buddy *, const Swift::RosterItemPayload &item)> onBuddyUpdated;
 
-		boost::signal<void (Buddy *)> onBuddyRemoved;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Buddy *)> onBuddyRemoved;
 
-		boost::signal<void (Buddy *, const Swift::RosterItemPayload &item)> onBuddyAdded;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Buddy *, const Swift::RosterItemPayload &item)> onBuddyAdded;
 
 	private:
 		virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::RosterPayload> payload);
diff --git a/spectrum/src/frontends/xmpp/XMPPUserRegistration.h b/spectrum/src/frontends/xmpp/XMPPUserRegistration.h
index 87b879fd..1bded7ed 100644
--- a/spectrum/src/frontends/xmpp/XMPPUserRegistration.h
+++ b/spectrum/src/frontends/xmpp/XMPPUserRegistration.h
@@ -25,7 +25,6 @@
 #include "Swiften/Elements/RosterPayload.h"
 #include "Swiften/SwiftenCompat.h"
 
-#include <boost/signal.hpp>
 #include <Swiften/Version.h>
 #include "transport/UserRegistration.h"
 #define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
diff --git a/spectrum/src/frontends/xmpp/blockresponder.h b/spectrum/src/frontends/xmpp/blockresponder.h
index f5e233a2..124492e7 100644
--- a/spectrum/src/frontends/xmpp/blockresponder.h
+++ b/spectrum/src/frontends/xmpp/blockresponder.h
@@ -23,7 +23,6 @@
 #include <vector>
 #include "Swiften/Queries/SetResponder.h"
 #include "BlockPayload.h"
-#include <boost/signal.hpp>
 
 namespace Transport {
 
@@ -35,7 +34,7 @@ class BlockResponder : public Swift::SetResponder<Transport::BlockPayload> {
 		BlockResponder(Swift::IQRouter *router, UserManager *userManager);
 		~BlockResponder();
 
-		boost::signal<void (Buddy *)> onBlockToggled;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Buddy *)> onBlockToggled;
 
 	private:
 		virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Transport::BlockPayload> payload);
diff --git a/spectrum/src/frontends/xmpp/discoinforesponder.h b/spectrum/src/frontends/xmpp/discoinforesponder.h
index 5b296ae3..b450dce4 100644
--- a/spectrum/src/frontends/xmpp/discoinforesponder.h
+++ b/spectrum/src/frontends/xmpp/discoinforesponder.h
@@ -22,7 +22,6 @@
 
 #include <vector>
 #include <list>
-#include <boost/signal.hpp>
 #include "Swiften/Queries/GetResponder.h"
 #include "Swiften/Elements/DiscoInfo.h"
 #include "Swiften/Elements/CapsInfo.h"
@@ -53,7 +52,7 @@ class DiscoInfoResponder : public Swift::GetResponder<Swift::DiscoInfo> {
 
 		void addAdHocCommand(const std::string &node, const std::string &name);
 
-		boost::signal<void (const Swift::CapsInfo &capsInfo)> onBuddyCapsInfoChanged;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const Swift::CapsInfo &capsInfo)> onBuddyCapsInfoChanged;
 
 		Swift::CapsInfo &getBuddyCapsInfo() {
 				return m_capsInfo;
diff --git a/spectrum/src/frontends/xmpp/formutils.h b/spectrum/src/frontends/xmpp/formutils.h
index 312de882..1691ef72 100644
--- a/spectrum/src/frontends/xmpp/formutils.h
+++ b/spectrum/src/frontends/xmpp/formutils.h
@@ -23,7 +23,6 @@
 #include "Swiften/Queries/Responder.h"
 #include "Swiften/Elements/InBandRegistrationPayload.h"
 #include "Swiften/Elements/RosterPayload.h"
-#include <boost/signal.hpp>
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 
diff --git a/spectrum/src/frontends/xmpp/vcardresponder.h b/spectrum/src/frontends/xmpp/vcardresponder.h
index 76c36e03..e42ce473 100644
--- a/spectrum/src/frontends/xmpp/vcardresponder.h
+++ b/spectrum/src/frontends/xmpp/vcardresponder.h
@@ -26,7 +26,6 @@
 #include "Swiften/Network/NetworkFactories.h"
 #include "Swiften/Network/Timer.h"
 #include "Swiften/SwiftenCompat.h"
-#include <boost/signal.hpp>
 
 namespace Transport {
 
@@ -41,8 +40,8 @@ class VCardResponder : public Swift::Responder<Swift::VCard> {
 
 		void sendVCard(unsigned int id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::VCard> vcard);
 
-		boost::signal<void (User *, const std::string &name, unsigned int id)> onVCardRequired;
-		boost::signal<void (User *, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::VCard> vcard)> onVCardUpdated;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (User *, const std::string &name, unsigned int id)> onVCardRequired;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (User *, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::VCard> vcard)> onVCardUpdated;
 
 		void collectTimeouted();