diff options
| author | Tobias Markmann <tm@ayena.de> | 2015-06-07 22:34:19 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2015-06-08 09:37:53 (GMT) |
| commit | b6b0695643f932827add43b9de0e09ed74eb6799 (patch) | |
| tree | 72456efba9fab6fbc6004a98f0a61b7a8167f791 /Swiften/FileTransfer | |
| parent | 3741c9ad5c0cc6f92e4ed913d67b3b530882334e (diff) | |
| download | swift-b6b0695643f932827add43b9de0e09ed74eb6799.zip swift-b6b0695643f932827add43b9de0e09ed74eb6799.tar.bz2 | |
Add missing SWIFTEN_API annotations to public Swiften API
Test-Information:
Tested build on Windows 8 with VS 2014 and ran unit tests.
Change-Id: I3d8096df4801be6901f22564e36eecba0e7310c4
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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2013 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -8,11 +8,12 @@ | |||
| 8 | 8 | ||
| 9 | #include <vector> | 9 | #include <vector> |
| 10 | 10 | ||
| 11 | #include <Swiften/Base/API.h> | ||
| 11 | #include <Swiften/FileTransfer/ReadBytestream.h> | 12 | #include <Swiften/FileTransfer/ReadBytestream.h> |
| 12 | #include <Swiften/Base/ByteArray.h> | 13 | #include <Swiften/Base/ByteArray.h> |
| 13 | 14 | ||
| 14 | namespace Swift { | 15 | namespace Swift { |
| 15 | class ByteArrayReadBytestream : public ReadBytestream { | 16 | class SWIFTEN_API ByteArrayReadBytestream : public ReadBytestream { |
| 16 | public: | 17 | public: |
| 17 | ByteArrayReadBytestream(const std::vector<unsigned char>& data) : data(data), position(0), dataComplete(true) { | 18 | ByteArrayReadBytestream(const std::vector<unsigned char>& data) : data(data), position(0), dataComplete(true) { |
| 18 | } | 19 | } |
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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #pragma once | 7 | #pragma once |
| 8 | 8 | ||
| 9 | #include <Swiften/Base/API.h> | ||
| 9 | #include <Swiften/FileTransfer/WriteBytestream.h> | 10 | #include <Swiften/FileTransfer/WriteBytestream.h> |
| 10 | 11 | ||
| 11 | namespace Swift { | 12 | namespace Swift { |
| 12 | class ByteArrayWriteBytestream : public WriteBytestream { | 13 | class SWIFTEN_API ByteArrayWriteBytestream : public WriteBytestream { |
| 13 | public: | 14 | public: |
| 14 | ByteArrayWriteBytestream() { | 15 | ByteArrayWriteBytestream() { |
| 15 | } | 16 | } |
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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -8,8 +8,10 @@ | |||
| 8 | 8 | ||
| 9 | #include <stdexcept> | 9 | #include <stdexcept> |
| 10 | 10 | ||
| 11 | #include <Swiften/Base/API.h> | ||
| 12 | |||
| 11 | namespace Swift { | 13 | namespace Swift { |
| 12 | class BytestreamException : public std::exception { | 14 | class SWIFTEN_API BytestreamException : public std::exception { |
| 13 | public: | 15 | public: |
| 14 | BytestreamException() { | 16 | BytestreamException() { |
| 15 | } | 17 | } |
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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -8,11 +8,12 @@ | |||
| 8 | 8 | ||
| 9 | #include <boost/shared_ptr.hpp> | 9 | #include <boost/shared_ptr.hpp> |
| 10 | 10 | ||
| 11 | #include <Swiften/Base/API.h> | ||
| 11 | #include <Swiften/Queries/GenericRequest.h> | 12 | #include <Swiften/Queries/GenericRequest.h> |
| 12 | #include <Swiften/Elements/Bytestreams.h> | 13 | #include <Swiften/Elements/Bytestreams.h> |
| 13 | 14 | ||
| 14 | namespace Swift { | 15 | namespace Swift { |
| 15 | class BytestreamsRequest : public GenericRequest<Bytestreams> { | 16 | class SWIFTEN_API BytestreamsRequest : public GenericRequest<Bytestreams> { |
| 16 | public: | 17 | public: |
| 17 | typedef boost::shared_ptr<BytestreamsRequest> ref; | 18 | typedef boost::shared_ptr<BytestreamsRequest> ref; |
| 18 | 19 | ||
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 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * Copyright (c) 2013 Isode Limited. | 8 | * Copyright (c) 2013-2015 Isode Limited. |
| 9 | * All rights reserved. | 9 | * All rights reserved. |
| 10 | * See the COPYING file for more information. | 10 | * See the COPYING file for more information. |
| 11 | */ | 11 | */ |
| @@ -16,11 +16,12 @@ | |||
| 16 | #include <boost/optional.hpp> | 16 | #include <boost/optional.hpp> |
| 17 | #include <boost/shared_ptr.hpp> | 17 | #include <boost/shared_ptr.hpp> |
| 18 | 18 | ||
| 19 | #include <Swiften/Base/API.h> | ||
| 19 | #include <Swiften/Base/boost_bsignals.h> | 20 | #include <Swiften/Base/boost_bsignals.h> |
| 20 | #include <Swiften/FileTransfer/FileTransferError.h> | 21 | #include <Swiften/FileTransfer/FileTransferError.h> |
| 21 | 22 | ||
| 22 | namespace Swift { | 23 | namespace Swift { |
| 23 | class FileTransfer { | 24 | class SWIFTEN_API FileTransfer { |
| 24 | public: | 25 | public: |
| 25 | struct State { | 26 | struct State { |
| 26 | enum Type { | 27 | 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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #pragma once | 7 | #pragma once |
| 8 | 8 | ||
| 9 | #include <Swiften/Base/API.h> | ||
| 10 | |||
| 9 | namespace Swift { | 11 | namespace Swift { |
| 10 | class FileTransferError { | 12 | class SWIFTEN_API FileTransferError { |
| 11 | public: | 13 | public: |
| 12 | enum Type { | 14 | enum Type { |
| 13 | UnknownError, | 15 | 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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #pragma once | 7 | #pragma once |
| 8 | 8 | ||
| 9 | #include <Swiften/Base/API.h> | ||
| 9 | #include <Swiften/Queries/GenericRequest.h> | 10 | #include <Swiften/Queries/GenericRequest.h> |
| 10 | #include <Swiften/Elements/IBB.h> | 11 | #include <Swiften/Elements/IBB.h> |
| 11 | 12 | ||
| 12 | 13 | ||
| 13 | namespace Swift { | 14 | namespace Swift { |
| 14 | class IBBRequest : public GenericRequest<IBB> { | 15 | class SWIFTEN_API IBBRequest : public GenericRequest<IBB> { |
| 15 | public: | 16 | public: |
| 16 | typedef boost::shared_ptr<IBBRequest> ref; | 17 | typedef boost::shared_ptr<IBBRequest> ref; |
| 17 | 18 | ||
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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2014 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -8,6 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <boost/shared_ptr.hpp> | 9 | #include <boost/shared_ptr.hpp> |
| 10 | 10 | ||
| 11 | #include <Swiften/Base/API.h> | ||
| 11 | #include <Swiften/Base/boost_bsignals.h> | 12 | #include <Swiften/Base/boost_bsignals.h> |
| 12 | #include <Swiften/FileTransfer/FileTransfer.h> | 13 | #include <Swiften/FileTransfer/FileTransfer.h> |
| 13 | #include <Swiften/FileTransfer/FileTransferOptions.h> | 14 | #include <Swiften/FileTransfer/FileTransferOptions.h> |
| @@ -20,7 +21,7 @@ namespace Swift { | |||
| 20 | * @brief The IncomingFileTransfer abstract class is the general interface in Swiften | 21 | * @brief The IncomingFileTransfer abstract class is the general interface in Swiften |
| 21 | * for incoming file transfers. | 22 | * for incoming file transfers. |
| 22 | */ | 23 | */ |
| 23 | class IncomingFileTransfer : public FileTransfer { | 24 | class SWIFTEN_API IncomingFileTransfer : public FileTransfer { |
| 24 | public: | 25 | public: |
| 25 | typedef boost::shared_ptr<IncomingFileTransfer> ref; | 26 | typedef boost::shared_ptr<IncomingFileTransfer> ref; |
| 26 | 27 | ||
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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2013 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -8,6 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <boost/shared_ptr.hpp> | 9 | #include <boost/shared_ptr.hpp> |
| 10 | 10 | ||
| 11 | #include <Swiften/Base/API.h> | ||
| 11 | #include <Swiften/Base/boost_bsignals.h> | 12 | #include <Swiften/Base/boost_bsignals.h> |
| 12 | #include <Swiften/FileTransfer/IncomingFileTransfer.h> | 13 | #include <Swiften/FileTransfer/IncomingFileTransfer.h> |
| 13 | #include <Swiften/Jingle/IncomingJingleSessionHandler.h> | 14 | #include <Swiften/Jingle/IncomingJingleSessionHandler.h> |
| @@ -19,7 +20,7 @@ namespace Swift { | |||
| 19 | class TimerFactory; | 20 | class TimerFactory; |
| 20 | class CryptoProvider; | 21 | class CryptoProvider; |
| 21 | 22 | ||
| 22 | class IncomingFileTransferManager : public IncomingJingleSessionHandler { | 23 | class SWIFTEN_API IncomingFileTransferManager : public IncomingJingleSessionHandler { |
| 23 | public: | 24 | public: |
| 24 | IncomingFileTransferManager( | 25 | IncomingFileTransferManager( |
| 25 | JingleSessionManager* jingleSessionManager, | 26 | 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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -8,10 +8,11 @@ | |||
| 8 | 8 | ||
| 9 | #include <boost/shared_ptr.hpp> | 9 | #include <boost/shared_ptr.hpp> |
| 10 | 10 | ||
| 11 | #include <Swiften/Base/API.h> | ||
| 11 | #include <Swiften/FileTransfer/FileTransfer.h> | 12 | #include <Swiften/FileTransfer/FileTransfer.h> |
| 12 | 13 | ||
| 13 | namespace Swift { | 14 | namespace Swift { |
| 14 | class OutgoingFileTransfer : public FileTransfer { | 15 | class SWIFTEN_API OutgoingFileTransfer : public FileTransfer { |
| 15 | public: | 16 | public: |
| 16 | typedef boost::shared_ptr<OutgoingFileTransfer> ref; | 17 | typedef boost::shared_ptr<OutgoingFileTransfer> ref; |
| 17 | public: | 18 | 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 @@ | |||
| 14 | 14 | ||
| 15 | #include <boost/shared_ptr.hpp> | 15 | #include <boost/shared_ptr.hpp> |
| 16 | 16 | ||
| 17 | #include <Swiften/Base/API.h> | ||
| 18 | |||
| 17 | namespace Swift { | 19 | namespace Swift { |
| 18 | class JingleSessionManager; | 20 | class JingleSessionManager; |
| 19 | class IQRouter; | 21 | class IQRouter; |
| @@ -27,7 +29,7 @@ namespace Swift { | |||
| 27 | class FileTransferOptions; | 29 | class FileTransferOptions; |
| 28 | class TimerFactory; | 30 | class TimerFactory; |
| 29 | 31 | ||
| 30 | class OutgoingFileTransferManager { | 32 | class SWIFTEN_API OutgoingFileTransferManager { |
| 31 | public: | 33 | public: |
| 32 | OutgoingFileTransferManager( | 34 | OutgoingFileTransferManager( |
| 33 | JingleSessionManager* jingleSessionManager, | 35 | 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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2013 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -8,6 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <boost/shared_ptr.hpp> | 9 | #include <boost/shared_ptr.hpp> |
| 10 | 10 | ||
| 11 | #include <Swiften/Base/API.h> | ||
| 11 | #include <Swiften/FileTransfer/OutgoingFileTransfer.h> | 12 | #include <Swiften/FileTransfer/OutgoingFileTransfer.h> |
| 12 | #include <Swiften/FileTransfer/ReadBytestream.h> | 13 | #include <Swiften/FileTransfer/ReadBytestream.h> |
| 13 | #include <Swiften/Base/boost_bsignals.h> | 14 | #include <Swiften/Base/boost_bsignals.h> |
| @@ -23,7 +24,7 @@ namespace Swift { | |||
| 23 | class IQRouter; | 24 | class IQRouter; |
| 24 | class SOCKS5BytestreamServer; | 25 | class SOCKS5BytestreamServer; |
| 25 | 26 | ||
| 26 | class OutgoingSIFileTransfer : public OutgoingFileTransfer { | 27 | class SWIFTEN_API OutgoingSIFileTransfer : public OutgoingFileTransfer { |
| 27 | public: | 28 | public: |
| 28 | 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); | 29 | 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); |
| 29 | 30 | ||
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 @@ | |||
| 15 | 15 | ||
| 16 | #include <boost/shared_ptr.hpp> | 16 | #include <boost/shared_ptr.hpp> |
| 17 | 17 | ||
| 18 | #include <Swiften/Base/API.h> | ||
| 18 | #include <Swiften/Disco/DiscoServiceWalker.h> | 19 | #include <Swiften/Disco/DiscoServiceWalker.h> |
| 19 | #include <Swiften/Network/HostAddressPort.h> | 20 | #include <Swiften/Network/HostAddressPort.h> |
| 20 | #include <Swiften/Elements/S5BProxyRequest.h> | 21 | #include <Swiften/Elements/S5BProxyRequest.h> |
| @@ -28,7 +29,7 @@ class IQRouter; | |||
| 28 | * This class is designed to find possible SOCKS5 bytestream proxies which are used for peer-to-peer data transfers in | 29 | * This class is designed to find possible SOCKS5 bytestream proxies which are used for peer-to-peer data transfers in |
| 29 | * restrictive environments. | 30 | * restrictive environments. |
| 30 | */ | 31 | */ |
| 31 | class SOCKS5BytestreamProxyFinder { | 32 | class SWIFTEN_API SOCKS5BytestreamProxyFinder { |
| 32 | public: | 33 | public: |
| 33 | SOCKS5BytestreamProxyFinder(const JID& service, IQRouter *iqRouter); | 34 | SOCKS5BytestreamProxyFinder(const JID& service, IQRouter *iqRouter); |
| 34 | ~SOCKS5BytestreamProxyFinder(); | 35 | ~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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2013 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -11,6 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <Swiften/Network/ConnectionServer.h> | 12 | #include <Swiften/Network/ConnectionServer.h> |
| 13 | #include <string> | 13 | #include <string> |
| 14 | #include <Swiften/Base/API.h> | ||
| 14 | #include <Swiften/JID/JID.h> | 15 | #include <Swiften/JID/JID.h> |
| 15 | #include <Swiften/FileTransfer/ReadBytestream.h> | 16 | #include <Swiften/FileTransfer/ReadBytestream.h> |
| 16 | #include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h> | 17 | #include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h> |
| @@ -19,7 +20,7 @@ namespace Swift { | |||
| 19 | class SOCKS5BytestreamServerSession; | 20 | class SOCKS5BytestreamServerSession; |
| 20 | class CryptoProvider; | 21 | class CryptoProvider; |
| 21 | 22 | ||
| 22 | class SOCKS5BytestreamServer { | 23 | class SWIFTEN_API SOCKS5BytestreamServer { |
| 23 | public: | 24 | public: |
| 24 | SOCKS5BytestreamServer( | 25 | SOCKS5BytestreamServer( |
| 25 | boost::shared_ptr<ConnectionServer> connectionServer, | 26 | 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 @@ | |||
| 10 | #include <boost/shared_ptr.hpp> | 10 | #include <boost/shared_ptr.hpp> |
| 11 | #include <boost/weak_ptr.hpp> | 11 | #include <boost/weak_ptr.hpp> |
| 12 | 12 | ||
| 13 | #include <Swiften/Base/API.h> | ||
| 13 | #include <Swiften/Base/boost_bsignals.h> | 14 | #include <Swiften/Base/boost_bsignals.h> |
| 14 | #include <Swiften/Network/HostAddressPort.h> | 15 | #include <Swiften/Network/HostAddressPort.h> |
| 15 | #include <Swiften/Network/NATPortMapping.h> | 16 | #include <Swiften/Network/NATPortMapping.h> |
| @@ -27,7 +28,7 @@ namespace Swift { | |||
| 27 | class SOCKS5BytestreamServerResourceUser; | 28 | class SOCKS5BytestreamServerResourceUser; |
| 28 | class SOCKS5BytestreamServerPortForwardingUser; | 29 | class SOCKS5BytestreamServerPortForwardingUser; |
| 29 | 30 | ||
| 30 | class SOCKS5BytestreamServerManager { | 31 | class SWIFTEN_API SOCKS5BytestreamServerManager { |
| 31 | friend class SOCKS5BytestreamServerResourceUser; | 32 | friend class SOCKS5BytestreamServerResourceUser; |
| 32 | friend class SOCKS5BytestreamServerPortForwardingUser; | 33 | friend class SOCKS5BytestreamServerPortForwardingUser; |
| 33 | 34 | ||
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 @@ | |||
| 6 | 6 | ||
| 7 | #pragma once | 7 | #pragma once |
| 8 | 8 | ||
| 9 | #include <Swiften/Base/API.h> | ||
| 9 | #include <Swiften/Base/boost_bsignals.h> | 10 | #include <Swiften/Base/boost_bsignals.h> |
| 10 | 11 | ||
| 11 | namespace Swift { | 12 | namespace Swift { |
| 12 | 13 | ||
| 13 | class SOCKS5BytestreamServerManager; | 14 | class SOCKS5BytestreamServerManager; |
| 14 | 15 | ||
| 15 | class SOCKS5BytestreamServerPortForwardingUser { | 16 | class SWIFTEN_API SOCKS5BytestreamServerPortForwardingUser { |
| 16 | public: | 17 | public: |
| 17 | SOCKS5BytestreamServerPortForwardingUser(SOCKS5BytestreamServerManager* s5bServerManager); | 18 | SOCKS5BytestreamServerPortForwardingUser(SOCKS5BytestreamServerManager* s5bServerManager); |
| 18 | ~SOCKS5BytestreamServerPortForwardingUser(); | 19 | ~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 @@ | |||
| 7 | #pragma once | 7 | #pragma once |
| 8 | 8 | ||
| 9 | #include <Swiften/Base/boost_bsignals.h> | 9 | #include <Swiften/Base/boost_bsignals.h> |
| 10 | #include <Swiften/Base/API.h> | ||
| 10 | 11 | ||
| 11 | namespace Swift { | 12 | namespace Swift { |
| 12 | 13 | ||
| 13 | class SOCKS5BytestreamServerManager; | 14 | class SOCKS5BytestreamServerManager; |
| 14 | 15 | ||
| 15 | class SOCKS5BytestreamServerResourceUser { | 16 | class SWIFTEN_API SOCKS5BytestreamServerResourceUser { |
| 16 | public: | 17 | public: |
| 17 | SOCKS5BytestreamServerResourceUser(SOCKS5BytestreamServerManager* s5bServerManager); | 18 | SOCKS5BytestreamServerResourceUser(SOCKS5BytestreamServerManager* s5bServerManager); |
| 18 | ~SOCKS5BytestreamServerResourceUser(); | 19 | ~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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010 Isode Limited. | 2 | * Copyright (c) 2010-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #pragma once | 7 | #pragma once |
| 8 | 8 | ||
| 9 | #include <Swiften/Base/API.h> | ||
| 9 | #include <Swiften/Queries/GenericRequest.h> | 10 | #include <Swiften/Queries/GenericRequest.h> |
| 10 | #include <Swiften/Elements/StreamInitiation.h> | 11 | #include <Swiften/Elements/StreamInitiation.h> |
| 11 | 12 | ||
| 12 | 13 | ||
| 13 | namespace Swift { | 14 | namespace Swift { |
| 14 | class StreamInitiationRequest : public GenericRequest<StreamInitiation> { | 15 | class SWIFTEN_API StreamInitiationRequest : public GenericRequest<StreamInitiation> { |
| 15 | public: | 16 | public: |
| 16 | typedef boost::shared_ptr<StreamInitiationRequest> ref; | 17 | typedef boost::shared_ptr<StreamInitiationRequest> ref; |
| 17 | 18 | ||
Swift