Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-02-14 18:57:18 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-02-14 21:36:32 (GMT) |
| commit | cb05f5a908e20006c954ce38755c2e422ecc2388 (patch) | |
| tree | a793551a5fe279a57d4330119560e8542f745484 /Swiften/Roster/XMPPRosterImpl.cpp | |
| parent | cad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff) | |
| download | swift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2 | |
Removed Swift::String.
Diffstat (limited to 'Swiften/Roster/XMPPRosterImpl.cpp')
| -rw-r--r-- | Swiften/Roster/XMPPRosterImpl.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Swiften/Roster/XMPPRosterImpl.cpp b/Swiften/Roster/XMPPRosterImpl.cpp index 3e9e312..8086806 100644 --- a/Swiften/Roster/XMPPRosterImpl.cpp +++ b/Swiften/Roster/XMPPRosterImpl.cpp @@ -12,12 +12,12 @@ namespace Swift { XMPPRosterImpl::XMPPRosterImpl() { } -void XMPPRosterImpl::addContact(const JID& jid, const String& name, const std::vector<String>& groups, RosterItemPayload::Subscription subscription) { +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()) { - String oldName = i->second.getName(); - std::vector<String> oldGroups = i->second.getGroups(); + 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); } @@ -41,7 +41,7 @@ bool XMPPRosterImpl::containsJID(const JID& jid) { return entries_.find(JID(jid.toBare())) != entries_.end(); } -String XMPPRosterImpl::getNameForJID(const JID& jid) const { +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(); @@ -51,13 +51,13 @@ String XMPPRosterImpl::getNameForJID(const JID& jid) const { } } -std::vector<String> XMPPRosterImpl::getGroupsForJID(const JID& jid) { +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<String>(); + return std::vector<std::string>(); } } @@ -89,10 +89,10 @@ boost::optional<XMPPRosterItem> XMPPRosterImpl::getItem(const JID& jid) const { } } -std::set<String> XMPPRosterImpl::getGroups() const { - std::set<String> result; +std::set<std::string> XMPPRosterImpl::getGroups() const { + std::set<std::string> result; foreach(const RosterMap::value_type& entry, entries_) { - std::vector<String> groups = entry.second.getGroups(); + std::vector<std::string> groups = entry.second.getGroups(); result.insert(groups.begin(), groups.end()); } return result; |