diff 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/Client/NickResolver.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/Client/NickResolver.h')
-rw-r--r-- | Swiften/Client/NickResolver.h | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/Swiften/Client/NickResolver.h b/Swiften/Client/NickResolver.h index c3e6f05..b187796 100644 --- a/Swiften/Client/NickResolver.h +++ b/Swiften/Client/NickResolver.h @@ -17,28 +17,28 @@ #include <Swiften/JID/JID.h> namespace Swift { - class XMPPRoster; - class MUCRegistry; - class VCardManager; - - class SWIFTEN_API NickResolver { - public: - NickResolver(const JID& ownJID, XMPPRoster* xmppRoster, VCardManager* vcardManager, MUCRegistry* mucRegistry); - - std::string jidToNick(const JID& jid); - - boost::signal<void (const JID&, const std::string& /*previousNick*/)> onNickChanged; - - private: - void handleVCardReceived(const JID& jid, VCard::ref vCard); - void handleJIDUpdated(const JID& jid, const std::string& previousNick, const std::vector<std::string>& groups); - void handleJIDAdded(const JID& jid); - - private: - JID ownJID_; - std::string ownNick_; - XMPPRoster* xmppRoster_; - MUCRegistry* mucRegistry_; - VCardManager* vcardManager_; - }; + class XMPPRoster; + class MUCRegistry; + class VCardManager; + + class SWIFTEN_API NickResolver { + public: + NickResolver(const JID& ownJID, XMPPRoster* xmppRoster, VCardManager* vcardManager, MUCRegistry* mucRegistry); + + std::string jidToNick(const JID& jid); + + boost::signal<void (const JID&, const std::string& /*previousNick*/)> onNickChanged; + + private: + void handleVCardReceived(const JID& jid, VCard::ref vCard); + void handleJIDUpdated(const JID& jid, const std::string& previousNick, const std::vector<std::string>& groups); + void handleJIDAdded(const JID& jid); + + private: + JID ownJID_; + std::string ownNick_; + XMPPRoster* xmppRoster_; + MUCRegistry* mucRegistry_; + VCardManager* vcardManager_; + }; } |