1 files changed, 2 insertions, 6 deletions
diff --git a/Swift/Controllers/Roster/Roster.cpp b/Swift/Controllers/Roster/Roster.cpp
index 68297a4..9c9b9e3 100644
--- a/Swift/Controllers/Roster/Roster.cpp
+++ b/Swift/Controllers/Roster/Roster.cpp
@@ -1,38 +1,39 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/Roster/Roster.h>
 
+#include <algorithm>
 #include <deque>
 #include <memory>
 #include <set>
 #include <string>
 
 #include <boost/bind.hpp>
 
 #include <Swiften/JID/JID.h>
 
 #include <Swift/Controllers/Roster/ContactRosterItem.h>
 #include <Swift/Controllers/Roster/GroupRosterItem.h>
 #include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
 #include <Swift/Controllers/Roster/RosterItem.h>
 
 namespace Swift {
 
 Roster::Roster(bool sortByStatus, bool fullJIDMapping) : fullJIDMapping_(fullJIDMapping), sortByStatus_(sortByStatus), root_(std::unique_ptr<GroupRosterItem>(new GroupRosterItem("Dummy-Root", nullptr, sortByStatus_))) {
     root_->onChildrenChanged.connect(boost::bind(&Roster::handleChildrenChanged, this, root_.get()));
 }
 
 Roster::~Roster() {
     std::deque<RosterItem*> queue;
     while (!queue.empty()) {
         RosterItem* item = *queue.begin();
         queue.pop_front();
         GroupRosterItem* group = dynamic_cast<GroupRosterItem*>(item);
         if (group) {
             queue.insert(queue.begin(), group->getChildren().begin(), group->getChildren().end());
         }
         ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
@@ -195,66 +196,61 @@ void Roster::applyOnItem(const RosterItemOperation& operation, const JID& jid) {
         return;
     }
     for (auto* item : i->second) {
         operation(item);
         filterContact(item, item->getParent());
     }
 }
 
 void Roster::applyOnAllItems(const RosterItemOperation& operation) {
     std::deque<RosterItem*> queue;
     queue.push_back(root_.get());
     while (!queue.empty()) {
         RosterItem* item = *queue.begin();
         queue.pop_front();
         operation(item);
         GroupRosterItem* group = dynamic_cast<GroupRosterItem*>(item);
         if (group) {
             queue.insert(queue.begin(), group->getChildren().begin(), group->getChildren().end());
         }
     }
     filterAll();
 }
 
 void Roster::addFilter(RosterFilter* filter) {
     filters_.push_back(filter);
     filterAll();
     onFilterAdded(filter);
 }
 
 void Roster::removeFilter(RosterFilter* filter) {
-    for (unsigned int i = 0; i < filters_.size(); i++) {
-        if (filters_[i] == filter) {
-            filters_.erase(filters_.begin() + i);
-            break;
-        }
-    }
+    filters_.erase(std::remove(filters_.begin(), filters_.end(), filter), filters_.end());
     filterAll();
     onFilterRemoved(filter);
 }
 
 void Roster::filterContact(ContactRosterItem* contact, GroupRosterItem* group) {
     size_t oldDisplayedSize = group->getDisplayedChildren().size();
     bool hide = true;
     for (auto* filter : filters_) {
         hide &= (*filter)(contact);
     }
     group->setDisplayed(contact, filters_.empty() || !hide);
     size_t newDisplayedSize = group->getDisplayedChildren().size();
     if (oldDisplayedSize == 0 && newDisplayedSize > 0) {
         onGroupAdded(group);
     }
 }
 
 void Roster::filterGroup(GroupRosterItem* group) {
     for (auto* child : group->getChildren()) {
         ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(child);
         if (contact) {
             filterContact(contact, group);
         }
     }
 }
 
 void Roster::filterAll() {
     std::deque<RosterItem*> queue;
     queue.push_back(root_.get());
     while (!queue.empty()) {