summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2013-11-18 22:41:22 (GMT)
committerSwift Review <review@swift.im>2013-12-08 20:34:06 (GMT)
commit2b6b227ef4ae0e68709d8ad327260cb8f609909c (patch)
tree654083e0381d93b99f4627de5ecbdbe496b3bba1 /Swift/Controllers/Roster/Roster.cpp
parentacd19fa05d8a7fa2ebac9d6534ee203368f1a3e9 (diff)
downloadswift-2b6b227ef4ae0e68709d8ad327260cb8f609909c.zip
swift-2b6b227ef4ae0e68709d8ad327260cb8f609909c.tar.bz2
Convert Roster::setAvailableFeatures() and Roster::setBlockedState() to RosterItemOperations.
Change-Id: I67943bd50ca9eb4ae53e1acefbea1c7b67684cc9 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Diffstat (limited to 'Swift/Controllers/Roster/Roster.cpp')
-rw-r--r--Swift/Controllers/Roster/Roster.cpp27
1 files changed, 3 insertions, 24 deletions
diff --git a/Swift/Controllers/Roster/Roster.cpp b/Swift/Controllers/Roster/Roster.cpp
index dbb1780..51e888f 100644
--- a/Swift/Controllers/Roster/Roster.cpp
+++ b/Swift/Controllers/Roster/Roster.cpp
@@ -66,36 +66,15 @@ GroupRosterItem* Roster::getGroup(const std::string& groupName) {
return group;
}
-void Roster::setAvailableFeatures(const JID& jid, const std::set<ContactRosterItem::Feature>& features) {
- ItemMap::const_iterator i = itemMap_.find(fullJIDMapping_ ? jid : jid.toBare());
- if (i == itemMap_.end()) {
- return;
- }
- foreach(ContactRosterItem* item, i->second) {
- item->setSupportedFeatures(features);
- }
-}
-
-void Roster::setBlockedState(const std::vector<JID> &jids, ContactRosterItem::BlockState state) {
- if (!blockingSupported_ ) {
+void Roster::setBlockingSupported(bool isSupported) {
+ if (!blockingSupported_) {
foreach(ItemMap::value_type i, itemMap_) {
foreach(ContactRosterItem* item, i.second) {
item->setBlockState(ContactRosterItem::IsUnblocked);
}
}
}
-
- foreach(const JID& jid, jids) {
- ItemMap::const_iterator i = itemMap_.find(fullJIDMapping_ ? jid : jid.toBare());
- if (i == itemMap_.end()) {
- continue;
- }
- foreach(ContactRosterItem* item, i->second) {
- item->setBlockState(state);
- }
- }
-
- blockingSupported_ = true;
+ blockingSupported_ = isSupported;
}
void Roster::removeGroup(const std::string& group) {