Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-09-24 18:18:28 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-09-25 17:42:32 (GMT) |
| commit | 94f87ffc9769f2782b2267db813854b0fe752678 (patch) | |
| tree | 56244712ade2be0d4a0a093d7721d18050e74f87 /Swiften/Client/Client.h | |
| parent | 4f62e5ec4b42929fe3c1a68667e63cb1b7a35509 (diff) | |
| download | swift-contrib-94f87ffc9769f2782b2267db813854b0fe752678.zip swift-contrib-94f87ffc9769f2782b2267db813854b0fe752678.tar.bz2 | |
File transfer changes.
- Introduce 'experimental' flag to conditionally compile FT.
- Use LibMiniUPNPC and NATPMP CPPDEFINES only locally in the classes that need them.
- Extract abstract interface from NAT traversal classes
- Avoid unit test warnings
Diffstat (limited to 'Swiften/Client/Client.h')
| -rw-r--r-- | Swiften/Client/Client.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h index 7269f10..940a526 100644 --- a/Swiften/Client/Client.h +++ b/Swiften/Client/Client.h @@ -29,19 +29,19 @@ namespace Swift { class CapsManager; class EntityCapsManager; class EntityCapsProvider; class NickResolver; class SubscriptionManager; class ClientDiscoManager; class NickManager; class FileTransferManager; class JingleSessionManager; - class FileTransferManagerImpl; + class FileTransferManager; /** * Provides the core functionality for writing XMPP client software. * * Besides connecting to an XMPP server, this class also provides interfaces for * performing most tasks on the XMPP network. */ class Client : public CoreClient { public: @@ -130,19 +130,22 @@ namespace Swift { SubscriptionManager* getSubscriptionManager() const { return subscriptionManager; } ClientDiscoManager* getDiscoManager() const { return discoManager; } /** - * Returns a FileTransferManager for the client. This is only available after the onConnected signal has been fired. + * Returns a FileTransferManager for the client. This is only available after the onConnected + * signal has been fired. + * + * WARNING: File transfer will only work if Swiften is built in 'experimental' mode. */ FileTransferManager* getFileTransferManager() const; /** * Configures the client to always trust a non-validating * TLS certificate from the server. * This is equivalent to setting a BlindCertificateTrustChecker * using setCertificateTrustChecker(). */ @@ -174,13 +177,13 @@ namespace Swift { AvatarManager* avatarManager; CapsManager* capsManager; EntityCapsManager* entityCapsManager; NickManager* nickManager; NickResolver* nickResolver; SubscriptionManager* subscriptionManager; MUCManager* mucManager; ClientDiscoManager* discoManager; JingleSessionManager* jingleSessionManager; - FileTransferManagerImpl* fileTransferManager; + FileTransferManager* fileTransferManager; BlindCertificateTrustChecker* blindCertificateTrustChecker; }; } |