5 files changed, 7 insertions, 16 deletions
diff --git a/Swiften/Elements/Form.cpp b/Swiften/Elements/Form.cpp
index f8414b2..dc4bd72 100644
--- a/Swiften/Elements/Form.cpp
+++ b/Swiften/Elements/Form.cpp
@@ -1,66 +1,64 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Elements/Form.h>
 
-#include <Swiften/Base/foreach.h>
-
 namespace Swift {
 
 std::string Form::getFormType() const {
     FormField::ref field = getField("FORM_TYPE");
     if (field && field->getType() == FormField::HiddenType) {
         return field->getValues().empty() ? "" : field->getValues()[0];
     }
     return "";
 }
 
 FormField::ref Form::getField(const std::string& name) const {
-    foreach(FormField::ref field, fields_) {
+    for (const auto& field : fields_) {
         if (field->getName() == name) {
             return field;
         }
     }
     return FormField::ref();
 }
 
 void Form::addReportedField(FormField::ref field) {
     reportedFields_.push_back(field);
 }
 
 const std::vector<FormField::ref>& Form::getReportedFields() const {
     return reportedFields_;
 }
 
 void Form::addItem(const Form::FormItem& item) {
     items_.push_back(item);
 }
 
 const std::vector<Form::FormItem>& Form::getItems() const {
     return items_;
 }
 
 void Form::clearEmptyTextFields() {
     std::vector<FormField::ref> populatedFields;
-    foreach (FormField::ref field, fields_) {
+    for (const auto& field : fields_) {
         if (field->getType() == FormField::TextSingleType) {
             if (!field->getTextSingleValue().empty()) {
                 populatedFields.push_back(field);
             }
         }
         else if (field->getType() == FormField::TextMultiType) {
             if (!field->getTextMultiValue().empty()) {
                 populatedFields.push_back(field);
             }
         }
         else {
             populatedFields.push_back(field);
         }
     }
     fields_ = populatedFields;
 }
 
 }
diff --git a/Swiften/Elements/RosterItemExchangePayload.cpp b/Swiften/Elements/RosterItemExchangePayload.cpp
index 1890811..79d0371 100644
--- a/Swiften/Elements/RosterItemExchangePayload.cpp
+++ b/Swiften/Elements/RosterItemExchangePayload.cpp
@@ -1,25 +1,23 @@
 /*
  * Copyright (c) 2011 Jan Kaluza
  * Licensed under the Simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
  * Copyright (c) 2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Elements/RosterItemExchangePayload.h>
 
-#include <Swiften/Base/foreach.h>
-
 namespace Swift {
 
 RosterItemExchangePayload::Item::Item(Action action) : action(action) {
 }
 
 RosterItemExchangePayload::RosterItemExchangePayload() {
 }
 
 }
diff --git a/Swiften/Elements/RosterPayload.cpp b/Swiften/Elements/RosterPayload.cpp
index b4be7d1..d745357 100644
--- a/Swiften/Elements/RosterPayload.cpp
+++ b/Swiften/Elements/RosterPayload.cpp
@@ -1,24 +1,22 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Elements/RosterPayload.h>
 
-#include <Swiften/Base/foreach.h>
-
 namespace Swift {
 
 boost::optional<RosterItemPayload> RosterPayload::getItem(const JID& jid) const {
-    foreach(const RosterItemPayload& item, items_) {
+    for (const auto& item : items_) {
         // FIXME: MSVC rejects this. Find out why.
         //if (item.getJID() == jid) {
         if (item.getJID().equals(jid, JID::WithResource)) {
             return boost::optional<RosterItemPayload>(item);
         }
     }
     return boost::optional<RosterItemPayload>();
 }
 
 }
diff --git a/Swiften/Elements/Stanza.cpp b/Swiften/Elements/Stanza.cpp
index f5a1b58..0ff6b3c 100644
--- a/Swiften/Elements/Stanza.cpp
+++ b/Swiften/Elements/Stanza.cpp
@@ -1,70 +1,69 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Elements/Stanza.h>
 
 #include <typeinfo>
 
 #include <boost/bind.hpp>
 
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Elements/Delay.h>
 
 namespace Swift {
 
 Stanza::Stanza() {
 }
 
 Stanza::~Stanza() {
     payloads_.clear();
 }
 
 void Stanza::updatePayload(std::shared_ptr<Payload> payload) {
-    foreach (std::shared_ptr<Payload>& i, payloads_) {
+    for (auto&& i : payloads_) {
         if (typeid(*i.get()) == typeid(*payload.get())) {
             i = payload;
             return;
         }
     }
     addPayload(payload);
 }
 
 static bool sameType(std::shared_ptr<Payload> a, std::shared_ptr<Payload> b) {
     return typeid(*a.get()) == typeid(*b.get());
 }
 
 void Stanza::removePayloadOfSameType(std::shared_ptr<Payload> payload) {
     payloads_.erase(std::remove_if(payloads_.begin(), payloads_.end(),
         boost::bind<bool>(&sameType, payload, _1)),
         payloads_.end());
 }
 
 std::shared_ptr<Payload> Stanza::getPayloadOfSameType(std::shared_ptr<Payload> payload) const {
-    foreach (const std::shared_ptr<Payload>& i, payloads_) {
+    for (const auto& i : payloads_) {
         if (typeid(*i.get()) == typeid(*payload.get())) {
             return i;
         }
     }
     return std::shared_ptr<Payload>();
 }
 
 boost::optional<boost::posix_time::ptime> Stanza::getTimestamp() const {
     std::shared_ptr<Delay> delay = getPayload<Delay>();
     return delay ? delay->getStamp() : boost::optional<boost::posix_time::ptime>();
 }
 
 boost::optional<boost::posix_time::ptime> Stanza::getTimestampFrom(const JID& jid) const {
     std::vector< std::shared_ptr<Delay> > delays = getPayloads<Delay>();
     for (auto& delay : delays) {
         if (delay->getFrom() == jid) {
             return delay->getStamp();
         }
     }
     return getTimestamp();
 }
 
 
 }
diff --git a/Swiften/Elements/VCard.cpp b/Swiften/Elements/VCard.cpp
index f541d06..571ead4 100644
--- a/Swiften/Elements/VCard.cpp
+++ b/Swiften/Elements/VCard.cpp
@@ -1,26 +1,24 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Elements/VCard.h>
 
-#include <Swiften/Base/foreach.h>
-
 namespace Swift {
 
 VCard::EMailAddress VCard::getPreferredEMailAddress() const {
-    foreach(const EMailAddress& address, emailAddresses_) {
+    for (const auto& address : emailAddresses_) {
         if (address.isPreferred) {
             return address;
         }
     }
     if (!emailAddresses_.empty()) {
         return emailAddresses_[0];
     }
     return EMailAddress();
 }
 
 
 }