Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-05 13:17:19 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-05 19:42:39 (GMT) |
| commit | 2b560b129b7a31fc8cc07f618e763c95a22bf832 (patch) | |
| tree | 73e72cdc758b79d01485dc28dcedd48b26859ae8 /Slimber | |
| parent | 3c560e31b0f168da917e8d566db01fd1cd997d86 (diff) | |
| download | swift-2b560b129b7a31fc8cc07f618e763c95a22bf832.zip swift-2b560b129b7a31fc8cc07f618e763c95a22bf832.tar.bz2 | |
Migrate to Boost.Signals2 from Boost.Signals
Boost.Signals was deprecated and is not improved further.
This patch removes Boost.Signals from 3rdParty and adds
Boost.Signals2 and its dependencies.
Also removed the Qt signals compatibility file
Swiften/Base/boost_bsignals.h.
Test-Information:
Build and ran unit tests on OS X 10.11.4. Confirmed successful
login using Swift client.
Change-Id: Ie6e3b2d15aac2462cda95401582f5287a479fb54
Diffstat (limited to 'Slimber')
| -rw-r--r-- | Slimber/LinkLocalPresenceManager.h | 9 | ||||
| -rw-r--r-- | Slimber/Menulet.h | 4 | ||||
| -rw-r--r-- | Slimber/MenuletController.h | 4 | ||||
| -rw-r--r-- | Slimber/Server.cpp | 4 | ||||
| -rw-r--r-- | Slimber/Server.h | 8 |
5 files changed, 15 insertions, 14 deletions
diff --git a/Slimber/LinkLocalPresenceManager.h b/Slimber/LinkLocalPresenceManager.h index 6858c70..c3e7ddc 100644 --- a/Slimber/LinkLocalPresenceManager.h +++ b/Slimber/LinkLocalPresenceManager.h @@ -9,7 +9,8 @@ #include <memory> #include <string> -#include <Swiften/Base/boost_bsignals.h> +#include <boost/signals2.hpp> + #include <Swiften/Elements/RosterItemPayload.h> #include <Swiften/JID/JID.h> @@ -19,7 +20,7 @@ namespace Swift { class RosterPayload; class Presence; - class LinkLocalPresenceManager : public boost::bsignals::trackable { + class LinkLocalPresenceManager : public boost::signals2::trackable { public: LinkLocalPresenceManager(LinkLocalServiceBrowser*); @@ -28,8 +29,8 @@ namespace Swift { boost::optional<LinkLocalService> getServiceForJID(const JID&) const; - boost::signal<void (std::shared_ptr<RosterPayload>)> onRosterChanged; - boost::signal<void (std::shared_ptr<Presence>)> onPresenceChanged; + boost::signals2::signal<void (std::shared_ptr<RosterPayload>)> onRosterChanged; + boost::signals2::signal<void (std::shared_ptr<Presence>)> onPresenceChanged; private: void handleServiceAdded(const LinkLocalService&); diff --git a/Slimber/Menulet.h b/Slimber/Menulet.h index 4f2e33f..4c06754 100644 --- a/Slimber/Menulet.h +++ b/Slimber/Menulet.h @@ -8,7 +8,7 @@ #include <string> -#include <Swiften/Base/boost_bsignals.h> +#include <boost/signals2.hpp> class Menulet { public: @@ -22,5 +22,5 @@ class Menulet { virtual void addSeparator() = 0; virtual void setIcon(const std::string&) = 0; - boost::signal<void ()> onRestartClicked; + boost::signals2::signal<void ()> onRestartClicked; }; diff --git a/Slimber/MenuletController.h b/Slimber/MenuletController.h index 210eac2..3c05ed2 100644 --- a/Slimber/MenuletController.h +++ b/Slimber/MenuletController.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include <boost/signal.hpp> +#include <boost/signals2.hpp> class Menulet; @@ -26,7 +26,7 @@ class MenuletController { void setXMPPStatus(const std::string& message, Status status); void setUserNames(const std::vector<std::string>&); - boost::signal<void ()> onRestartRequested; + boost::signals2::signal<void ()> onRestartRequested; private: void update(); diff --git a/Slimber/Server.cpp b/Slimber/Server.cpp index a06fda2..ff5f883 100644 --- a/Slimber/Server.cpp +++ b/Slimber/Server.cpp @@ -123,7 +123,7 @@ void Server::stop(boost::optional<ServerError> e) { if (serverFromNetworkConnectionServer) { serverFromNetworkConnectionServer->stop(); - foreach(boost::bsignals::connection& connection, serverFromNetworkConnectionServerSignalConnections) { + foreach(boost::signals2::connection& connection, serverFromNetworkConnectionServerSignalConnections) { connection.disconnect(); } serverFromNetworkConnectionServerSignalConnections.clear(); @@ -131,7 +131,7 @@ void Server::stop(boost::optional<ServerError> e) { } if (serverFromClientConnectionServer) { serverFromClientConnectionServer->stop(); - foreach(boost::bsignals::connection& connection, serverFromClientConnectionServerSignalConnections) { + foreach(boost::signals2::connection& connection, serverFromClientConnectionServerSignalConnections) { connection.disconnect(); } serverFromClientConnectionServerSignalConnections.clear(); diff --git a/Slimber/Server.h b/Slimber/Server.h index 725ad05..4842cd9 100644 --- a/Slimber/Server.h +++ b/Slimber/Server.h @@ -59,8 +59,8 @@ namespace Swift { return clientConnectionPort; } - boost::signal<void (bool)> onSelfConnected; - boost::signal<void (boost::optional<ServerError>)> onStopped; + boost::signals2::signal<void (bool)> onSelfConnected; + boost::signals2::signal<void (boost::optional<ServerError>)> onStopped; private: void stop(boost::optional<ServerError>); @@ -113,12 +113,12 @@ namespace Swift { LinkLocalPresenceManager* presenceManager; bool stopping; std::shared_ptr<BoostConnectionServer> serverFromClientConnectionServer; - std::vector<boost::bsignals::connection> serverFromClientConnectionServerSignalConnections; + std::vector<boost::signals2::connection> serverFromClientConnectionServerSignalConnections; std::shared_ptr<ServerFromClientSession> serverFromClientSession; std::shared_ptr<Presence> lastPresence; JID selfJID; std::shared_ptr<BoostConnectionServer> serverFromNetworkConnectionServer; - std::vector<boost::bsignals::connection> serverFromNetworkConnectionServerSignalConnections; + std::vector<boost::signals2::connection> serverFromNetworkConnectionServerSignalConnections; std::vector< std::shared_ptr<Session> > linkLocalSessions; std::vector< std::shared_ptr<LinkLocalConnector> > connectors; std::vector< std::shared_ptr<SessionTracer> > tracers; |