1 files changed, 5 insertions, 6 deletions
diff --git a/Swiften/Disco/CapsInfoGenerator.cpp b/Swiften/Disco/CapsInfoGenerator.cpp
index b4637c7..961ef43 100644
--- a/Swiften/Disco/CapsInfoGenerator.cpp
+++ b/Swiften/Disco/CapsInfoGenerator.cpp
@@ -1,64 +1,63 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Disco/CapsInfoGenerator.h>
 
 #include <algorithm>
 
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Elements/FormField.h>
 #include <Swiften/StringCodecs/Base64.h>
 
 namespace {
     bool compareFields(Swift::FormField::ref f1, Swift::FormField::ref f2) {
         return f1->getName() < f2->getName();
     }
 }
 
 namespace Swift {
 
 CapsInfoGenerator::CapsInfoGenerator(const std::string& node, CryptoProvider* crypto) : node_(node), crypto_(crypto) {
 }
 
 CapsInfo CapsInfoGenerator::generateCapsInfo(const DiscoInfo& discoInfo) const {
     std::string serializedCaps;
 
     std::vector<DiscoInfo::Identity> identities(discoInfo.getIdentities());
     std::sort(identities.begin(), identities.end());
-    foreach (const DiscoInfo::Identity& identity, identities) {
+    for (const auto& identity : identities) {
         serializedCaps += identity.getCategory() + "/" + identity.getType() + "/" + identity.getLanguage() + "/" + identity.getName() + "<";
     }
 
     std::vector<std::string> features(discoInfo.getFeatures());
     std::sort(features.begin(), features.end());
-    foreach (const std::string& feature, features) {
+    for (const auto& feature : features) {
         serializedCaps += feature + "<";
     }
 
-    foreach(Form::ref extension, discoInfo.getExtensions()) {
+    for (const auto& extension : discoInfo.getExtensions()) {
         serializedCaps += extension->getFormType() + "<";
         std::vector<FormField::ref> fields(extension->getFields());
         std::sort(fields.begin(), fields.end(), &compareFields);
-        foreach(FormField::ref field, fields) {
+        for (const auto& field : fields) {
             if (field->getName() == "FORM_TYPE") {
                 continue;
             }
             serializedCaps += field->getName() + "<";
             std::vector<std::string> values(field->getValues());
             std::sort(values.begin(), values.end());
-            foreach(const std::string& value, values) {
+            for (const auto& value : values) {
                 serializedCaps += value + "<";
             }
         }
     }
 
     std::string version(Base64::encode(crypto_->getSHA1Hash(createByteArray(serializedCaps))));
     return CapsInfo(node_, version, "sha-1");
 }
 
 }