summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Client')
-rw-r--r--Swiften/Client/Client.cpp42
-rw-r--r--Swiften/Client/Client.h47
2 files changed, 48 insertions, 41 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index 48576d4..8642a4e 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -6,32 +6,34 @@
#include <Swiften/Client/Client.h>
-#include <Swiften/Queries/Responders/SoftwareVersionResponder.h>
-#include <Swiften/Roster/XMPPRosterImpl.h>
-#include <Swiften/Roster/XMPPRosterController.h>
-#include <Swiften/Presence/PresenceOracle.h>
-#include <Swiften/Presence/StanzaChannelPresenceSender.h>
-#include <Swiften/Presence/DirectedPresenceSender.h>
-#include <Swiften/MUC/MUCRegistry.h>
-#include <Swiften/MUC/MUCManager.h>
-#include <Swiften/PubSub/PubSubManagerImpl.h>
-#include <Swiften/Client/MemoryStorages.h>
-#include <Swiften/VCards/VCardManager.h>
-#include <Swiften/VCards/VCardManager.h>
#include <Swiften/Avatars/AvatarManagerImpl.h>
+#include <Swiften/Base/SafeString.h>
+#include <Swiften/Client/ClientBlockListManager.h>
+#include <Swiften/Client/ClientSession.h>
+#include <Swiften/Client/MemoryStorages.h>
+#include <Swiften/Client/NickManagerImpl.h>
+#include <Swiften/Client/NickResolver.h>
#include <Swiften/Disco/CapsManager.h>
-#include <Swiften/Disco/EntityCapsManager.h>
#include <Swiften/Disco/ClientDiscoManager.h>
-#include <Swiften/Client/NickResolver.h>
-#include <Swiften/Presence/SubscriptionManager.h>
-#include <Swiften/TLS/BlindCertificateTrustChecker.h>
-#include <Swiften/Client/NickManagerImpl.h>
-#include <Swiften/Client/ClientSession.h>
+#include <Swiften/Disco/EntityCapsManager.h>
+#include <Swiften/FileTransfer/FileTransferManagerImpl.h>
#include <Swiften/Jingle/JingleSessionManager.h>
+#include <Swiften/MUC/MUCManager.h>
+#include <Swiften/MUC/MUCRegistry.h>
#include <Swiften/Network/NetworkFactories.h>
-#include <Swiften/FileTransfer/FileTransferManagerImpl.h>
+#include <Swiften/Presence/DirectedPresenceSender.h>
+#include <Swiften/Presence/PresenceOracle.h>
+#include <Swiften/Presence/StanzaChannelPresenceSender.h>
+#include <Swiften/Presence/SubscriptionManager.h>
+#include <Swiften/PubSub/PubSubManagerImpl.h>
+#include <Swiften/Queries/Responders/SoftwareVersionResponder.h>
+#include <Swiften/Roster/XMPPRosterController.h>
+#include <Swiften/Roster/XMPPRosterImpl.h>
+#include <Swiften/TLS/BlindCertificateTrustChecker.h>
+#include <Swiften/VCards/VCardManager.h>
+#include <Swiften/VCards/VCardManager.h>
#include <Swiften/Whiteboard/WhiteboardSessionManager.h>
-#include <Swiften/Client/ClientBlockListManager.h>
+
#ifndef SWIFT_EXPERIMENTAL_FT
#include <Swiften/FileTransfer/UnitTest/DummyFileTransferManager.h>
#endif
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index af7da5d..5b11688 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -7,38 +7,38 @@
#pragma once
#include <Swiften/Base/API.h>
-#include <Swiften/Base/SafeString.h>
#include <Swiften/Client/CoreClient.h>
namespace Swift {
- class SoftwareVersionResponder;
+ class AvatarManager;
class BlindCertificateTrustChecker;
- class XMPPRoster;
- class XMPPRosterImpl;
+ class CapsManager;
+ class ClientBlockListManager;
+ class ClientDiscoManager;
+ class DirectedPresenceSender;
+ class EntityCapsManager;
+ class EntityCapsProvider;
+ class FileTransferManager;
+ class FileTransferManager;
+ class JingleSessionManager;
class MUCManager;
- class XMPPRosterController;
+ class MUCRegistry;
+ class MemoryStorages;
+ class NickManager;
+ class NickResolver;
class PresenceOracle;
class PresenceSender;
- class DirectedPresenceSender;
+ class PubSubManager;
+ class SafeString;
+ class SoftwareVersionResponder;
class StanzaChannelPresenceSender;
- class MUCRegistry;
class Storages;
- class MemoryStorages;
- class VCardManager;
- class AvatarManager;
- class CapsManager;
- class EntityCapsManager;
- class EntityCapsProvider;
- class NickResolver;
class SubscriptionManager;
- class ClientDiscoManager;
- class NickManager;
- class FileTransferManager;
- class JingleSessionManager;
- class FileTransferManager;
+ class VCardManager;
class WhiteboardSessionManager;
- class ClientBlockListManager;
- class PubSubManager;
+ class XMPPRoster;
+ class XMPPRosterController;
+ class XMPPRosterImpl;
/**
* Provides the core functionality for writing XMPP client software.
@@ -51,6 +51,11 @@ namespace Swift {
/**
* Constructs a client for the given JID with the given password.
*
+ * \param jid The JID to be used for the login. If only a bare
+ * JID is give the server will be asked to generate a resource.
+ * \param password The password used for login given as a \ref SafeString.
+ * \param networkFactories The network factories that are used
+ * to handle any network related tasks.
* \param storages The interfaces for storing cache information etc. If
* this is NULL,
* all data will be stored in memory (and be lost on shutdown)