Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-06-19 09:59:20 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-06-21 15:56:20 (GMT) |
| commit | 027111dcd9f5812342066d3bd3e1dbb1f46b3c95 (patch) | |
| tree | 99fcd35d79dc64cb07b2aec0c5c4113b75fcdd7e /Swift/Controllers/Roster/ContactRosterItem.h | |
| parent | 83fb5ae3da2e5e690a3eafae99f6cd0cb59a2496 (diff) | |
| download | swift-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 'Swift/Controllers/Roster/ContactRosterItem.h')
| -rw-r--r-- | Swift/Controllers/Roster/ContactRosterItem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/Controllers/Roster/ContactRosterItem.h b/Swift/Controllers/Roster/ContactRosterItem.h index 9779859..a300819 100644 --- a/Swift/Controllers/Roster/ContactRosterItem.h +++ b/Swift/Controllers/Roster/ContactRosterItem.h @@ -19,61 +19,61 @@ #include <Swiften/Elements/MUCOccupant.h> #include <Swiften/Elements/StatusShow.h> #include <Swiften/Elements/VCard.h> #include <Swiften/JID/JID.h> #include <Swift/Controllers/Roster/RosterItem.h> namespace Swift { class GroupRosterItem; class Presence; class ContactRosterItem : public RosterItem { public: enum Feature { FileTransferFeature, WhiteboardFeature }; enum BlockState { BlockingNotSupported, IsBlocked, IsUnblocked, IsDomainBlocked }; public: /** * @brief ContactRosterItem contains the information of a contact that is part of a XMPP Roster. * @param jid The JabberID of the contact in the Roster entry. - * @param displayJID An alternate JID that is used instead of the JID this item represents. If not available, + * @param displayJID An alternate JID that is used instead of the JID this item represents. If not available, * an empty node should be passed. This parameter will be converted to a bare JID. * @param name The name or nickname of the contact * @param parent The roster group that the contact is a member of. The same JID may be in several roster groups, in which case they will have individual ContactRosterItems with the same JID. */ ContactRosterItem(const JID& jid, const JID& displayJID, const std::string& name, GroupRosterItem* parent); virtual ~ContactRosterItem(); StatusShow::Type getStatusShow() const; StatusShow::Type getSimplifiedStatusShow() const; std::string getStatusText() const; std::string getIdleText() const; boost::posix_time::ptime getIdle() const; std::string getOfflineSinceText() const; boost::posix_time::ptime getOfflineSince() const; void setAvatarPath(const boost::filesystem::path& path); const boost::filesystem::path& getAvatarPath() const; const JID& getJID() const; void setDisplayJID(const JID& jid); const JID& getDisplayJID() const; void applyPresence(std::shared_ptr<Presence> presence); const std::vector<std::string>& getGroups() const; /** Only used so a contact can know about the groups it's in*/ void addGroup(const std::string& group); void removeGroup(const std::string& group); void clearPresence(); MUCOccupant::Role getMUCRole() const; void setMUCRole(const MUCOccupant::Role& role); MUCOccupant::Affiliation getMUCAffiliation() const; void setMUCAffiliation(const MUCOccupant::Affiliation& affiliation); |