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/Roster/XMPPRosterImpl.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/Roster/XMPPRosterImpl.cpp')
| -rw-r--r-- | Swiften/Roster/XMPPRosterImpl.cpp | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/Swiften/Roster/XMPPRosterImpl.cpp b/Swiften/Roster/XMPPRosterImpl.cpp index 96b9949..9a2ea7a 100644 --- a/Swiften/Roster/XMPPRosterImpl.cpp +++ b/Swiften/Roster/XMPPRosterImpl.cpp @@ -18,89 +18,89 @@ XMPPRosterImpl::~XMPPRosterImpl() { } void XMPPRosterImpl::addContact(const JID& jid, const std::string& name, const std::vector<std::string>& groups, RosterItemPayload::Subscription subscription) { - JID bareJID(jid.toBare()); - std::map<JID, XMPPRosterItem>::iterator i = entries_.find(bareJID); - if (i != entries_.end()) { - std::string oldName = i->second.getName(); - std::vector<std::string> oldGroups = i->second.getGroups(); - i->second = XMPPRosterItem(jid, name, groups, subscription); - onJIDUpdated(bareJID, oldName, oldGroups); - } - else { - entries_.insert(std::make_pair(bareJID, XMPPRosterItem(jid, name, groups, subscription))); - onJIDAdded(bareJID); - } + JID bareJID(jid.toBare()); + std::map<JID, XMPPRosterItem>::iterator i = entries_.find(bareJID); + if (i != entries_.end()) { + std::string oldName = i->second.getName(); + std::vector<std::string> oldGroups = i->second.getGroups(); + i->second = XMPPRosterItem(jid, name, groups, subscription); + onJIDUpdated(bareJID, oldName, oldGroups); + } + else { + entries_.insert(std::make_pair(bareJID, XMPPRosterItem(jid, name, groups, subscription))); + onJIDAdded(bareJID); + } } void XMPPRosterImpl::removeContact(const JID& jid) { - entries_.erase(JID(jid.toBare())); - onJIDRemoved(jid); + entries_.erase(JID(jid.toBare())); + onJIDRemoved(jid); } void XMPPRosterImpl::clear() { - entries_.clear(); - onRosterCleared(); + entries_.clear(); + onRosterCleared(); } bool XMPPRosterImpl::containsJID(const JID& jid) { - return entries_.find(JID(jid.toBare())) != entries_.end(); + return entries_.find(JID(jid.toBare())) != entries_.end(); } std::string XMPPRosterImpl::getNameForJID(const JID& jid) const { - std::map<JID, XMPPRosterItem>::const_iterator i = entries_.find(jid.toBare()); - if (i != entries_.end()) { - return i->second.getName(); - } - else { - return ""; - } + std::map<JID, XMPPRosterItem>::const_iterator i = entries_.find(jid.toBare()); + if (i != entries_.end()) { + return i->second.getName(); + } + else { + return ""; + } } std::vector<std::string> XMPPRosterImpl::getGroupsForJID(const JID& jid) { - std::map<JID, XMPPRosterItem>::iterator i = entries_.find(jid.toBare()); - if (i != entries_.end()) { - return i->second.getGroups(); - } - else { - return std::vector<std::string>(); - } + std::map<JID, XMPPRosterItem>::iterator i = entries_.find(jid.toBare()); + if (i != entries_.end()) { + return i->second.getGroups(); + } + else { + return std::vector<std::string>(); + } } RosterItemPayload::Subscription XMPPRosterImpl::getSubscriptionStateForJID(const JID& jid) { - std::map<JID, XMPPRosterItem>::iterator i = entries_.find(jid.toBare()); - if (i != entries_.end()) { - return i->second.getSubscription(); - } - else { - return RosterItemPayload::None; - } + std::map<JID, XMPPRosterItem>::iterator i = entries_.find(jid.toBare()); + if (i != entries_.end()) { + return i->second.getSubscription(); + } + else { + return RosterItemPayload::None; + } } std::vector<XMPPRosterItem> XMPPRosterImpl::getItems() const { - std::vector<XMPPRosterItem> result; - foreach(const RosterMap::value_type& entry, entries_) { - result.push_back(entry.second); - } - return result; + std::vector<XMPPRosterItem> result; + foreach(const RosterMap::value_type& entry, entries_) { + result.push_back(entry.second); + } + return result; } boost::optional<XMPPRosterItem> XMPPRosterImpl::getItem(const JID& jid) const { - std::map<JID, XMPPRosterItem>::const_iterator i = entries_.find(jid.toBare()); - if (i != entries_.end()) { - return i->second; - } - else { - return boost::optional<XMPPRosterItem>(); - } + std::map<JID, XMPPRosterItem>::const_iterator i = entries_.find(jid.toBare()); + if (i != entries_.end()) { + return i->second; + } + else { + return boost::optional<XMPPRosterItem>(); + } } std::set<std::string> XMPPRosterImpl::getGroups() const { - std::set<std::string> result; - foreach(const RosterMap::value_type& entry, entries_) { - std::vector<std::string> groups = entry.second.getGroups(); - result.insert(groups.begin(), groups.end()); - } - return result; + std::set<std::string> result; + foreach(const RosterMap::value_type& entry, entries_) { + std::vector<std::string> groups = entry.second.getGroups(); + result.insert(groups.begin(), groups.end()); + } + return result; } } |