Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-07-23 14:47:48 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-07-23 15:01:33 (GMT) |
| commit | 4cc96003c6702168da2faa955e3c771272211e32 (patch) | |
| tree | b15355b09676583b2fb468f616f3dd284c52eac9 /Swiften/Roster | |
| parent | e00480d2f4326decd23ff7665fcb1af5e752c8ec (diff) | |
| download | swift-4cc96003c6702168da2faa955e3c771272211e32.zip swift-4cc96003c6702168da2faa955e3c771272211e32.tar.bz2 | |
Recognise when leaving a MUC (disconnect or kick).
Also cleans up some outstanding MUC issues.
Resolves: #288
Resolves: #392
Resolves: #279
Resolves: #114
Diffstat (limited to 'Swiften/Roster')
| -rw-r--r-- | Swiften/Roster/GroupRosterItem.cpp | 21 | ||||
| -rw-r--r-- | Swiften/Roster/GroupRosterItem.h | 1 | ||||
| -rw-r--r-- | Swiften/Roster/Roster.cpp | 7 | ||||
| -rw-r--r-- | Swiften/Roster/Roster.h | 1 |
4 files changed, 30 insertions, 0 deletions
diff --git a/Swiften/Roster/GroupRosterItem.cpp b/Swiften/Roster/GroupRosterItem.cpp index e5490e2..8e4be35 100644 --- a/Swiften/Roster/GroupRosterItem.cpp +++ b/Swiften/Roster/GroupRosterItem.cpp @@ -55,6 +55,27 @@ void GroupRosterItem::addChild(RosterItem* item) { } /** + * Does not emit a changed signal. + */ +void GroupRosterItem::removeAll() { + std::vector<RosterItem*>::iterator it = children_.begin(); + displayedChildren_.clear(); + while (it != children_.end()) { + ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(*it); + if (contact) { + delete contact; + } + GroupRosterItem* group = dynamic_cast<GroupRosterItem*>(*it); + if (group) { + group->removeAll(); + delete group; + } + it++; + } + children_.clear(); +} + +/** * Returns the removed item - but only if it's the only one, otherwise * the return result is undefined. */ diff --git a/Swiften/Roster/GroupRosterItem.h b/Swiften/Roster/GroupRosterItem.h index aca2b05..096d053 100644 --- a/Swiften/Roster/GroupRosterItem.h +++ b/Swiften/Roster/GroupRosterItem.h @@ -22,6 +22,7 @@ class GroupRosterItem : public RosterItem { const std::vector<RosterItem*>& getDisplayedChildren() const; void addChild(RosterItem* item); ContactRosterItem* removeChild(const JID& jid); + void removeAll(); void setDisplayed(RosterItem* item, bool displayed); boost::signal<void ()> onChildrenChanged; static bool itemLessThan(const RosterItem* left, const RosterItem* right); diff --git a/Swiften/Roster/Roster.cpp b/Swiften/Roster/Roster.cpp index b7ed6c4..e91b843 100644 --- a/Swiften/Roster/Roster.cpp +++ b/Swiften/Roster/Roster.cpp @@ -82,6 +82,13 @@ struct JIDEqualsTo { JID jid; }; +void Roster::removeAll() { + root_->removeAll(); + itemMap_.clear(); + onChildrenChanged(root_); + onDataChanged(root_); +} + void Roster::removeContact(const JID& jid) { std::vector<ContactRosterItem*>* items = &itemMap_[fullJIDMapping_ ? jid : jid.toBare()]; items->erase(std::remove_if(items->begin(), items->end(), JIDEqualsTo(jid)), items->end()); diff --git a/Swiften/Roster/Roster.h b/Swiften/Roster/Roster.h index 346157e..d54a12e 100644 --- a/Swiften/Roster/Roster.h +++ b/Swiften/Roster/Roster.h @@ -31,6 +31,7 @@ class Roster { void addContact(const JID& jid, const JID& displayJID, const String& name, const String& group); void removeContact(const JID& jid); void removeContactFromGroup(const JID& jid, const String& group); + void removeAll(); void applyOnItems(const RosterItemOperation& operation); void applyOnAllItems(const RosterItemOperation& operation); void applyOnItem(const RosterItemOperation& operation, const JID& jid); |