Swiftdiff options
Diffstat (limited to 'Swiften/FileTransfer')
18 files changed, 52 insertions, 31 deletions
diff --git a/Swiften/FileTransfer/ByteArrayReadBytestream.h b/Swiften/FileTransfer/ByteArrayReadBytestream.h index 108fcef..308d8c5 100644 --- a/Swiften/FileTransfer/ByteArrayReadBytestream.h +++ b/Swiften/FileTransfer/ByteArrayReadBytestream.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,11 +8,12 @@ #include <vector> +#include <Swiften/Base/API.h> #include <Swiften/FileTransfer/ReadBytestream.h> #include <Swiften/Base/ByteArray.h> namespace Swift { - class ByteArrayReadBytestream : public ReadBytestream { + class SWIFTEN_API ByteArrayReadBytestream : public ReadBytestream { public: ByteArrayReadBytestream(const std::vector<unsigned char>& data) : data(data), position(0), dataComplete(true) { } diff --git a/Swiften/FileTransfer/ByteArrayWriteBytestream.h b/Swiften/FileTransfer/ByteArrayWriteBytestream.h index c2c5188..938b1d4 100644 --- a/Swiften/FileTransfer/ByteArrayWriteBytestream.h +++ b/Swiften/FileTransfer/ByteArrayWriteBytestream.h @@ -1,15 +1,16 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once +#include <Swiften/Base/API.h> #include <Swiften/FileTransfer/WriteBytestream.h> namespace Swift { - class ByteArrayWriteBytestream : public WriteBytestream { + class SWIFTEN_API ByteArrayWriteBytestream : public WriteBytestream { public: ByteArrayWriteBytestream() { } diff --git a/Swiften/FileTransfer/BytestreamException.h b/Swiften/FileTransfer/BytestreamException.h index ff1b11b..202315e 100644 --- a/Swiften/FileTransfer/BytestreamException.h +++ b/Swiften/FileTransfer/BytestreamException.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,8 +8,10 @@ #include <stdexcept> +#include <Swiften/Base/API.h> + namespace Swift { - class BytestreamException : public std::exception { + class SWIFTEN_API BytestreamException : public std::exception { public: BytestreamException() { } diff --git a/Swiften/FileTransfer/BytestreamsRequest.h b/Swiften/FileTransfer/BytestreamsRequest.h index c5dad28..65fda9a 100644 --- a/Swiften/FileTransfer/BytestreamsRequest.h +++ b/Swiften/FileTransfer/BytestreamsRequest.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,11 +8,12 @@ #include <boost/shared_ptr.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Queries/GenericRequest.h> #include <Swiften/Elements/Bytestreams.h> namespace Swift { - class BytestreamsRequest : public GenericRequest<Bytestreams> { + class SWIFTEN_API BytestreamsRequest : public GenericRequest<Bytestreams> { public: typedef boost::shared_ptr<BytestreamsRequest> ref; diff --git a/Swiften/FileTransfer/FileTransfer.h b/Swiften/FileTransfer/FileTransfer.h index f90a6b4..01c8295 100644 --- a/Swiften/FileTransfer/FileTransfer.h +++ b/Swiften/FileTransfer/FileTransfer.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -16,11 +16,12 @@ #include <boost/optional.hpp> #include <boost/shared_ptr.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> #include <Swiften/FileTransfer/FileTransferError.h> namespace Swift { - class FileTransfer { + class SWIFTEN_API FileTransfer { public: struct State { enum Type { diff --git a/Swiften/FileTransfer/FileTransferError.h b/Swiften/FileTransfer/FileTransferError.h index a37d98c..67e32f2 100644 --- a/Swiften/FileTransfer/FileTransferError.h +++ b/Swiften/FileTransfer/FileTransferError.h @@ -1,13 +1,15 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once +#include <Swiften/Base/API.h> + namespace Swift { - class FileTransferError { + class SWIFTEN_API FileTransferError { public: enum Type { UnknownError, diff --git a/Swiften/FileTransfer/IBBRequest.h b/Swiften/FileTransfer/IBBRequest.h index 277ca09..1eef64b 100644 --- a/Swiften/FileTransfer/IBBRequest.h +++ b/Swiften/FileTransfer/IBBRequest.h @@ -1,17 +1,18 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once +#include <Swiften/Base/API.h> #include <Swiften/Queries/GenericRequest.h> #include <Swiften/Elements/IBB.h> namespace Swift { - class IBBRequest : public GenericRequest<IBB> { + class SWIFTEN_API IBBRequest : public GenericRequest<IBB> { public: typedef boost::shared_ptr<IBBRequest> ref; diff --git a/Swiften/FileTransfer/IncomingFileTransfer.h b/Swiften/FileTransfer/IncomingFileTransfer.h index 93ecf1a..16905b8 100644 --- a/Swiften/FileTransfer/IncomingFileTransfer.h +++ b/Swiften/FileTransfer/IncomingFileTransfer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2014 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,6 +8,7 @@ #include <boost/shared_ptr.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> #include <Swiften/FileTransfer/FileTransfer.h> #include <Swiften/FileTransfer/FileTransferOptions.h> @@ -20,7 +21,7 @@ namespace Swift { * @brief The IncomingFileTransfer abstract class is the general interface in Swiften * for incoming file transfers. */ - class IncomingFileTransfer : public FileTransfer { + class SWIFTEN_API IncomingFileTransfer : public FileTransfer { public: typedef boost::shared_ptr<IncomingFileTransfer> ref; diff --git a/Swiften/FileTransfer/IncomingFileTransferManager.h b/Swiften/FileTransfer/IncomingFileTransferManager.h index 94ddd1d..6edf53b 100644 --- a/Swiften/FileTransfer/IncomingFileTransferManager.h +++ b/Swiften/FileTransfer/IncomingFileTransferManager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,6 +8,7 @@ #include <boost/shared_ptr.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> #include <Swiften/FileTransfer/IncomingFileTransfer.h> #include <Swiften/Jingle/IncomingJingleSessionHandler.h> @@ -19,7 +20,7 @@ namespace Swift { class TimerFactory; class CryptoProvider; - class IncomingFileTransferManager : public IncomingJingleSessionHandler { + class SWIFTEN_API IncomingFileTransferManager : public IncomingJingleSessionHandler { public: IncomingFileTransferManager( JingleSessionManager* jingleSessionManager, diff --git a/Swiften/FileTransfer/OutgoingFileTransfer.h b/Swiften/FileTransfer/OutgoingFileTransfer.h index ad89e60..358cc2f 100644 --- a/Swiften/FileTransfer/OutgoingFileTransfer.h +++ b/Swiften/FileTransfer/OutgoingFileTransfer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,10 +8,11 @@ #include <boost/shared_ptr.hpp> +#include <Swiften/Base/API.h> #include <Swiften/FileTransfer/FileTransfer.h> namespace Swift { - class OutgoingFileTransfer : public FileTransfer { + class SWIFTEN_API OutgoingFileTransfer : public FileTransfer { public: typedef boost::shared_ptr<OutgoingFileTransfer> ref; public: diff --git a/Swiften/FileTransfer/OutgoingFileTransferManager.h b/Swiften/FileTransfer/OutgoingFileTransferManager.h index f97bc9b..1ad992e 100644 --- a/Swiften/FileTransfer/OutgoingFileTransferManager.h +++ b/Swiften/FileTransfer/OutgoingFileTransferManager.h @@ -14,6 +14,8 @@ #include <boost/shared_ptr.hpp> +#include <Swiften/Base/API.h> + namespace Swift { class JingleSessionManager; class IQRouter; @@ -27,7 +29,7 @@ namespace Swift { class FileTransferOptions; class TimerFactory; - class OutgoingFileTransferManager { + class SWIFTEN_API OutgoingFileTransferManager { public: OutgoingFileTransferManager( JingleSessionManager* jingleSessionManager, diff --git a/Swiften/FileTransfer/OutgoingSIFileTransfer.h b/Swiften/FileTransfer/OutgoingSIFileTransfer.h index 9b51b0a..c323a77 100644 --- a/Swiften/FileTransfer/OutgoingSIFileTransfer.h +++ b/Swiften/FileTransfer/OutgoingSIFileTransfer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,6 +8,7 @@ #include <boost/shared_ptr.hpp> +#include <Swiften/Base/API.h> #include <Swiften/FileTransfer/OutgoingFileTransfer.h> #include <Swiften/FileTransfer/ReadBytestream.h> #include <Swiften/Base/boost_bsignals.h> @@ -23,7 +24,7 @@ namespace Swift { class IQRouter; class SOCKS5BytestreamServer; - class OutgoingSIFileTransfer : public OutgoingFileTransfer { + class SWIFTEN_API OutgoingSIFileTransfer : public OutgoingFileTransfer { public: OutgoingSIFileTransfer(const std::string& id, const JID& from, const JID& to, const std::string& name, unsigned long long size, const std::string& description, boost::shared_ptr<ReadBytestream> bytestream, IQRouter* iqRouter, SOCKS5BytestreamServer* socksServer); diff --git a/Swiften/FileTransfer/SOCKS5BytestreamProxyFinder.h b/Swiften/FileTransfer/SOCKS5BytestreamProxyFinder.h index 54c2075..c5ad72a 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamProxyFinder.h +++ b/Swiften/FileTransfer/SOCKS5BytestreamProxyFinder.h @@ -15,6 +15,7 @@ #include <boost/shared_ptr.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Disco/DiscoServiceWalker.h> #include <Swiften/Network/HostAddressPort.h> #include <Swiften/Elements/S5BProxyRequest.h> @@ -28,7 +29,7 @@ class IQRouter; * This class is designed to find possible SOCKS5 bytestream proxies which are used for peer-to-peer data transfers in * restrictive environments. */ -class SOCKS5BytestreamProxyFinder { +class SWIFTEN_API SOCKS5BytestreamProxyFinder { public: SOCKS5BytestreamProxyFinder(const JID& service, IQRouter *iqRouter); ~SOCKS5BytestreamProxyFinder(); diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServer.h b/Swiften/FileTransfer/SOCKS5BytestreamServer.h index 721e6e5..c11de84 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamServer.h +++ b/Swiften/FileTransfer/SOCKS5BytestreamServer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -11,6 +11,7 @@ #include <Swiften/Network/ConnectionServer.h> #include <string> +#include <Swiften/Base/API.h> #include <Swiften/JID/JID.h> #include <Swiften/FileTransfer/ReadBytestream.h> #include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h> @@ -19,7 +20,7 @@ namespace Swift { class SOCKS5BytestreamServerSession; class CryptoProvider; - class SOCKS5BytestreamServer { + class SWIFTEN_API SOCKS5BytestreamServer { public: SOCKS5BytestreamServer( boost::shared_ptr<ConnectionServer> connectionServer, diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.h b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.h index e8a43f9..180745d 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.h +++ b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.h @@ -10,6 +10,7 @@ #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> #include <Swiften/Network/HostAddressPort.h> #include <Swiften/Network/NATPortMapping.h> @@ -27,7 +28,7 @@ namespace Swift { class SOCKS5BytestreamServerResourceUser; class SOCKS5BytestreamServerPortForwardingUser; - class SOCKS5BytestreamServerManager { + class SWIFTEN_API SOCKS5BytestreamServerManager { friend class SOCKS5BytestreamServerResourceUser; friend class SOCKS5BytestreamServerPortForwardingUser; diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerPortForwardingUser.h b/Swiften/FileTransfer/SOCKS5BytestreamServerPortForwardingUser.h index c4550d3..cd79ecc 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamServerPortForwardingUser.h +++ b/Swiften/FileTransfer/SOCKS5BytestreamServerPortForwardingUser.h @@ -6,13 +6,14 @@ #pragma once +#include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> namespace Swift { class SOCKS5BytestreamServerManager; -class SOCKS5BytestreamServerPortForwardingUser { +class SWIFTEN_API SOCKS5BytestreamServerPortForwardingUser { public: SOCKS5BytestreamServerPortForwardingUser(SOCKS5BytestreamServerManager* s5bServerManager); ~SOCKS5BytestreamServerPortForwardingUser(); diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerResourceUser.h b/Swiften/FileTransfer/SOCKS5BytestreamServerResourceUser.h index fa7f42c..15c4fc7 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamServerResourceUser.h +++ b/Swiften/FileTransfer/SOCKS5BytestreamServerResourceUser.h @@ -7,12 +7,13 @@ #pragma once #include <Swiften/Base/boost_bsignals.h> +#include <Swiften/Base/API.h> namespace Swift { class SOCKS5BytestreamServerManager; -class SOCKS5BytestreamServerResourceUser { +class SWIFTEN_API SOCKS5BytestreamServerResourceUser { public: SOCKS5BytestreamServerResourceUser(SOCKS5BytestreamServerManager* s5bServerManager); ~SOCKS5BytestreamServerResourceUser(); diff --git a/Swiften/FileTransfer/StreamInitiationRequest.h b/Swiften/FileTransfer/StreamInitiationRequest.h index b846b90..7046eda 100644 --- a/Swiften/FileTransfer/StreamInitiationRequest.h +++ b/Swiften/FileTransfer/StreamInitiationRequest.h @@ -1,17 +1,18 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once +#include <Swiften/Base/API.h> #include <Swiften/Queries/GenericRequest.h> #include <Swiften/Elements/StreamInitiation.h> namespace Swift { - class StreamInitiationRequest : public GenericRequest<StreamInitiation> { + class SWIFTEN_API StreamInitiationRequest : public GenericRequest<StreamInitiation> { public: typedef boost::shared_ptr<StreamInitiationRequest> ref; |