Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-12-15 14:49:30 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-12-15 14:49:46 (GMT) |
| commit | 6cd7bef6eb507f979d7c964769429ef46e3e5aa9 (patch) | |
| tree | 322d5c80e7be477758a8e97ecd8a64fbb09836de /Swiften | |
| parent | 864904bcd7931ff7453ecb1de72496e4e3cf9c96 (diff) | |
| parent | 2efefdc5ae847f5d187762e474d75c61560cba19 (diff) | |
| download | swift-6cd7bef6eb507f979d7c964769429ef46e3e5aa9.zip swift-6cd7bef6eb507f979d7c964769429ef46e3e5aa9.tar.bz2 | |
Merge branch 'swift-3.x’
* swift-3.x:
- Fix building Swift on 32-bit Linux distributions
- Remove optional_fwd.hpp use; workaround for Boost Bug #12179
- Split COPYING.thirdparty in contributions/dependencies
- Fixes for building packages on Debian
Conflicts:
BuildTools/SCons/SConstruct
Sluift/Console.h
Sluift/ITunesInterface.h
Sluift/Terminal.h
Swift/Packaging/Debian/debian/control.in
Swift/QtUI/SConscript
Swiften/Elements/Stanza.h
Swiften/FileTransfer/FileTransferTransporter.h
Swiften/FileTransfer/IBBReceiveSession.h
Swiften/JID/JID.h
Swiften/Network/BoostConnectionServer.h
Swiften/Network/ConnectionServer.h
Swiften/Parser/AttributeMap.h
Test-Information:
Builds on macOS 10.12.1 with clang trunk.
Change-Id: I9f41ab199f227bc106721627ea994313c68e5cfe
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/Elements/Stanza.h | 2 | ||||
| -rw-r--r-- | Swiften/FileTransfer/FileTransferTransporter.h | 2 | ||||
| -rw-r--r-- | Swiften/FileTransfer/IBBReceiveSession.h | 2 | ||||
| -rw-r--r-- | Swiften/JID/JID.h | 2 | ||||
| -rw-r--r-- | Swiften/Network/BoostConnectionServer.h | 2 | ||||
| -rw-r--r-- | Swiften/Network/ConnectionServer.h | 2 | ||||
| -rw-r--r-- | Swiften/Parser/AttributeMap.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/Swiften/Elements/Stanza.h b/Swiften/Elements/Stanza.h index 9284bc3..8b4916e 100644 --- a/Swiften/Elements/Stanza.h +++ b/Swiften/Elements/Stanza.h @@ -1,44 +1,44 @@ /* * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <memory> #include <string> #include <vector> #include <boost/date_time/posix_time/ptime.hpp> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> #include <Swiften/Base/API.h> #include <Swiften/Elements/ToplevelElement.h> #include <Swiften/JID/JID.h> namespace Swift { class Payload; class SWIFTEN_API Stanza : public ToplevelElement { public: typedef std::shared_ptr<Stanza> ref; protected: Stanza(); public: virtual ~Stanza(); SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(Stanza) template<typename T> std::shared_ptr<T> getPayload() const { for (const auto& payload : payloads_) { std::shared_ptr<T> result(std::dynamic_pointer_cast<T>(payload)); if (result) { return result; } } return std::shared_ptr<T>(); } diff --git a/Swiften/FileTransfer/FileTransferTransporter.h b/Swiften/FileTransfer/FileTransferTransporter.h index 5af830c..e0ffc87 100644 --- a/Swiften/FileTransfer/FileTransferTransporter.h +++ b/Swiften/FileTransfer/FileTransferTransporter.h @@ -1,41 +1,41 @@ /* * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <vector> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> #include <boost/signals2.hpp> #include <Swiften/Base/API.h> #include <Swiften/Elements/JingleS5BTransportPayload.h> namespace Swift { class TransportSession; class ErrorPayload; class ReadBytestream; class WriteBytestream; /** * @brief The FileTransferTransporter class is an abstract factory definition * to generate SOCKS5 bytestream transports or IBB bytestreams for use in file * transfers. */ class SWIFTEN_API FileTransferTransporter { public: virtual ~FileTransferTransporter(); virtual void startGeneratingLocalCandidates() = 0; virtual void stopGeneratingLocalCandidates() = 0; virtual void addRemoteCandidates( const std::vector<JingleS5BTransportPayload::Candidate>&, const std::string&) = 0; virtual void startTryingRemoteCandidates() = 0; virtual void stopTryingRemoteCandidates() = 0; virtual void startActivatingProxy(const JID& proxy) = 0; virtual void stopActivatingProxy() = 0; diff --git a/Swiften/FileTransfer/IBBReceiveSession.h b/Swiften/FileTransfer/IBBReceiveSession.h index 11dfb63..797394c 100644 --- a/Swiften/FileTransfer/IBBReceiveSession.h +++ b/Swiften/FileTransfer/IBBReceiveSession.h @@ -1,41 +1,41 @@ /* * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <memory> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> #include <boost/signals2.hpp> #include <Swiften/Base/API.h> #include <Swiften/Elements/IBB.h> #include <Swiften/FileTransfer/FileTransferError.h> #include <Swiften/FileTransfer/WriteBytestream.h> #include <Swiften/JID/JID.h> namespace Swift { class IQRouter; class SWIFTEN_API IBBReceiveSession { public: IBBReceiveSession( const std::string& id, const JID& from, const JID& to, unsigned long long size, std::shared_ptr<WriteBytestream> bytestream, IQRouter* router); ~IBBReceiveSession(); void start(); void stop(); const JID& getSender() const { return from; } const JID& getReceiver() const { diff --git a/Swiften/JID/JID.h b/Swiften/JID/JID.h index 302e37e..dc92f53 100644 --- a/Swiften/JID/JID.h +++ b/Swiften/JID/JID.h @@ -1,42 +1,42 @@ /* * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <iosfwd> #include <string> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> #include <Swiften/Base/API.h> namespace Swift { class IDNConverter; /** * This represents the JID used in XMPP * (RFC6120 - http://tools.ietf.org/html/rfc6120 ). * For a description of format, see the RFC or page 14 of * XMPP: The Definitive Guide (Saint-Andre et al.) * * Particularly - a Bare JID is a JID without a resource part. * * A JID can be invalid (when isValid() returns false). No member methods are * guaranteed to work correctly if they do. */ class SWIFTEN_API JID { public: enum CompareType { WithResource, WithoutResource }; /** * Create a JID from its String representation. * * e.g. * wonderland.lit * wonderland.lit/rabbithole * alice@wonderland.lit diff --git a/Swiften/Network/BoostConnectionServer.h b/Swiften/Network/BoostConnectionServer.h index 41fdbe2..3dd9830 100644 --- a/Swiften/Network/BoostConnectionServer.h +++ b/Swiften/Network/BoostConnectionServer.h @@ -1,43 +1,43 @@ /* * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <memory> #include <boost/asio/io_service.hpp> #include <boost/asio/ip/tcp.hpp> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> #include <boost/signals2.hpp> #include <Swiften/Base/API.h> #include <Swiften/EventLoop/EventOwner.h> #include <Swiften/Network/BoostConnection.h> #include <Swiften/Network/ConnectionServer.h> namespace Swift { class SWIFTEN_API BoostConnectionServer : public ConnectionServer, public EventOwner, public std::enable_shared_from_this<BoostConnectionServer> { public: typedef std::shared_ptr<BoostConnectionServer> ref; static ref create(int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) { return ref(new BoostConnectionServer(port, ioService, eventLoop)); } static ref create(const HostAddress &address, int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) { return ref(new BoostConnectionServer(address, port, ioService, eventLoop)); } virtual boost::optional<Error> tryStart(); // FIXME: This should become the new start virtual void start(); virtual void stop(); virtual HostAddressPort getAddressPort() const; boost::signals2::signal<void (boost::optional<Error>)> onStopped; private: BoostConnectionServer(int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop); diff --git a/Swiften/Network/ConnectionServer.h b/Swiften/Network/ConnectionServer.h index 0c8a000..769ab9f 100644 --- a/Swiften/Network/ConnectionServer.h +++ b/Swiften/Network/ConnectionServer.h @@ -1,38 +1,38 @@ /* * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <memory> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> #include <boost/signals2.hpp> #include <Swiften/Base/API.h> #include <Swiften/Network/Connection.h> #include <Swiften/Network/HostAddressPort.h> namespace Swift { class SWIFTEN_API ConnectionServer { public: enum Error { Conflict, UnknownError }; virtual ~ConnectionServer(); virtual HostAddressPort getAddressPort() const = 0; virtual boost::optional<Error> tryStart() = 0; // FIXME: This should become the new start virtual void start() = 0; virtual void stop() = 0; boost::signals2::signal<void (std::shared_ptr<Connection>)> onNewConnection; }; } diff --git a/Swiften/Parser/AttributeMap.h b/Swiften/Parser/AttributeMap.h index 798649a..804d6aa 100644 --- a/Swiften/Parser/AttributeMap.h +++ b/Swiften/Parser/AttributeMap.h @@ -1,43 +1,43 @@ /* * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <map> #include <string> #include <vector> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> #include <Swiften/Base/API.h> #include <Swiften/Parser/Attribute.h> namespace Swift { class SWIFTEN_API AttributeMap { public: class Entry { public: Entry(const Attribute& attribute, const std::string& value) : attribute(attribute), value(value) { } const Attribute& getAttribute() const { return attribute; } const std::string& getValue() const { return value; } private: Attribute attribute; std::string value; }; AttributeMap(); std::string getAttribute(const std::string& attribute, const std::string& ns = "") const; bool getBoolAttribute(const std::string& attribute, bool defaultValue = false) const; boost::optional<std::string> getAttributeValue(const std::string&) const; |