summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2017-06-19 09:59:20 (GMT)
committerTobias Markmann <tm@ayena.de>2017-06-21 15:56:20 (GMT)
commit027111dcd9f5812342066d3bd3e1dbb1f46b3c95 (patch)
tree99fcd35d79dc64cb07b2aec0c5c4113b75fcdd7e /Swiften
parent83fb5ae3da2e5e690a3eafae99f6cd0cb59a2496 (diff)
downloadswift-027111dcd9f5812342066d3bd3e1dbb1f46b3c95.zip
swift-027111dcd9f5812342066d3bd3e1dbb1f46b3c95.tar.bz2
Add Coala config for whitespace checking
Coala ( https://coala.io/ ), is a meta linting tool, that comes with own checks and integration for external tools for a lot languages. This adds a configuration that enforces no trailing whitespace and no lines with only whitespaces. Test-Information: Ran coala and fixes the issues it raised. Change-Id: I30b201135bbe8888d9d1bcadb28f9ced9b5db28f
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/Client/Client.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index 5b11688..be4881a 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -24,61 +24,61 @@ namespace Swift {
class MUCManager;
class MUCRegistry;
class MemoryStorages;
class NickManager;
class NickResolver;
class PresenceOracle;
class PresenceSender;
class PubSubManager;
class SafeString;
class SoftwareVersionResponder;
class StanzaChannelPresenceSender;
class Storages;
class SubscriptionManager;
class VCardManager;
class WhiteboardSessionManager;
class XMPPRoster;
class XMPPRosterController;
class XMPPRosterImpl;
/**
* 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 SWIFTEN_API Client : public CoreClient {
public:
/**
* 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
+ * \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)
*/
Client(const JID& jid, const SafeString& password, NetworkFactories* networkFactories, Storages* storages = nullptr);
virtual ~Client();
/**
* Sets the software version of the client.
*
* This will be used to respond to version queries from other entities.
*/
void setSoftwareVersion(const std::string& name, const std::string& version, const std::string& os = "");
/**
* Returns a representation of the roster.
*
* The roster is initially empty. To populate it, call requestRoster(),
* which will request the roster from the server. When the roster has
* been requested, it will also be kept up to date when it is updated on
* the server side.
*
* This pointer remains the same across the lifetime of Client. All
* changes to the roster (e.g. after the initial roster request, or after
* subsequent roster updates) are notified through the XMPPRoster's