1 files changed, 3 insertions, 4 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/DiscoInfoSerializer.cpp b/Swiften/Serializer/PayloadSerializers/DiscoInfoSerializer.cpp
index 73e2585..06cad2b 100644
--- a/Swiften/Serializer/PayloadSerializers/DiscoInfoSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/DiscoInfoSerializer.cpp
@@ -1,47 +1,46 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Serializer/PayloadSerializers/DiscoInfoSerializer.h>
 
 #include <memory>
 
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Serializer/PayloadSerializers/FormSerializer.h>
 #include <Swiften/Serializer/XML/XMLElement.h>
 #include <Swiften/Serializer/XML/XMLRawTextNode.h>
 
 namespace Swift {
 
 DiscoInfoSerializer::DiscoInfoSerializer() : GenericPayloadSerializer<DiscoInfo>() {
 }
 
 std::string DiscoInfoSerializer::serializePayload(std::shared_ptr<DiscoInfo> discoInfo)  const {
     XMLElement queryElement("query", "http://jabber.org/protocol/disco#info");
     if (!discoInfo->getNode().empty()) {
         queryElement.setAttribute("node", discoInfo->getNode());
     }
-    foreach(const DiscoInfo::Identity& identity, discoInfo->getIdentities()) {
+    for (const auto& identity : discoInfo->getIdentities()) {
         std::shared_ptr<XMLElement> identityElement(new XMLElement("identity"));
         if (!identity.getLanguage().empty()) {
             identityElement->setAttribute("xml:lang", identity.getLanguage());
         }
         identityElement->setAttribute("category", identity.getCategory());
         identityElement->setAttribute("name", identity.getName());
         identityElement->setAttribute("type", identity.getType());
         queryElement.addNode(identityElement);
     }
-    foreach(const std::string& feature, discoInfo->getFeatures()) {
+    for (const auto& feature : discoInfo->getFeatures()) {
         std::shared_ptr<XMLElement> featureElement(new XMLElement("feature"));
         featureElement->setAttribute("var", feature);
         queryElement.addNode(featureElement);
     }
-    foreach(const Form::ref extension, discoInfo->getExtensions()) {
+    for (const auto& extension : discoInfo->getExtensions()) {
         queryElement.addNode(std::make_shared<XMLRawTextNode>(FormSerializer().serialize(extension)));
     }
     return queryElement.serialize();
 }
 
 }