Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-06-02 18:54:54 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-06-02 18:56:06 (GMT) |
| commit | 9a0d8edbcb89c8d83839c4131425c1a1c598fca4 (patch) | |
| tree | 1cad70f294b2d7f73ef7c54a4207513b9307c90c | |
| parent | 721b89dee808c822db1a4211d58b3dd9fae55e62 (diff) | |
| download | swift-9a0d8edbcb89c8d83839c4131425c1a1c598fca4.zip swift-9a0d8edbcb89c8d83839c4131425c1a1c598fca4.tar.bz2 | |
Using Boost workaround for Qt signals keyword clash.
This should allow us to link against system boost versions.
65 files changed, 65 insertions, 65 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript index 43f0180..94ce893 100644 --- a/3rdParty/Boost/SConscript +++ b/3rdParty/Boost/SConscript @@ -1,6 +1,6 @@ Import("env") -cppdefines = ["BOOST_ALL_NO_LIB", ("BOOST_SIGNALS_NAMESPACE", "bsignals")] +cppdefines = ["BOOST_ALL_NO_LIB"] ################################################################################ # Flags diff --git a/SwifTools/Idle/IdleDetector.h b/SwifTools/Idle/IdleDetector.h index ac88bf9..b97ce6f 100644 --- a/SwifTools/Idle/IdleDetector.h +++ b/SwifTools/Idle/IdleDetector.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> namespace Swift { diff --git a/Swift/Controllers/Chat/ChatControllerBase.h b/Swift/Controllers/Chat/ChatControllerBase.h index f7cf087..c274b5a 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 <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.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 247a942..950fcbb 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 <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.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 6eba2a5..7250846 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 <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Base/String.h" #include "Swiften/JID/JID.h" diff --git a/Swift/Controllers/EventController.h b/Swift/Controllers/EventController.h index af230e9..4e44e33 100644 --- a/Swift/Controllers/EventController.h +++ b/Swift/Controllers/EventController.h @@ -8,7 +8,7 @@ #define SWIFTEN_EventController_H -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include <vector> diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h index 63e77f2..5d8897e 100644 --- a/Swift/Controllers/MainController.h +++ b/Swift/Controllers/MainController.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include <vector> diff --git a/Swift/Controllers/RosterController.h b/Swift/Controllers/RosterController.h index eca4e33..9e43a85 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 <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> namespace Swift { diff --git a/Swift/Controllers/UIEvents/UIEventStream.h b/Swift/Controllers/UIEvents/UIEventStream.h index 38ae9ef..151b4f1 100644 --- a/Swift/Controllers/UIEvents/UIEventStream.h +++ b/Swift/Controllers/UIEvents/UIEventStream.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.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 33133f3..36a1e0e 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 <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include <vector> diff --git a/Swift/Controllers/UIInterfaces/LoginWindow.h b/Swift/Controllers/UIInterfaces/LoginWindow.h index 15c2827..48d7265 100644 --- a/Swift/Controllers/UIInterfaces/LoginWindow.h +++ b/Swift/Controllers/UIInterfaces/LoginWindow.h @@ -9,7 +9,7 @@ #include "Swiften/Base/String.h" -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> namespace Swift { diff --git a/Swift/Controllers/UIInterfaces/MUCSearchWindow.h b/Swift/Controllers/UIInterfaces/MUCSearchWindow.h index 3114a5a..0197a94 100644 --- a/Swift/Controllers/UIInterfaces/MUCSearchWindow.h +++ b/Swift/Controllers/UIInterfaces/MUCSearchWindow.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.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 6d6e980..3526dd3 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 <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> namespace Swift { diff --git a/Swift/Controllers/XMLConsoleController.h b/Swift/Controllers/XMLConsoleController.h index 7fab1b9..c7b6841 100644 --- a/Swift/Controllers/XMLConsoleController.h +++ b/Swift/Controllers/XMLConsoleController.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/bind.hpp> #include <boost/shared_ptr.hpp> diff --git a/Swift/Controllers/XMPPRosterController.h b/Swift/Controllers/XMPPRosterController.h index a741469..8ecd3e4 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 <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> namespace Swift { diff --git a/Swiften/Avatars/AvatarManager.h b/Swiften/Avatars/AvatarManager.h index 96a6643..1466996 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 <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <map> #include "Swiften/JID/JID.h" diff --git a/Swiften/Chat/ChatStateNotifier.h b/Swiften/Chat/ChatStateNotifier.h index 23e445c..61bedeb 100644 --- a/Swiften/Chat/ChatStateNotifier.h +++ b/Swiften/Chat/ChatStateNotifier.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include "Swiften/Elements/ChatState.h" diff --git a/Swiften/Chat/ChatStateTracker.h b/Swiften/Chat/ChatStateTracker.h index 076e5d4..e4be7f7 100644 --- a/Swiften/Chat/ChatStateTracker.h +++ b/Swiften/Chat/ChatStateTracker.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include "Swiften/Elements/Message.h" diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h index e0714bb..cb68f2d 100644 --- a/Swiften/Client/Client.h +++ b/Swiften/Client/Client.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include "Swiften/Network/PlatformDomainNameResolver.h" diff --git a/Swiften/Client/ClientSession.h b/Swiften/Client/ClientSession.h index 37f8bea..099cd04 100644 --- a/Swiften/Client/ClientSession.h +++ b/Swiften/Client/ClientSession.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.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 3afbe20..871a254 100644 --- a/Swiften/Client/StanzaChannel.h +++ b/Swiften/Client/StanzaChannel.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include "Swiften/Queries/IQChannel.h" diff --git a/Swiften/Events/ErrorEvent.h b/Swiften/Events/ErrorEvent.h index 9a0d163..088e719 100644 --- a/Swiften/Events/ErrorEvent.h +++ b/Swiften/Events/ErrorEvent.h @@ -8,7 +8,7 @@ #include <cassert> -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include "Swiften/Events/StanzaEvent.h" diff --git a/Swiften/Events/MessageEvent.h b/Swiften/Events/MessageEvent.h index fb03623..74ae5f3 100644 --- a/Swiften/Events/MessageEvent.h +++ b/Swiften/Events/MessageEvent.h @@ -9,7 +9,7 @@ #include <cassert> -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include "Swiften/Events/StanzaEvent.h" diff --git a/Swiften/Events/StanzaEvent.h b/Swiften/Events/StanzaEvent.h index addeddd..661fe57 100644 --- a/Swiften/Events/StanzaEvent.h +++ b/Swiften/Events/StanzaEvent.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> namespace Swift { diff --git a/Swiften/Events/SubscriptionRequestEvent.h b/Swiften/Events/SubscriptionRequestEvent.h index 9f4dc07..988a7ee 100644 --- a/Swiften/Events/SubscriptionRequestEvent.h +++ b/Swiften/Events/SubscriptionRequestEvent.h @@ -8,7 +8,7 @@ #include <cassert> -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.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 af927d4..4974bd3 100644 --- a/Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h +++ b/Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/LinkLocal/DNSSD/DNSSDServiceID.h" diff --git a/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h b/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h index 4e6c401..7493eb9 100644 --- a/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h +++ b/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.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 49e7a08..c8ac645 100644 --- a/Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h +++ b/Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.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 f1f4966..0647cff 100644 --- a/Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h +++ b/Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/optional.hpp> #include "Swiften/LinkLocal/DNSSD/DNSSDServiceID.h" diff --git a/Swiften/LinkLocal/IncomingLinkLocalSession.h b/Swiften/LinkLocal/IncomingLinkLocalSession.h index 27f1032..e953d12 100644 --- a/Swiften/LinkLocal/IncomingLinkLocalSession.h +++ b/Swiften/LinkLocal/IncomingLinkLocalSession.h @@ -7,7 +7,7 @@ #pragma once #include <boost/shared_ptr.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Session/Session.h" #include "Swiften/JID/JID.h" diff --git a/Swiften/LinkLocal/LinkLocalConnector.h b/Swiften/LinkLocal/LinkLocalConnector.h index 964eebf..d04bdb0 100644 --- a/Swiften/LinkLocal/LinkLocalConnector.h +++ b/Swiften/LinkLocal/LinkLocalConnector.h @@ -7,7 +7,7 @@ #pragma once #include <boost/shared_ptr.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/enable_shared_from_this.hpp> #include <vector> diff --git a/Swiften/LinkLocal/LinkLocalServiceBrowser.h b/Swiften/LinkLocal/LinkLocalServiceBrowser.h index 0e65b0b..1b69302 100644 --- a/Swiften/LinkLocal/LinkLocalServiceBrowser.h +++ b/Swiften/LinkLocal/LinkLocalServiceBrowser.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.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 ae1fba3..16445a7 100644 --- a/Swiften/LinkLocal/OutgoingLinkLocalSession.h +++ b/Swiften/LinkLocal/OutgoingLinkLocalSession.h @@ -7,7 +7,7 @@ #pragma once #include <boost/shared_ptr.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/enable_shared_from_this.hpp> #include <vector> diff --git a/Swiften/MUC/MUC.h b/Swiften/MUC/MUC.h index fc691f1..d7fee2c 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 <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/signals/connection.hpp> #include <map> diff --git a/Swiften/MUC/MUCBookmarkManager.h b/Swiften/MUC/MUCBookmarkManager.h index 136c76f..f2d7ae1 100644 --- a/Swiften/MUC/MUCBookmarkManager.h +++ b/Swiften/MUC/MUCBookmarkManager.h @@ -9,7 +9,7 @@ #include <vector> #include <boost/shared_ptr.hpp> -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/optional.hpp> #include "Swiften/MUC/MUCBookmark.h" diff --git a/Swiften/Network/BoostConnectionServer.h b/Swiften/Network/BoostConnectionServer.h index 10b4df3..2a2a041 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 <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Network/BoostConnection.h" #include "Swiften/Network/ConnectionServer.h" diff --git a/Swiften/Network/Connection.h b/Swiften/Network/Connection.h index d19aa63..17c3d18 100644 --- a/Swiften/Network/Connection.h +++ b/Swiften/Network/Connection.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Base/ByteArray.h" #include "Swiften/Base/String.h" diff --git a/Swiften/Network/ConnectionServer.h b/Swiften/Network/ConnectionServer.h index 15dd869..0411056 100644 --- a/Swiften/Network/ConnectionServer.h +++ b/Swiften/Network/ConnectionServer.h @@ -7,7 +7,7 @@ #pragma once #include <boost/shared_ptr.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Network/Connection.h" diff --git a/Swiften/Network/Connector.h b/Swiften/Network/Connector.h index d283f2d..f0774a9 100644 --- a/Swiften/Network/Connector.h +++ b/Swiften/Network/Connector.h @@ -7,7 +7,7 @@ #pragma once #include <deque> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include "Swiften/Network/DomainNameServiceQuery.h" diff --git a/Swiften/Network/DomainNameAddressQuery.h b/Swiften/Network/DomainNameAddressQuery.h index fd26bd0..fcc9fb3 100644 --- a/Swiften/Network/DomainNameAddressQuery.h +++ b/Swiften/Network/DomainNameAddressQuery.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/optional.hpp> #include <boost/shared_ptr.hpp> diff --git a/Swiften/Network/DomainNameServiceQuery.h b/Swiften/Network/DomainNameServiceQuery.h index 286ac7b..c8474a3 100644 --- a/Swiften/Network/DomainNameServiceQuery.h +++ b/Swiften/Network/DomainNameServiceQuery.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/optional.hpp> #include <vector> diff --git a/Swiften/Network/Timer.h b/Swiften/Network/Timer.h index 8b92271..0042e92 100644 --- a/Swiften/Network/Timer.h +++ b/Swiften/Network/Timer.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.h" namespace Swift { class Timer { diff --git a/Swiften/Presence/PresenceOracle.h b/Swiften/Presence/PresenceOracle.h index d4c38b4..be288f0 100644 --- a/Swiften/Presence/PresenceOracle.h +++ b/Swiften/Presence/PresenceOracle.h @@ -10,7 +10,7 @@ #include "Swiften/Elements/Presence.h" #include <map> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" namespace Swift { class StanzaChannel; diff --git a/Swiften/Queries/GenericRequest.h b/Swiften/Queries/GenericRequest.h index 1d72d13..c257f25 100644 --- a/Swiften/Queries/GenericRequest.h +++ b/Swiften/Queries/GenericRequest.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Queries/Request.h" diff --git a/Swiften/Queries/IQChannel.h b/Swiften/Queries/IQChannel.h index 382978e..b39df1e 100644 --- a/Swiften/Queries/IQChannel.h +++ b/Swiften/Queries/IQChannel.h @@ -7,7 +7,7 @@ #ifndef SWIFTEN_IQChannel_H #define SWIFTEN_IQChannel_H -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.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 50f082f..9a3db16 100644 --- a/Swiften/Queries/Requests/GetPrivateStorageRequest.h +++ b/Swiften/Queries/Requests/GetPrivateStorageRequest.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.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 2bdb133..ce4fb7d 100644 --- a/Swiften/Queries/Requests/SetPrivateStorageRequest.h +++ b/Swiften/Queries/Requests/SetPrivateStorageRequest.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.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 0ce5aad..27879ee 100644 --- a/Swiften/Queries/Requests/SetRosterRequest.h +++ b/Swiften/Queries/Requests/SetRosterRequest.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signals.hpp> +#include "Swiften/Base/boost_signalslib.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 cf049e6..6014442 100644 --- a/Swiften/Queries/Responders/RosterPushResponder.h +++ b/Swiften/Queries/Responders/RosterPushResponder.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Queries/SetResponder.h" #include "Swiften/Elements/RosterPayload.h" diff --git a/Swiften/Roster/ContactRosterItem.h b/Swiften/Roster/ContactRosterItem.h index bd49e05..51c4ade 100644 --- a/Swiften/Roster/ContactRosterItem.h +++ b/Swiften/Roster/ContactRosterItem.h @@ -14,7 +14,7 @@ #include <map> #include <boost/bind.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> namespace Swift { diff --git a/Swiften/Roster/Roster.h b/Swiften/Roster/Roster.h index fcc075a..f6c751b 100644 --- a/Swiften/Roster/Roster.h +++ b/Swiften/Roster/Roster.h @@ -14,7 +14,7 @@ #include <vector> #include <map> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> namespace Swift { diff --git a/Swiften/Roster/RosterItem.h b/Swiften/Roster/RosterItem.h index 3a1a1b1..520a0f5 100644 --- a/Swiften/Roster/RosterItem.h +++ b/Swiften/Roster/RosterItem.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include "Swiften/Base/String.h" diff --git a/Swiften/Roster/XMPPRoster.h b/Swiften/Roster/XMPPRoster.h index 2e80b69..a193b34 100644 --- a/Swiften/Roster/XMPPRoster.h +++ b/Swiften/Roster/XMPPRoster.h @@ -13,7 +13,7 @@ #include <map> #include <vector> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" namespace Swift { diff --git a/Swiften/Server/ServerFromClientSession.h b/Swiften/Server/ServerFromClientSession.h index a26d9e8..8023848 100644 --- a/Swiften/Server/ServerFromClientSession.h +++ b/Swiften/Server/ServerFromClientSession.h @@ -7,7 +7,7 @@ #pragma once #include <boost/shared_ptr.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.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 9134096..5261bf2 100644 --- a/Swiften/Session/Session.h +++ b/Swiften/Session/Session.h @@ -7,7 +7,7 @@ #pragma once #include <boost/shared_ptr.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.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 f2d4a7b..c3f5cef 100644 --- a/Swiften/Session/SessionStream.h +++ b/Swiften/Session/SessionStream.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include "Swiften/Elements/ProtocolHeader.h" diff --git a/Swiften/StreamStack/CompressionLayer.h b/Swiften/StreamStack/CompressionLayer.h index cafdfc1..aa85f78 100644 --- a/Swiften/StreamStack/CompressionLayer.h +++ b/Swiften/StreamStack/CompressionLayer.h @@ -8,7 +8,7 @@ #define SWIFTEN_COMPRESSIONLAYER_H #include <boost/noncopyable.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Base/ByteArray.h" #include "Swiften/StreamStack/StreamLayer.h" diff --git a/Swiften/StreamStack/ConnectionLayer.h b/Swiften/StreamStack/ConnectionLayer.h index d4e508f..bba94d4 100644 --- a/Swiften/StreamStack/ConnectionLayer.h +++ b/Swiften/StreamStack/ConnectionLayer.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include "Swiften/StreamStack/LowLayer.h" diff --git a/Swiften/StreamStack/HighLayer.h b/Swiften/StreamStack/HighLayer.h index de02c55..41199cc 100644 --- a/Swiften/StreamStack/HighLayer.h +++ b/Swiften/StreamStack/HighLayer.h @@ -7,7 +7,7 @@ #ifndef SWIFTEN_HIGHLAYER_H #define SWIFTEN_HIGHLAYER_H -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Base/ByteArray.h" diff --git a/Swiften/StreamStack/LowLayer.h b/Swiften/StreamStack/LowLayer.h index 5c1860a..b493600 100644 --- a/Swiften/StreamStack/LowLayer.h +++ b/Swiften/StreamStack/LowLayer.h @@ -7,7 +7,7 @@ #ifndef SWIFTEN_LOWLAYER_H #define SWIFTEN_LOWLAYER_H -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Base/ByteArray.h" diff --git a/Swiften/StreamStack/OpenSSLLayer.h b/Swiften/StreamStack/OpenSSLLayer.h index 3e0c7a0..128569d 100644 --- a/Swiften/StreamStack/OpenSSLLayer.h +++ b/Swiften/StreamStack/OpenSSLLayer.h @@ -8,7 +8,7 @@ #define SWIFTEN_OpenSSLLayer_H #include <boost/noncopyable.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Base/ByteArray.h" #include "Swiften/StreamStack/TLSLayer.h" diff --git a/Swiften/StreamStack/StreamLayer.h b/Swiften/StreamStack/StreamLayer.h index cb91657..6742012 100644 --- a/Swiften/StreamStack/StreamLayer.h +++ b/Swiften/StreamStack/StreamLayer.h @@ -7,7 +7,7 @@ #ifndef SWIFTEN_STREAMLAYER_H #define SWIFTEN_STREAMLAYER_H -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/StreamStack/LowLayer.h" #include "Swiften/StreamStack/HighLayer.h" diff --git a/Swiften/StreamStack/StreamStack.h b/Swiften/StreamStack/StreamStack.h index 0f9245a..a641c55 100644 --- a/Swiften/StreamStack/StreamStack.h +++ b/Swiften/StreamStack/StreamStack.h @@ -7,7 +7,7 @@ #pragma once #include <boost/shared_ptr.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <vector> #include "Swiften/Elements/Stanza.h" diff --git a/Swiften/StreamStack/XMPPLayer.h b/Swiften/StreamStack/XMPPLayer.h index 7037781..f45657a 100644 --- a/Swiften/StreamStack/XMPPLayer.h +++ b/Swiften/StreamStack/XMPPLayer.h @@ -7,7 +7,7 @@ #pragma once #include <boost/shared_ptr.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.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 2dbc3a6..005384b 100644 --- a/Swiften/TLS/OpenSSL/OpenSSLContext.h +++ b/Swiften/TLS/OpenSSL/OpenSSLContext.h @@ -5,7 +5,7 @@ */ #include <openssl/ssl.h> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/noncopyable.hpp> #include "Swiften/Base/ByteArray.h" |