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/Avatars/VCardUpdateAvatarManager.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/Avatars/VCardUpdateAvatarManager.h')
| -rw-r--r-- | Swiften/Avatars/VCardUpdateAvatarManager.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/Swiften/Avatars/VCardUpdateAvatarManager.h b/Swiften/Avatars/VCardUpdateAvatarManager.h index ffc615e..07fe011 100644 --- a/Swiften/Avatars/VCardUpdateAvatarManager.h +++ b/Swiften/Avatars/VCardUpdateAvatarManager.h @@ -18,30 +18,30 @@ #include <Swiften/JID/JID.h> namespace Swift { - class MUCRegistry; - class AvatarStorage; - class StanzaChannel; - class VCardManager; - class CryptoProvider; - - class SWIFTEN_API VCardUpdateAvatarManager : public AvatarProvider, public boost::bsignals::trackable { - public: - VCardUpdateAvatarManager(VCardManager*, StanzaChannel*, AvatarStorage*, CryptoProvider* crypto, MUCRegistry* = NULL); - - boost::optional<std::string> getAvatarHash(const JID&) const; - - private: - void handlePresenceReceived(boost::shared_ptr<Presence>); - void handleStanzaChannelAvailableChanged(bool); - void handleVCardChanged(const JID& from, VCard::ref); - void setAvatarHash(const JID& from, const std::string& hash); - JID getAvatarJID(const JID& o) const; - - private: - VCardManager* vcardManager_; - AvatarStorage* avatarStorage_; - CryptoProvider* crypto_; - MUCRegistry* mucRegistry_; - std::map<JID, std::string> avatarHashes_; - }; + class MUCRegistry; + class AvatarStorage; + class StanzaChannel; + class VCardManager; + class CryptoProvider; + + class SWIFTEN_API VCardUpdateAvatarManager : public AvatarProvider, public boost::bsignals::trackable { + public: + VCardUpdateAvatarManager(VCardManager*, StanzaChannel*, AvatarStorage*, CryptoProvider* crypto, MUCRegistry* = NULL); + + boost::optional<std::string> getAvatarHash(const JID&) const; + + private: + void handlePresenceReceived(boost::shared_ptr<Presence>); + void handleStanzaChannelAvailableChanged(bool); + void handleVCardChanged(const JID& from, VCard::ref); + void setAvatarHash(const JID& from, const std::string& hash); + JID getAvatarJID(const JID& o) const; + + private: + VCardManager* vcardManager_; + AvatarStorage* avatarStorage_; + CryptoProvider* crypto_; + MUCRegistry* mucRegistry_; + std::map<JID, std::string> avatarHashes_; + }; } |