1 files changed, 3 insertions, 5 deletions
diff --git a/Swiften/Roster/XMPPRosterImpl.cpp b/Swiften/Roster/XMPPRosterImpl.cpp
index 9a2ea7a..74f634f 100644
--- a/Swiften/Roster/XMPPRosterImpl.cpp
+++ b/Swiften/Roster/XMPPRosterImpl.cpp
@@ -1,40 +1,38 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Roster/XMPPRosterImpl.h>
 
-#include <Swiften/Base/foreach.h>
-
 namespace Swift {
 
 XMPPRosterImpl::XMPPRosterImpl() {
 }
 
 XMPPRosterImpl::~XMPPRosterImpl() {
 
 }
 
 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()) {
         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);
     }
     else {
         entries_.insert(std::make_pair(bareJID, XMPPRosterItem(jid, name, groups, subscription)));
         onJIDAdded(bareJID);
     }
 }
 
 void XMPPRosterImpl::removeContact(const JID& jid) {
     entries_.erase(JID(jid.toBare()));
     onJIDRemoved(jid);
 }
 
 void XMPPRosterImpl::clear() {
@@ -51,57 +49,57 @@ std::string XMPPRosterImpl::getNameForJID(const JID& jid) const {
     if (i != entries_.end()) {
         return i->second.getName();
     }
     else {
         return "";
     }
 }
 
 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<std::string>();
     }
 }
 
 RosterItemPayload::Subscription XMPPRosterImpl::getSubscriptionStateForJID(const JID& jid) {
     std::map<JID, XMPPRosterItem>::iterator i = entries_.find(jid.toBare());
     if (i != entries_.end()) {
         return i->second.getSubscription();
     }
     else {
         return RosterItemPayload::None;
     }
 }
 
 std::vector<XMPPRosterItem> XMPPRosterImpl::getItems() const {
     std::vector<XMPPRosterItem> result;
-    foreach(const RosterMap::value_type& entry, entries_) {
+    for (const auto& entry : entries_) {
         result.push_back(entry.second);
     }
     return result;
 }
 
 boost::optional<XMPPRosterItem> XMPPRosterImpl::getItem(const JID& jid) const {
     std::map<JID, XMPPRosterItem>::const_iterator i = entries_.find(jid.toBare());
     if (i != entries_.end()) {
         return i->second;
     }
     else {
         return boost::optional<XMPPRosterItem>();
     }
 }
 
 std::set<std::string> XMPPRosterImpl::getGroups() const {
     std::set<std::string> result;
-    foreach(const RosterMap::value_type& entry, entries_) {
+    for (const auto& entry : entries_) {
         std::vector<std::string> groups = entry.second.getGroups();
         result.insert(groups.begin(), groups.end());
     }
     return result;
 }
 
 }