Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-09-17 18:01:03 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-09-17 18:01:03 (GMT) |
| commit | 3d6aa3b50090c19b50ae488494f1459bade88da3 (patch) | |
| tree | 60db50a40f01d2dc4b48e5aee1011f0e72643c39 /Swiften/FileTransfer | |
| parent | 7693734b10699b5fc4bfc3d7dc33128d558e202d (diff) | |
| download | swift-3d6aa3b50090c19b50ae488494f1459bade88da3.zip swift-3d6aa3b50090c19b50ae488494f1459bade88da3.tar.bz2 | |
Support for building swiften as a DLL
Added missing SWIFTEN_API declarations.
Changed test infrastructure to extend path before running
tests.
Diffstat (limited to 'Swiften/FileTransfer')
15 files changed, 32 insertions, 15 deletions
diff --git a/Swiften/FileTransfer/FileTransferManager.h b/Swiften/FileTransfer/FileTransferManager.h index d59f029..30d9faf 100644 --- a/Swiften/FileTransfer/FileTransferManager.h +++ b/Swiften/FileTransfer/FileTransferManager.h @@ -10,6 +10,7 @@ #include <boost/filesystem.hpp> #include <boost/date_time/posix_time/posix_time.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> #include <Swiften/JID/JID.h> #include <Swiften/FileTransfer/OutgoingFileTransfer.h> @@ -19,7 +20,7 @@ namespace Swift { class ReadBytestream; class S5BProxyRequest; - class FileTransferManager { + class SWIFTEN_API FileTransferManager { public: virtual ~FileTransferManager(); diff --git a/Swiften/FileTransfer/IBBReceiveSession.h b/Swiften/FileTransfer/IBBReceiveSession.h index d1c47bf..f075fe2 100644 --- a/Swiften/FileTransfer/IBBReceiveSession.h +++ b/Swiften/FileTransfer/IBBReceiveSession.h @@ -9,6 +9,7 @@ #include <boost/shared_ptr.hpp> #include <boost/optional/optional_fwd.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> #include <Swiften/FileTransfer/WriteBytestream.h> #include <Swiften/JID/JID.h> @@ -18,7 +19,7 @@ namespace Swift { class IQRouter; - class IBBReceiveSession { + class SWIFTEN_API IBBReceiveSession { public: IBBReceiveSession( const std::string& id, diff --git a/Swiften/FileTransfer/IBBSendSession.h b/Swiften/FileTransfer/IBBSendSession.h index abd217b..a535382 100644 --- a/Swiften/FileTransfer/IBBSendSession.h +++ b/Swiften/FileTransfer/IBBSendSession.h @@ -9,6 +9,7 @@ #include <boost/shared_ptr.hpp> #include <boost/optional.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> #include <Swiften/FileTransfer/ReadBytestream.h> #include <Swiften/JID/JID.h> @@ -19,7 +20,7 @@ namespace Swift { class IQRouter; - class IBBSendSession { + class SWIFTEN_API IBBSendSession { public: IBBSendSession(const std::string& id, const JID& from, const JID& to, boost::shared_ptr<ReadBytestream> bytestream, IQRouter* router); ~IBBSendSession(); diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.h b/Swiften/FileTransfer/IncomingJingleFileTransfer.h index 746d837..0731e04 100644 --- a/Swiften/FileTransfer/IncomingJingleFileTransfer.h +++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.h @@ -9,6 +9,7 @@ #include <boost/shared_ptr.hpp> #include <boost/cstdint.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Base/IDGenerator.h> #include <Swiften/Network/Timer.h> #include <Swiften/Jingle/JingleSession.h> @@ -35,7 +36,7 @@ namespace Swift { class SOCKS5BytestreamProxy; class IncrementalBytestreamHashCalculator; - class IncomingJingleFileTransfer : public IncomingFileTransfer { + class SWIFTEN_API IncomingJingleFileTransfer : public IncomingFileTransfer { public: typedef boost::shared_ptr<IncomingJingleFileTransfer> ref; enum State { diff --git a/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.h b/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.h index 041afe3..14c128a 100644 --- a/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.h +++ b/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.h @@ -8,11 +8,12 @@ #include <Swiften/Base/boost_bsignals.h> +#include <Swiften/Base/API.h> #include <Swiften/Elements/JingleTransportPayload.h> #include <Swiften/FileTransfer/JingleTransport.h> namespace Swift { - class LocalJingleTransportCandidateGenerator { + class SWIFTEN_API LocalJingleTransportCandidateGenerator { public: virtual ~LocalJingleTransportCandidateGenerator(); /** diff --git a/Swiften/FileTransfer/LocalJingleTransportCandidateGeneratorFactory.h b/Swiften/FileTransfer/LocalJingleTransportCandidateGeneratorFactory.h index c969fc7..422e006 100644 --- a/Swiften/FileTransfer/LocalJingleTransportCandidateGeneratorFactory.h +++ b/Swiften/FileTransfer/LocalJingleTransportCandidateGeneratorFactory.h @@ -6,10 +6,12 @@ #pragma once +#include <Swiften/Base/API.h> + namespace Swift { class LocalJingleTransportCandidateGenerator; - class LocalJingleTransportCandidateGeneratorFactory { + class SWIFTEN_API LocalJingleTransportCandidateGeneratorFactory { public: virtual ~LocalJingleTransportCandidateGeneratorFactory(); diff --git a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h index 0260016..e18b5c3 100644 --- a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h +++ b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h @@ -8,6 +8,7 @@ #include <boost/shared_ptr.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Elements/JingleContentPayload.h> #include <Swiften/Elements/JingleS5BTransportPayload.h> #include <Swiften/Elements/StreamInitiationFileInfo.h> @@ -34,7 +35,7 @@ class IncrementalBytestreamHashCalculator; class SOCKS5BytestreamRegistry; class SOCKS5BytestreamProxy; -class OutgoingJingleFileTransfer : public OutgoingFileTransfer { +class SWIFTEN_API OutgoingJingleFileTransfer : public OutgoingFileTransfer { public: OutgoingJingleFileTransfer(JingleSession::ref, RemoteJingleTransportCandidateSelectorFactory*, diff --git a/Swiften/FileTransfer/ReadBytestream.h b/Swiften/FileTransfer/ReadBytestream.h index c94e4d3..b0663ab 100644 --- a/Swiften/FileTransfer/ReadBytestream.h +++ b/Swiften/FileTransfer/ReadBytestream.h @@ -9,10 +9,11 @@ #include <boost/shared_ptr.hpp> #include <vector> +#include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> namespace Swift { - class ReadBytestream { + class SWIFTEN_API ReadBytestream { public: virtual ~ReadBytestream(); diff --git a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h index f8df8f9..487747c 100644 --- a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h +++ b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h @@ -8,13 +8,14 @@ #include <Swiften/Base/boost_bsignals.h> +#include <Swiften/Base/API.h> #include <Swiften/JID/JID.h> #include <Swiften/Elements/JingleTransportPayload.h> #include <Swiften/FileTransfer/JingleTransport.h> #include <Swiften/FileTransfer/SOCKS5BytestreamClientSession.h> namespace Swift { - class RemoteJingleTransportCandidateSelector { + class SWIFTEN_API RemoteJingleTransportCandidateSelector { public: virtual ~RemoteJingleTransportCandidateSelector(); diff --git a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelectorFactory.h b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelectorFactory.h index caa3097..4980b0c 100644 --- a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelectorFactory.h +++ b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelectorFactory.h @@ -6,10 +6,12 @@ #pragma once +#include <Swiften/Base/API.h> + namespace Swift { class RemoteJingleTransportCandidateSelector; - class RemoteJingleTransportCandidateSelectorFactory { + class SWIFTEN_API RemoteJingleTransportCandidateSelectorFactory { public: virtual ~RemoteJingleTransportCandidateSelectorFactory(); diff --git a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h index e522ff8..0b9790d 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h +++ b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h @@ -9,6 +9,7 @@ #include <boost/shared_ptr.hpp> #include <boost/optional.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Base/ByteArray.h> #include <Swiften/FileTransfer/FileTransferError.h> #include <Swiften/FileTransfer/WriteBytestream.h> @@ -28,7 +29,7 @@ class TimerFactory; * A session which has been connected to a SOCKS5 server (requester). * */ -class SOCKS5BytestreamClientSession { +class SWIFTEN_API SOCKS5BytestreamClientSession { public: enum State { Initial, diff --git a/Swiften/FileTransfer/SOCKS5BytestreamProxy.h b/Swiften/FileTransfer/SOCKS5BytestreamProxy.h index 8f80cea..59ff50c 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamProxy.h +++ b/Swiften/FileTransfer/SOCKS5BytestreamProxy.h @@ -9,6 +9,7 @@ #include <string> #include <vector> +#include <Swiften/Base/API.h> #include <Swiften/Elements/S5BProxyRequest.h> #include <Swiften/FileTransfer/SOCKS5BytestreamClientSession.h> #include <Swiften/JID/JID.h> @@ -21,7 +22,7 @@ namespace Swift { * - manages list of working S5B proxies * - creates initial connections (for the candidates you provide) */ -class SOCKS5BytestreamProxy { +class SWIFTEN_API SOCKS5BytestreamProxy { public: SOCKS5BytestreamProxy(ConnectionFactory*, TimerFactory*); diff --git a/Swiften/FileTransfer/SOCKS5BytestreamRegistry.h b/Swiften/FileTransfer/SOCKS5BytestreamRegistry.h index 779aabb..6d89e27 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamRegistry.h +++ b/Swiften/FileTransfer/SOCKS5BytestreamRegistry.h @@ -13,6 +13,7 @@ #include <vector> #include <set> +#include <Swiften/Base/API.h> #include <Swiften/Base/IDGenerator.h> #include <Swiften/JID/JID.h> #include <Swiften/Elements/S5BProxyRequest.h> @@ -23,7 +24,7 @@ #include <Swiften/Network/HostAddressPort.h> namespace Swift { - class SOCKS5BytestreamRegistry { + class SWIFTEN_API SOCKS5BytestreamRegistry { public: SOCKS5BytestreamRegistry(); diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerSession.h b/Swiften/FileTransfer/SOCKS5BytestreamServerSession.h index ed77df8..4cbda7c 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamServerSession.h +++ b/Swiften/FileTransfer/SOCKS5BytestreamServerSession.h @@ -8,6 +8,7 @@ #include <boost/shared_ptr.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> #include <Swiften/Network/Connection.h> #include <Swiften/FileTransfer/ReadBytestream.h> @@ -17,7 +18,7 @@ namespace Swift { class SOCKS5BytestreamRegistry; - class SOCKS5BytestreamServerSession { + class SWIFTEN_API SOCKS5BytestreamServerSession { public: typedef boost::shared_ptr<SOCKS5BytestreamServerSession> ref; diff --git a/Swiften/FileTransfer/WriteBytestream.h b/Swiften/FileTransfer/WriteBytestream.h index fb6f2f1..6085e78 100644 --- a/Swiften/FileTransfer/WriteBytestream.h +++ b/Swiften/FileTransfer/WriteBytestream.h @@ -9,10 +9,11 @@ #include <boost/shared_ptr.hpp> #include <vector> +#include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> namespace Swift { - class WriteBytestream { + class SWIFTEN_API WriteBytestream { public: typedef boost::shared_ptr<WriteBytestream> ref; |