2 files changed, 32 insertions, 18 deletions
diff --git a/Swift/Controllers/Roster/Roster.cpp b/Swift/Controllers/Roster/Roster.cpp
index 83837b1..65cf4d2 100644
--- a/Swift/Controllers/Roster/Roster.cpp
+++ b/Swift/Controllers/Roster/Roster.cpp
@@ -56,23 +56,23 @@ GroupRosterItem* Roster::getGroup(const std::string& groupName) {
 	}
 	GroupRosterItem* group = new GroupRosterItem(groupName, root_, sortByStatus_);
 	root_->addChild(group);
 	group->onChildrenChanged.connect(boost::bind(&Roster::handleChildrenChanged, this, group));
 	group->onDataChanged.connect(boost::bind(&Roster::handleDataChanged, this, group));
 	return group;
 }
 
 void Roster::setAvailableFeatures(const JID& jid, const std::set<ContactRosterItem::Feature>& features) {
-	JID actualJID = fullJIDMapping_ ? jid : jid.toBare();
-	if (itemMap_[actualJID].empty()) {
+	ItemMap::const_iterator i = itemMap_.find(fullJIDMapping_ ? jid : jid.toBare());
+	if (i == itemMap_.end()) {
 		return;
 	}
-	foreach(ContactRosterItem* item, itemMap_[actualJID]) {
+	foreach(ContactRosterItem* item, i->second) {
 		item->setSupportedFeatures(features);
 	}
 }
 
 void Roster::removeGroup(const std::string& group) {
 	root_->removeGroupChild(group);
 }
 
 void Roster::handleDataChanged(RosterItem* item) {
@@ -82,84 +82,97 @@ void Roster::handleDataChanged(RosterItem* item) {
 void Roster::handleChildrenChanged(GroupRosterItem* item) {
 	onChildrenChanged(item);
 }
 
 void Roster::addContact(const JID& jid, const JID& displayJID, const std::string& name, const std::string& groupName, const std::string& avatarPath) {
 	GroupRosterItem* group(getGroup(groupName));
 	ContactRosterItem *item = new ContactRosterItem(jid, displayJID, name, group);	
 	item->setAvatarPath(avatarPath);
 	group->addChild(item);
-	if (itemMap_[fullJIDMapping_ ? jid : jid.toBare()].size() > 0) {
-		foreach (std::string existingGroup, itemMap_[fullJIDMapping_ ? jid : jid.toBare()][0]->getGroups()) {
+	ItemMap::iterator i = itemMap_.insert(std::make_pair(fullJIDMapping_ ? jid : jid.toBare(), std::vector<ContactRosterItem*>())).first;
+	if (!i->second.empty()) {
+		foreach (const std::string& existingGroup, i->second[0]->getGroups()) {
 			item->addGroup(existingGroup);
 		}
 	}
-	itemMap_[fullJIDMapping_ ? jid : jid.toBare()].push_back(item);
+	i->second.push_back(item);
 	item->onDataChanged.connect(boost::bind(&Roster::handleDataChanged, this, item));
 	filterContact(item, group);
 
-	foreach (ContactRosterItem* item, itemMap_[fullJIDMapping_ ? jid : jid.toBare()]) {
+	foreach (ContactRosterItem* item, i->second) {
 		item->addGroup(groupName);
 	}
 }
 
 struct JIDEqualsTo {
 	JIDEqualsTo(const JID& jid) : jid(jid) {}
 	bool operator()(ContactRosterItem* i) const { return jid == i->getJID(); }
 	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());
-	if (items->empty()) {
-		itemMap_.erase(fullJIDMapping_ ? jid : jid.toBare());
+	ItemMap::iterator item = itemMap_.find(fullJIDMapping_ ? jid : jid.toBare());
+	if (item != itemMap_.end()) {
+		std::vector<ContactRosterItem*>& items = item->second;
+		items.erase(std::remove_if(items.begin(), items.end(), JIDEqualsTo(jid)), items.end());
+		if (items.empty()) {
+			itemMap_.erase(item);
+		}
 	}
 	//Causes the delete
 	root_->removeChild(jid);
 }
 
 void Roster::removeContactFromGroup(const JID& jid, const std::string& groupName) {
 	std::vector<RosterItem*> children = root_->getChildren();
 	std::vector<RosterItem*>::iterator it = children.begin();
+	ItemMap::iterator itemIt = itemMap_.find(fullJIDMapping_ ? jid : jid.toBare());
 	while (it != children.end()) {
 		GroupRosterItem* group = dynamic_cast<GroupRosterItem*>(*it);
 		if (group && group->getDisplayName() == groupName) {
 			ContactRosterItem* deleted = group->removeChild(jid);
-			std::vector<ContactRosterItem*>* items = &itemMap_[fullJIDMapping_ ? jid : jid.toBare()];
-			items->erase(std::remove(items->begin(), items->end(), deleted), items->end());
+			if (itemIt != itemMap_.end()) {
+				std::vector<ContactRosterItem*>& items = itemIt->second;
+				items.erase(std::remove(items.begin(), items.end(), deleted), items.end());
+			}
 		}
 		++it;
 	}
-	foreach (ContactRosterItem* item, itemMap_[fullJIDMapping_ ? jid : jid.toBare()]) {
-		item->removeGroup(groupName);
+
+	if (itemIt != itemMap_.end()) {
+		foreach (ContactRosterItem* item, itemIt->second) {
+			item->removeGroup(groupName);
+		}
 	}
 }
 
 
 void Roster::applyOnItems(const RosterItemOperation& operation) {
 	if (operation.requiresLookup()) {
 		applyOnItem(operation, operation.lookupJID());
 	} else {
 		applyOnAllItems(operation);
 	}
 }
 
 void Roster::applyOnItem(const RosterItemOperation& operation, const JID& jid) {
-	
-	foreach (ContactRosterItem* item, itemMap_[fullJIDMapping_ ? jid : jid.toBare()]) {
+	ItemMap::iterator i = itemMap_.find(fullJIDMapping_ ? jid : jid.toBare());
+	if (i == itemMap_.end()) {
+		return;
+	}
+	foreach (ContactRosterItem* item, i->second) {
 		operation(item);
 		filterContact(item, item->getParent());
 	}
 }
 
 void Roster::applyOnAllItems(const RosterItemOperation& operation) {
 	std::deque<RosterItem*> queue;
 	queue.push_back(root_);
 	while (!queue.empty()) {
diff --git a/Swift/Controllers/Roster/Roster.h b/Swift/Controllers/Roster/Roster.h
index 2b4dd27..2fcfba5 100644
--- a/Swift/Controllers/Roster/Roster.h
+++ b/Swift/Controllers/Roster/Roster.h
@@ -48,15 +48,16 @@ class Roster {
 
 	private:
 		void handleDataChanged(RosterItem* item);
 		void handleChildrenChanged(GroupRosterItem* item);
 		void filterGroup(GroupRosterItem* item);
 		void filterContact(ContactRosterItem* contact, GroupRosterItem* group);
 		void filterAll();
 		GroupRosterItem* root_;
 		std::vector<RosterFilter*> filters_;
-		std::map<JID, std::vector<ContactRosterItem*> > itemMap_;
+		typedef std::map<JID, std::vector<ContactRosterItem*> > ItemMap;
+		ItemMap itemMap_;
 		bool fullJIDMapping_;
 		bool sortByStatus_;
 };
 
 }