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/Client/NickResolver.cpp | |
| 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.cpp')
| -rw-r--r-- | Swiften/Client/NickResolver.cpp | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/Swiften/Client/NickResolver.cpp b/Swiften/Client/NickResolver.cpp index 4136a42..c424447 100644 --- a/Swiften/Client/NickResolver.cpp +++ b/Swiften/Client/NickResolver.cpp @@ -21,59 +21,59 @@ namespace Swift { NickResolver::NickResolver(const JID& ownJID, XMPPRoster* xmppRoster, VCardManager* vcardManager, MUCRegistry* mucRegistry) : ownJID_(ownJID) { - xmppRoster_ = xmppRoster; - vcardManager_ = vcardManager; - if (vcardManager_) { - vcardManager_->onVCardChanged.connect(boost::bind(&NickResolver::handleVCardReceived, this, _1, _2)); - } - mucRegistry_ = mucRegistry; - xmppRoster_->onJIDUpdated.connect(boost::bind(&NickResolver::handleJIDUpdated, this, _1, _2, _3)); - xmppRoster_->onJIDAdded.connect(boost::bind(&NickResolver::handleJIDAdded, this, _1)); + xmppRoster_ = xmppRoster; + vcardManager_ = vcardManager; + if (vcardManager_) { + vcardManager_->onVCardChanged.connect(boost::bind(&NickResolver::handleVCardReceived, this, _1, _2)); + } + mucRegistry_ = mucRegistry; + xmppRoster_->onJIDUpdated.connect(boost::bind(&NickResolver::handleJIDUpdated, this, _1, _2, _3)); + xmppRoster_->onJIDAdded.connect(boost::bind(&NickResolver::handleJIDAdded, this, _1)); } void NickResolver::handleJIDUpdated(const JID& jid, const std::string& previousNick, const std::vector<std::string>& /*groups*/) { - onNickChanged(jid, previousNick); + onNickChanged(jid, previousNick); } void NickResolver::handleJIDAdded(const JID& jid) { - std::string oldNick(jidToNick(jid)); - onNickChanged(jid, oldNick); + std::string oldNick(jidToNick(jid)); + onNickChanged(jid, oldNick); } std::string NickResolver::jidToNick(const JID& jid) { - if (jid.toBare() == ownJID_) { - if (!ownNick_.empty()) { - return ownNick_; - } - } - std::string nick; + if (jid.toBare() == ownJID_) { + if (!ownNick_.empty()) { + return ownNick_; + } + } + std::string nick; - if (mucRegistry_ && mucRegistry_->isMUC(jid.toBare()) ) { - return jid.getResource().empty() ? jid.toBare().toString() : jid.getResource(); - } + if (mucRegistry_ && mucRegistry_->isMUC(jid.toBare()) ) { + return jid.getResource().empty() ? jid.toBare().toString() : jid.getResource(); + } - if (xmppRoster_->containsJID(jid) && !xmppRoster_->getNameForJID(jid).empty()) { - return xmppRoster_->getNameForJID(jid); - } + if (xmppRoster_->containsJID(jid) && !xmppRoster_->getNameForJID(jid).empty()) { + return xmppRoster_->getNameForJID(jid); + } - return jid.toBare(); + return jid.toBare(); } void NickResolver::handleVCardReceived(const JID& jid, VCard::ref ownVCard) { - if (!jid.equals(ownJID_, JID::WithoutResource)) { - return; - } - std::string initialNick = ownNick_; - ownNick_ = ownJID_.toString(); - if (ownVCard) { - if (!ownVCard->getNickname().empty()) { - ownNick_ = ownVCard->getNickname(); - } else if (!ownVCard->getGivenName().empty()) { - ownNick_ = ownVCard->getGivenName(); - } else if (!ownVCard->getFullName().empty()) { - ownNick_ = ownVCard->getFullName(); - } - } + if (!jid.equals(ownJID_, JID::WithoutResource)) { + return; + } + std::string initialNick = ownNick_; + ownNick_ = ownJID_.toString(); + if (ownVCard) { + if (!ownVCard->getNickname().empty()) { + ownNick_ = ownVCard->getNickname(); + } else if (!ownVCard->getGivenName().empty()) { + ownNick_ = ownVCard->getGivenName(); + } else if (!ownVCard->getFullName().empty()) { + ownNick_ = ownVCard->getFullName(); + } + } } } |