Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
| commit | cfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch) | |
| tree | 18d94153a302445196fc0c18586abf44a1ce4a38 /Swiften/VCards/VCardManager.h | |
| parent | 1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff) | |
| download | swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2 | |
Convert tabs to 4 spaces for all source files
Removed trailing spaces and whitespace on empty lines
in the process.
Changed CheckTabs.py tool to disallow hard tabs in source
files.
Test-Information:
Manually checked 30 random files that the conversion worked
as expected.
Change-Id: I874f99d617bd3d2bb55f02d58f22f58f9b094480
Diffstat (limited to 'Swiften/VCards/VCardManager.h')
| -rw-r--r-- | Swiften/VCards/VCardManager.h | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/Swiften/VCards/VCardManager.h b/Swiften/VCards/VCardManager.h index feed1bb..fbad221 100644 --- a/Swiften/VCards/VCardManager.h +++ b/Swiften/VCards/VCardManager.h @@ -18,52 +18,52 @@ #include <Swiften/VCards/SetVCardRequest.h> namespace Swift { - class IQRouter; - class JID; - class VCardStorage; + class IQRouter; + class JID; + class VCardStorage; - class SWIFTEN_API VCardManager : public boost::bsignals::trackable { - public: - VCardManager(const JID& ownJID, IQRouter* iqRouter, VCardStorage* vcardStorage); - ~VCardManager(); + class SWIFTEN_API VCardManager : public boost::bsignals::trackable { + public: + VCardManager(const JID& ownJID, IQRouter* iqRouter, VCardStorage* vcardStorage); + ~VCardManager(); - VCard::ref getVCard(const JID& jid) const; - VCard::ref getVCardAndRequestWhenNeeded(const JID& jid, const boost::posix_time::time_duration& allowedAge = boost::posix_time::time_duration(boost::date_time::pos_infin)); - void requestVCard(const JID& jid); - void requestOwnVCard(); + VCard::ref getVCard(const JID& jid) const; + VCard::ref getVCardAndRequestWhenNeeded(const JID& jid, const boost::posix_time::time_duration& allowedAge = boost::posix_time::time_duration(boost::date_time::pos_infin)); + void requestVCard(const JID& jid); + void requestOwnVCard(); - std::string getPhotoHash(const JID& jid) const; + std::string getPhotoHash(const JID& jid) const; - SetVCardRequest::ref createSetVCardRequest(VCard::ref); + SetVCardRequest::ref createSetVCardRequest(VCard::ref); - public: - /** - * The JID will always be bare. - */ - boost::signal<void (const JID&, VCard::ref)> onVCardChanged; + public: + /** + * The JID will always be bare. + */ + boost::signal<void (const JID&, VCard::ref)> onVCardChanged; - /** - * Emitted when we received an error on looking up a vCard. - */ - boost::signal<void (const JID&, ErrorPayload::ref)> onVCardRetrievalError; + /** + * Emitted when we received an error on looking up a vCard. + */ + boost::signal<void (const JID&, ErrorPayload::ref)> onVCardRetrievalError; - /** - * Emitted when our own vcard changes. - * - * onVCardChanged will also be emitted. - */ - boost::signal<void (VCard::ref)> onOwnVCardChanged; + /** + * Emitted when our own vcard changes. + * + * onVCardChanged will also be emitted. + */ + boost::signal<void (VCard::ref)> onOwnVCardChanged; - private: - void handleVCardReceived(const JID& from, VCard::ref, ErrorPayload::ref); - void handleSetVCardResponse(VCard::ref, ErrorPayload::ref); - void setVCard(const JID& jid, VCard::ref vcard); + private: + void handleVCardReceived(const JID& from, VCard::ref, ErrorPayload::ref); + void handleSetVCardResponse(VCard::ref, ErrorPayload::ref); + void setVCard(const JID& jid, VCard::ref vcard); - private: - JID ownJID; - IQRouter* iqRouter; - VCardStorage* storage; - std::set<JID> requestedVCards; - }; + private: + JID ownJID; + IQRouter* iqRouter; + VCardStorage* storage; + std::set<JID> requestedVCards; + }; } |