summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-06-02 19:17:35 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-06-02 19:17:35 (GMT)
commit97ec7b0861c282c687e9c5bb8aa8bce871b482ba (patch)
tree00ddc8605579043ff6dfe0a859753757da1d2962
parent3362805ffb92452a82b6ca5866377cd85fae764f (diff)
downloadswift-contrib-97ec7b0861c282c687e9c5bb8aa8bce871b482ba.zip
swift-contrib-97ec7b0861c282c687e9c5bb8aa8bce871b482ba.tar.bz2
Rename boost_signalslib.h to boost_bsignals.
-rw-r--r--Slimber/LinkLocalPresenceManager.h2
-rw-r--r--Slimber/Menulet.h3
-rw-r--r--SwifTools/Idle/IdleDetector.h2
-rw-r--r--Swift/Controllers/Chat/ChatControllerBase.h2
-rw-r--r--Swift/Controllers/Chat/MUCController.h2
-rw-r--r--Swift/Controllers/Chat/MUCSearchController.h2
-rw-r--r--Swift/Controllers/EventController.h2
-rw-r--r--Swift/Controllers/MainController.h2
-rw-r--r--Swift/Controllers/RosterController.h2
-rw-r--r--Swift/Controllers/UIEvents/UIEventStream.h2
-rw-r--r--Swift/Controllers/UIInterfaces/ChatWindow.h2
-rw-r--r--Swift/Controllers/UIInterfaces/LoginWindow.h2
-rw-r--r--Swift/Controllers/UIInterfaces/MUCSearchWindow.h2
-rw-r--r--Swift/Controllers/UIInterfaces/MainWindow.h2
-rw-r--r--Swift/Controllers/XMLConsoleController.h2
-rw-r--r--Swift/Controllers/XMPPRosterController.h2
-rw-r--r--Swift/Packaging/Debian/debian/control2
-rw-r--r--Swiften/Avatars/AvatarManager.h2
-rw-r--r--Swiften/Base/boost_bsignals.h (renamed from Swiften/Base/boost_signalslib.h)0
-rw-r--r--Swiften/Chat/ChatStateNotifier.h2
-rw-r--r--Swiften/Chat/ChatStateTracker.h2
-rw-r--r--Swiften/Client/Client.h2
-rw-r--r--Swiften/Client/ClientSession.h2
-rw-r--r--Swiften/Client/StanzaChannel.h2
-rw-r--r--Swiften/Events/ErrorEvent.h2
-rw-r--r--Swiften/Events/MessageEvent.h2
-rw-r--r--Swiften/Events/StanzaEvent.h2
-rw-r--r--Swiften/Events/SubscriptionRequestEvent.h2
-rw-r--r--Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h2
-rw-r--r--Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h2
-rw-r--r--Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h2
-rw-r--r--Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h2
-rw-r--r--Swiften/LinkLocal/IncomingLinkLocalSession.h2
-rw-r--r--Swiften/LinkLocal/LinkLocalConnector.h2
-rw-r--r--Swiften/LinkLocal/LinkLocalServiceBrowser.h2
-rw-r--r--Swiften/LinkLocal/OutgoingLinkLocalSession.h2
-rw-r--r--Swiften/MUC/MUC.h2
-rw-r--r--Swiften/MUC/MUCBookmarkManager.h2
-rw-r--r--Swiften/Network/BoostConnectionServer.h2
-rw-r--r--Swiften/Network/Connection.h2
-rw-r--r--Swiften/Network/ConnectionServer.h2
-rw-r--r--Swiften/Network/Connector.h2
-rw-r--r--Swiften/Network/DomainNameAddressQuery.h2
-rw-r--r--Swiften/Network/DomainNameServiceQuery.h2
-rw-r--r--Swiften/Network/Timer.h2
-rw-r--r--Swiften/Presence/PresenceOracle.h2
-rw-r--r--Swiften/Queries/GenericRequest.h2
-rw-r--r--Swiften/Queries/IQChannel.h2
-rw-r--r--Swiften/Queries/Requests/GetPrivateStorageRequest.h2
-rw-r--r--Swiften/Queries/Requests/SetPrivateStorageRequest.h2
-rw-r--r--Swiften/Queries/Requests/SetRosterRequest.h2
-rw-r--r--Swiften/Queries/Responders/RosterPushResponder.h2
-rw-r--r--Swiften/Roster/ContactRosterItem.h2
-rw-r--r--Swiften/Roster/Roster.h2
-rw-r--r--Swiften/Roster/RosterItem.h2
-rw-r--r--Swiften/Roster/XMPPRoster.h2
-rw-r--r--Swiften/Server/ServerFromClientSession.h2
-rw-r--r--Swiften/Session/Session.h2
-rw-r--r--Swiften/Session/SessionStream.h2
-rw-r--r--Swiften/StreamStack/CompressionLayer.h2
-rw-r--r--Swiften/StreamStack/ConnectionLayer.h2
-rw-r--r--Swiften/StreamStack/HighLayer.h2
-rw-r--r--Swiften/StreamStack/LowLayer.h2
-rw-r--r--Swiften/StreamStack/OpenSSLLayer.h2
-rw-r--r--Swiften/StreamStack/StreamLayer.h2
-rw-r--r--Swiften/StreamStack/StreamStack.h2
-rw-r--r--Swiften/StreamStack/XMPPLayer.h2
-rw-r--r--Swiften/TLS/OpenSSL/OpenSSLContext.h2
68 files changed, 67 insertions, 68 deletions
diff --git a/Slimber/LinkLocalPresenceManager.h b/Slimber/LinkLocalPresenceManager.h
index 96a166a..25069fa 100644
--- a/Slimber/LinkLocalPresenceManager.h
+++ b/Slimber/LinkLocalPresenceManager.h
@@ -7,7 +7,7 @@
#pragma once
#include <boost/shared_ptr.hpp>
-#include <boost/signal.hpp>
+#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/Elements/RosterItemPayload.h"
#include "Swiften/Base/String.h"
diff --git a/Slimber/Menulet.h b/Slimber/Menulet.h
index d1ff9e2..6ecdcc5 100644
--- a/Slimber/Menulet.h
+++ b/Slimber/Menulet.h
@@ -6,9 +6,8 @@
#pragma once
-#include <boost/signal.hpp>
-
#include "Swiften/Base/String.h"
+#include "Swiften/Base/boost_bsignals.h"
class Menulet {
public:
diff --git a/SwifTools/Idle/IdleDetector.h b/SwifTools/Idle/IdleDetector.h
index b97ce6f..051facc 100644
--- a/SwifTools/Idle/IdleDetector.h
+++ b/SwifTools/Idle/IdleDetector.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
namespace Swift {
diff --git a/Swift/Controllers/Chat/ChatControllerBase.h b/Swift/Controllers/Chat/ChatControllerBase.h
index c274b5a..e4d14af 100644
--- a/Swift/Controllers/Chat/ChatControllerBase.h
+++ b/Swift/Controllers/Chat/ChatControllerBase.h
@@ -10,7 +10,7 @@
#include <map>
#include <vector>
#include <boost/shared_ptr.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/filesystem.hpp>
#include "Swiften/Base/String.h"
diff --git a/Swift/Controllers/Chat/MUCController.h b/Swift/Controllers/Chat/MUCController.h
index 950fcbb..bf46a08 100644
--- a/Swift/Controllers/Chat/MUCController.h
+++ b/Swift/Controllers/Chat/MUCController.h
@@ -7,7 +7,7 @@
#pragma once
#include <boost/shared_ptr.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/signals/connection.hpp>
#include "Swiften/Base/String.h"
diff --git a/Swift/Controllers/Chat/MUCSearchController.h b/Swift/Controllers/Chat/MUCSearchController.h
index 7250846..44b51d8 100644
--- a/Swift/Controllers/Chat/MUCSearchController.h
+++ b/Swift/Controllers/Chat/MUCSearchController.h
@@ -10,7 +10,7 @@
#include <map>
#include <boost/shared_ptr.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/Base/String.h"
#include "Swiften/JID/JID.h"
diff --git a/Swift/Controllers/EventController.h b/Swift/Controllers/EventController.h
index 4e44e33..f96f4d8 100644
--- a/Swift/Controllers/EventController.h
+++ b/Swift/Controllers/EventController.h
@@ -8,7 +8,7 @@
#define SWIFTEN_EventController_H
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include <vector>
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index 5d8897e..ba96d3a 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include <vector>
diff --git a/Swift/Controllers/RosterController.h b/Swift/Controllers/RosterController.h
index 9e43a85..b01db96 100644
--- a/Swift/Controllers/RosterController.h
+++ b/Swift/Controllers/RosterController.h
@@ -14,7 +14,7 @@
#include "Swiften/Avatars/AvatarManager.h"
#include "Swift/Controllers/UIEvents/UIEvent.h"
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
namespace Swift {
diff --git a/Swift/Controllers/UIEvents/UIEventStream.h b/Swift/Controllers/UIEvents/UIEventStream.h
index 151b4f1..e174029 100644
--- a/Swift/Controllers/UIEvents/UIEventStream.h
+++ b/Swift/Controllers/UIEvents/UIEventStream.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swift/Controllers/UIEvents/UIEvent.h"
diff --git a/Swift/Controllers/UIInterfaces/ChatWindow.h b/Swift/Controllers/UIInterfaces/ChatWindow.h
index 36a1e0e..7beb074 100644
--- a/Swift/Controllers/UIInterfaces/ChatWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatWindow.h
@@ -8,7 +8,7 @@
#define SWIFTEN_CHATWINDOW_H
#include <boost/optional.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include <vector>
diff --git a/Swift/Controllers/UIInterfaces/LoginWindow.h b/Swift/Controllers/UIInterfaces/LoginWindow.h
index 48d7265..c752d0a 100644
--- a/Swift/Controllers/UIInterfaces/LoginWindow.h
+++ b/Swift/Controllers/UIInterfaces/LoginWindow.h
@@ -9,7 +9,7 @@
#include "Swiften/Base/String.h"
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
namespace Swift {
diff --git a/Swift/Controllers/UIInterfaces/MUCSearchWindow.h b/Swift/Controllers/UIInterfaces/MUCSearchWindow.h
index 0197a94..9a4b9b3 100644
--- a/Swift/Controllers/UIInterfaces/MUCSearchWindow.h
+++ b/Swift/Controllers/UIInterfaces/MUCSearchWindow.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/Base/String.h"
#include "Swiften/JID/JID.h"
diff --git a/Swift/Controllers/UIInterfaces/MainWindow.h b/Swift/Controllers/UIInterfaces/MainWindow.h
index 3526dd3..4709499 100644
--- a/Swift/Controllers/UIInterfaces/MainWindow.h
+++ b/Swift/Controllers/UIInterfaces/MainWindow.h
@@ -11,7 +11,7 @@
#include "Swiften/JID/JID.h"
#include "Swiften/Elements/StatusShow.h"
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
namespace Swift {
diff --git a/Swift/Controllers/XMLConsoleController.h b/Swift/Controllers/XMLConsoleController.h
index c7b6841..3e1d990 100644
--- a/Swift/Controllers/XMLConsoleController.h
+++ b/Swift/Controllers/XMLConsoleController.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
diff --git a/Swift/Controllers/XMPPRosterController.h b/Swift/Controllers/XMPPRosterController.h
index 8ecd3e4..9306051 100644
--- a/Swift/Controllers/XMPPRosterController.h
+++ b/Swift/Controllers/XMPPRosterController.h
@@ -12,7 +12,7 @@
#include "Swiften/Elements/RosterPayload.h"
#include "Swiften/Queries/Responders/RosterPushResponder.h"
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
namespace Swift {
diff --git a/Swift/Packaging/Debian/debian/control b/Swift/Packaging/Debian/debian/control
index 1291c73..76e1677 100644
--- a/Swift/Packaging/Debian/debian/control
+++ b/Swift/Packaging/Debian/debian/control
@@ -2,7 +2,7 @@ Source: swift
Section: x11
Priority: optional
Maintainer: Remko Tronçon <dev@el-tramo.be>
-Build-Depends: debhelper (>= 7), scons (>= 1.2.0), libssl-dev (>= 0.9.8k), libqt4-dev (>= 4.5.3), libexpat1-dev (>= 2.0.1), lintian (>= 2.3.4), libxss-dev (>= 1.2.0)
+Build-Depends: debhelper (>= 7), scons (>= 1.2.0), libssl-dev (>= 0.9.8k), libqt4-dev (>= 4.5.3), libexpat1-dev (>= 2.0.1), lintian (>= 2.3.4), libxss-dev (>= 1.2.0), libboost-dev (>= 1.40.0), libboost-filesystem-dev (>= 1.40.0), libboost-program-options-dev (>= 1.40.0), libboost-regex-dev (>= 1.40.0), libboost-signals-dev (>= 1.40.0), libboost-system-dev (>= 1.40.0), libboost-thread-dev (>= 1.40.0)
Standards-Version: 3.8.4
Homepage: http://swift.im
diff --git a/Swiften/Avatars/AvatarManager.h b/Swiften/Avatars/AvatarManager.h
index 1466996..ad4b30f 100644
--- a/Swiften/Avatars/AvatarManager.h
+++ b/Swiften/Avatars/AvatarManager.h
@@ -9,7 +9,7 @@
#include <boost/filesystem.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <map>
#include "Swiften/JID/JID.h"
diff --git a/Swiften/Base/boost_signalslib.h b/Swiften/Base/boost_bsignals.h
index 7609c94..7609c94 100644
--- a/Swiften/Base/boost_signalslib.h
+++ b/Swiften/Base/boost_bsignals.h
diff --git a/Swiften/Chat/ChatStateNotifier.h b/Swiften/Chat/ChatStateNotifier.h
index 61bedeb..71febfa 100644
--- a/Swiften/Chat/ChatStateNotifier.h
+++ b/Swiften/Chat/ChatStateNotifier.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swiften/Elements/ChatState.h"
diff --git a/Swiften/Chat/ChatStateTracker.h b/Swiften/Chat/ChatStateTracker.h
index e4be7f7..c8e8cb5 100644
--- a/Swiften/Chat/ChatStateTracker.h
+++ b/Swiften/Chat/ChatStateTracker.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swiften/Elements/Message.h"
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index cb68f2d..313f856 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swiften/Network/PlatformDomainNameResolver.h"
diff --git a/Swiften/Client/ClientSession.h b/Swiften/Client/ClientSession.h
index 099cd04..936fd18 100644
--- a/Swiften/Client/ClientSession.h
+++ b/Swiften/Client/ClientSession.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include <boost/enable_shared_from_this.hpp>
diff --git a/Swiften/Client/StanzaChannel.h b/Swiften/Client/StanzaChannel.h
index 871a254..bfde05c 100644
--- a/Swiften/Client/StanzaChannel.h
+++ b/Swiften/Client/StanzaChannel.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swiften/Queries/IQChannel.h"
diff --git a/Swiften/Events/ErrorEvent.h b/Swiften/Events/ErrorEvent.h
index 088e719..6ab9d03 100644
--- a/Swiften/Events/ErrorEvent.h
+++ b/Swiften/Events/ErrorEvent.h
@@ -8,7 +8,7 @@
#include <cassert>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swiften/Events/StanzaEvent.h"
diff --git a/Swiften/Events/MessageEvent.h b/Swiften/Events/MessageEvent.h
index 74ae5f3..0c10c8c 100644
--- a/Swiften/Events/MessageEvent.h
+++ b/Swiften/Events/MessageEvent.h
@@ -9,7 +9,7 @@
#include <cassert>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swiften/Events/StanzaEvent.h"
diff --git a/Swiften/Events/StanzaEvent.h b/Swiften/Events/StanzaEvent.h
index 661fe57..69fbe27 100644
--- a/Swiften/Events/StanzaEvent.h
+++ b/Swiften/Events/StanzaEvent.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
namespace Swift {
diff --git a/Swiften/Events/SubscriptionRequestEvent.h b/Swiften/Events/SubscriptionRequestEvent.h
index 988a7ee..ba3522b 100644
--- a/Swiften/Events/SubscriptionRequestEvent.h
+++ b/Swiften/Events/SubscriptionRequestEvent.h
@@ -8,7 +8,7 @@
#include <cassert>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swiften/Events/StanzaEvent.h"
diff --git a/Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h b/Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h
index 4974bd3..5871866 100644
--- a/Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h
+++ b/Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/LinkLocal/DNSSD/DNSSDServiceID.h"
diff --git a/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h b/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h
index 7493eb9..ceff862 100644
--- a/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h
+++ b/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/optional.hpp>
#include "Swiften/LinkLocal/DNSSD/DNSSDServiceID.h"
diff --git a/Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h b/Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h
index c8ac645..cfaf28f 100644
--- a/Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h
+++ b/Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/optional.hpp>
#include "Swiften/Network/HostAddress.h"
diff --git a/Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h b/Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h
index 0647cff..b5ce232 100644
--- a/Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h
+++ b/Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/optional.hpp>
#include "Swiften/LinkLocal/DNSSD/DNSSDServiceID.h"
diff --git a/Swiften/LinkLocal/IncomingLinkLocalSession.h b/Swiften/LinkLocal/IncomingLinkLocalSession.h
index e953d12..2973330 100644
--- a/Swiften/LinkLocal/IncomingLinkLocalSession.h
+++ b/Swiften/LinkLocal/IncomingLinkLocalSession.h
@@ -7,7 +7,7 @@
#pragma once
#include <boost/shared_ptr.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/Session/Session.h"
#include "Swiften/JID/JID.h"
diff --git a/Swiften/LinkLocal/LinkLocalConnector.h b/Swiften/LinkLocal/LinkLocalConnector.h
index d04bdb0..0fbb7ec 100644
--- a/Swiften/LinkLocal/LinkLocalConnector.h
+++ b/Swiften/LinkLocal/LinkLocalConnector.h
@@ -7,7 +7,7 @@
#pragma once
#include <boost/shared_ptr.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/enable_shared_from_this.hpp>
#include <vector>
diff --git a/Swiften/LinkLocal/LinkLocalServiceBrowser.h b/Swiften/LinkLocal/LinkLocalServiceBrowser.h
index 1b69302..6918150 100644
--- a/Swiften/LinkLocal/LinkLocalServiceBrowser.h
+++ b/Swiften/LinkLocal/LinkLocalServiceBrowser.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
#include <map>
diff --git a/Swiften/LinkLocal/OutgoingLinkLocalSession.h b/Swiften/LinkLocal/OutgoingLinkLocalSession.h
index 16445a7..2c339bb 100644
--- a/Swiften/LinkLocal/OutgoingLinkLocalSession.h
+++ b/Swiften/LinkLocal/OutgoingLinkLocalSession.h
@@ -7,7 +7,7 @@
#pragma once
#include <boost/shared_ptr.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/enable_shared_from_this.hpp>
#include <vector>
diff --git a/Swiften/MUC/MUC.h b/Swiften/MUC/MUC.h
index d7fee2c..4bf56c9 100644
--- a/Swiften/MUC/MUC.h
+++ b/Swiften/MUC/MUC.h
@@ -13,7 +13,7 @@
#include "Swiften/MUC/MUCOccupant.h"
#include <boost/shared_ptr.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/signals/connection.hpp>
#include <map>
diff --git a/Swiften/MUC/MUCBookmarkManager.h b/Swiften/MUC/MUCBookmarkManager.h
index f2d7ae1..a942595 100644
--- a/Swiften/MUC/MUCBookmarkManager.h
+++ b/Swiften/MUC/MUCBookmarkManager.h
@@ -9,7 +9,7 @@
#include <vector>
#include <boost/shared_ptr.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/optional.hpp>
#include "Swiften/MUC/MUCBookmark.h"
diff --git a/Swiften/Network/BoostConnectionServer.h b/Swiften/Network/BoostConnectionServer.h
index 2a2a041..311be4b 100644
--- a/Swiften/Network/BoostConnectionServer.h
+++ b/Swiften/Network/BoostConnectionServer.h
@@ -9,7 +9,7 @@
#include <boost/shared_ptr.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <boost/asio.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/Network/BoostConnection.h"
#include "Swiften/Network/ConnectionServer.h"
diff --git a/Swiften/Network/Connection.h b/Swiften/Network/Connection.h
index 17c3d18..34f3ade 100644
--- a/Swiften/Network/Connection.h
+++ b/Swiften/Network/Connection.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/Base/ByteArray.h"
#include "Swiften/Base/String.h"
diff --git a/Swiften/Network/ConnectionServer.h b/Swiften/Network/ConnectionServer.h
index 0411056..5597d1b 100644
--- a/Swiften/Network/ConnectionServer.h
+++ b/Swiften/Network/ConnectionServer.h
@@ -7,7 +7,7 @@
#pragma once
#include <boost/shared_ptr.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/Network/Connection.h"
diff --git a/Swiften/Network/Connector.h b/Swiften/Network/Connector.h
index f0774a9..6442a8f 100644
--- a/Swiften/Network/Connector.h
+++ b/Swiften/Network/Connector.h
@@ -7,7 +7,7 @@
#pragma once
#include <deque>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swiften/Network/DomainNameServiceQuery.h"
diff --git a/Swiften/Network/DomainNameAddressQuery.h b/Swiften/Network/DomainNameAddressQuery.h
index fcc9fb3..390916f 100644
--- a/Swiften/Network/DomainNameAddressQuery.h
+++ b/Swiften/Network/DomainNameAddressQuery.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/optional.hpp>
#include <boost/shared_ptr.hpp>
diff --git a/Swiften/Network/DomainNameServiceQuery.h b/Swiften/Network/DomainNameServiceQuery.h
index c8474a3..3ba3a00 100644
--- a/Swiften/Network/DomainNameServiceQuery.h
+++ b/Swiften/Network/DomainNameServiceQuery.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/optional.hpp>
#include <vector>
diff --git a/Swiften/Network/Timer.h b/Swiften/Network/Timer.h
index 0042e92..873837d 100644
--- a/Swiften/Network/Timer.h
+++ b/Swiften/Network/Timer.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
namespace Swift {
class Timer {
diff --git a/Swiften/Presence/PresenceOracle.h b/Swiften/Presence/PresenceOracle.h
index be288f0..9f64000 100644
--- a/Swiften/Presence/PresenceOracle.h
+++ b/Swiften/Presence/PresenceOracle.h
@@ -10,7 +10,7 @@
#include "Swiften/Elements/Presence.h"
#include <map>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
namespace Swift {
class StanzaChannel;
diff --git a/Swiften/Queries/GenericRequest.h b/Swiften/Queries/GenericRequest.h
index c257f25..be6a88d 100644
--- a/Swiften/Queries/GenericRequest.h
+++ b/Swiften/Queries/GenericRequest.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/Queries/Request.h"
diff --git a/Swiften/Queries/IQChannel.h b/Swiften/Queries/IQChannel.h
index b39df1e..2f18111 100644
--- a/Swiften/Queries/IQChannel.h
+++ b/Swiften/Queries/IQChannel.h
@@ -7,7 +7,7 @@
#ifndef SWIFTEN_IQChannel_H
#define SWIFTEN_IQChannel_H
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swiften/Base/String.h"
diff --git a/Swiften/Queries/Requests/GetPrivateStorageRequest.h b/Swiften/Queries/Requests/GetPrivateStorageRequest.h
index 9a3db16..d44d5d8 100644
--- a/Swiften/Queries/Requests/GetPrivateStorageRequest.h
+++ b/Swiften/Queries/Requests/GetPrivateStorageRequest.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swiften/Queries/Request.h"
diff --git a/Swiften/Queries/Requests/SetPrivateStorageRequest.h b/Swiften/Queries/Requests/SetPrivateStorageRequest.h
index ce4fb7d..ebdfca8 100644
--- a/Swiften/Queries/Requests/SetPrivateStorageRequest.h
+++ b/Swiften/Queries/Requests/SetPrivateStorageRequest.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swiften/Queries/Request.h"
diff --git a/Swiften/Queries/Requests/SetRosterRequest.h b/Swiften/Queries/Requests/SetRosterRequest.h
index 27879ee..1f47cfe 100644
--- a/Swiften/Queries/Requests/SetRosterRequest.h
+++ b/Swiften/Queries/Requests/SetRosterRequest.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swiften/Queries/Request.h"
diff --git a/Swiften/Queries/Responders/RosterPushResponder.h b/Swiften/Queries/Responders/RosterPushResponder.h
index 6014442..8c57fd3 100644
--- a/Swiften/Queries/Responders/RosterPushResponder.h
+++ b/Swiften/Queries/Responders/RosterPushResponder.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/Queries/SetResponder.h"
#include "Swiften/Elements/RosterPayload.h"
diff --git a/Swiften/Roster/ContactRosterItem.h b/Swiften/Roster/ContactRosterItem.h
index 51c4ade..d4c92aa 100644
--- a/Swiften/Roster/ContactRosterItem.h
+++ b/Swiften/Roster/ContactRosterItem.h
@@ -14,7 +14,7 @@
#include <map>
#include <boost/bind.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
namespace Swift {
diff --git a/Swiften/Roster/Roster.h b/Swiften/Roster/Roster.h
index f6c751b..78606e8 100644
--- a/Swiften/Roster/Roster.h
+++ b/Swiften/Roster/Roster.h
@@ -14,7 +14,7 @@
#include <vector>
#include <map>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
namespace Swift {
diff --git a/Swiften/Roster/RosterItem.h b/Swiften/Roster/RosterItem.h
index 520a0f5..35dbe73 100644
--- a/Swiften/Roster/RosterItem.h
+++ b/Swiften/Roster/RosterItem.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swiften/Base/String.h"
diff --git a/Swiften/Roster/XMPPRoster.h b/Swiften/Roster/XMPPRoster.h
index a193b34..97477bc 100644
--- a/Swiften/Roster/XMPPRoster.h
+++ b/Swiften/Roster/XMPPRoster.h
@@ -13,7 +13,7 @@
#include <map>
#include <vector>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
namespace Swift {
diff --git a/Swiften/Server/ServerFromClientSession.h b/Swiften/Server/ServerFromClientSession.h
index 8023848..5883742 100644
--- a/Swiften/Server/ServerFromClientSession.h
+++ b/Swiften/Server/ServerFromClientSession.h
@@ -7,7 +7,7 @@
#pragma once
#include <boost/shared_ptr.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/enable_shared_from_this.hpp>
#include "Swiften/Base/String.h"
diff --git a/Swiften/Session/Session.h b/Swiften/Session/Session.h
index 5261bf2..d0ebabb 100644
--- a/Swiften/Session/Session.h
+++ b/Swiften/Session/Session.h
@@ -7,7 +7,7 @@
#pragma once
#include <boost/shared_ptr.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/optional.hpp>
#include <boost/enable_shared_from_this.hpp>
diff --git a/Swiften/Session/SessionStream.h b/Swiften/Session/SessionStream.h
index c3f5cef..b2bf9a6 100644
--- a/Swiften/Session/SessionStream.h
+++ b/Swiften/Session/SessionStream.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swiften/Elements/ProtocolHeader.h"
diff --git a/Swiften/StreamStack/CompressionLayer.h b/Swiften/StreamStack/CompressionLayer.h
index aa85f78..4da053d 100644
--- a/Swiften/StreamStack/CompressionLayer.h
+++ b/Swiften/StreamStack/CompressionLayer.h
@@ -8,7 +8,7 @@
#define SWIFTEN_COMPRESSIONLAYER_H
#include <boost/noncopyable.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/Base/ByteArray.h"
#include "Swiften/StreamStack/StreamLayer.h"
diff --git a/Swiften/StreamStack/ConnectionLayer.h b/Swiften/StreamStack/ConnectionLayer.h
index bba94d4..be72979 100644
--- a/Swiften/StreamStack/ConnectionLayer.h
+++ b/Swiften/StreamStack/ConnectionLayer.h
@@ -6,7 +6,7 @@
#pragma once
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/shared_ptr.hpp>
#include "Swiften/StreamStack/LowLayer.h"
diff --git a/Swiften/StreamStack/HighLayer.h b/Swiften/StreamStack/HighLayer.h
index 41199cc..f15621e 100644
--- a/Swiften/StreamStack/HighLayer.h
+++ b/Swiften/StreamStack/HighLayer.h
@@ -7,7 +7,7 @@
#ifndef SWIFTEN_HIGHLAYER_H
#define SWIFTEN_HIGHLAYER_H
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/Base/ByteArray.h"
diff --git a/Swiften/StreamStack/LowLayer.h b/Swiften/StreamStack/LowLayer.h
index b493600..2224adc 100644
--- a/Swiften/StreamStack/LowLayer.h
+++ b/Swiften/StreamStack/LowLayer.h
@@ -7,7 +7,7 @@
#ifndef SWIFTEN_LOWLAYER_H
#define SWIFTEN_LOWLAYER_H
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/Base/ByteArray.h"
diff --git a/Swiften/StreamStack/OpenSSLLayer.h b/Swiften/StreamStack/OpenSSLLayer.h
index 128569d..e6f9b9b 100644
--- a/Swiften/StreamStack/OpenSSLLayer.h
+++ b/Swiften/StreamStack/OpenSSLLayer.h
@@ -8,7 +8,7 @@
#define SWIFTEN_OpenSSLLayer_H
#include <boost/noncopyable.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/Base/ByteArray.h"
#include "Swiften/StreamStack/TLSLayer.h"
diff --git a/Swiften/StreamStack/StreamLayer.h b/Swiften/StreamStack/StreamLayer.h
index 6742012..7ce1149 100644
--- a/Swiften/StreamStack/StreamLayer.h
+++ b/Swiften/StreamStack/StreamLayer.h
@@ -7,7 +7,7 @@
#ifndef SWIFTEN_STREAMLAYER_H
#define SWIFTEN_STREAMLAYER_H
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/StreamStack/LowLayer.h"
#include "Swiften/StreamStack/HighLayer.h"
diff --git a/Swiften/StreamStack/StreamStack.h b/Swiften/StreamStack/StreamStack.h
index a641c55..56bc2de 100644
--- a/Swiften/StreamStack/StreamStack.h
+++ b/Swiften/StreamStack/StreamStack.h
@@ -7,7 +7,7 @@
#pragma once
#include <boost/shared_ptr.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <vector>
#include "Swiften/Elements/Stanza.h"
diff --git a/Swiften/StreamStack/XMPPLayer.h b/Swiften/StreamStack/XMPPLayer.h
index f45657a..0df1f14 100644
--- a/Swiften/StreamStack/XMPPLayer.h
+++ b/Swiften/StreamStack/XMPPLayer.h
@@ -7,7 +7,7 @@
#pragma once
#include <boost/shared_ptr.hpp>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/noncopyable.hpp>
#include "Swiften/Base/ByteArray.h"
diff --git a/Swiften/TLS/OpenSSL/OpenSSLContext.h b/Swiften/TLS/OpenSSL/OpenSSLContext.h
index 005384b..6b97bd8 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLContext.h
+++ b/Swiften/TLS/OpenSSL/OpenSSLContext.h
@@ -5,7 +5,7 @@
*/
#include <openssl/ssl.h>
-#include "Swiften/Base/boost_signalslib.h"
+#include "Swiften/Base/boost_bsignals.h"
#include <boost/noncopyable.hpp>
#include "Swiften/Base/ByteArray.h"