1 files changed, 1 insertions, 2 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp b/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp
index 8b37929..aaac757 100644
--- a/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp
@@ -1,74 +1,73 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
  * Copyright (c) 2015-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.h>
 
 #include <memory>
 
 #include <Swiften/Base/Log.h>
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Elements/JingleContentPayload.h>
 #include <Swiften/Elements/JingleFileTransferDescription.h>
 #include <Swiften/Elements/JingleFileTransferHash.h>
 #include <Swiften/Elements/JingleIBBTransportPayload.h>
 #include <Swiften/Elements/JinglePayload.h>
 #include <Swiften/Serializer/PayloadSerializerCollection.h>
 #include <Swiften/Serializer/PayloadSerializers/JingleContentPayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/JingleFileTransferHashSerializer.h>
 #include <Swiften/Serializer/XML/XMLElement.h>
 #include <Swiften/Serializer/XML/XMLNode.h>
 #include <Swiften/Serializer/XML/XMLRawTextNode.h>
 
 namespace Swift {
 
 JinglePayloadSerializer::JinglePayloadSerializer(PayloadSerializerCollection* serializers) : serializers(serializers) {
 }
 
 std::string JinglePayloadSerializer::serializePayload(std::shared_ptr<JinglePayload> payload) const {
     XMLElement jinglePayload("jingle", "urn:xmpp:jingle:1");
     jinglePayload.setAttribute("action", actionToString(payload->getAction()));
     jinglePayload.setAttribute("initiator", payload->getInitiator());
     jinglePayload.setAttribute("sid", payload->getSessionID());
 
     std::vector<std::shared_ptr<Payload> > payloads = payload->getPayloads();
     if (!payloads.empty()) {
-        foreach(std::shared_ptr<Payload> subPayload, payloads) {
+        for (auto&& subPayload : payloads) {
             PayloadSerializer* serializer = serializers->getPayloadSerializer(subPayload);
             if (serializer) {
                 jinglePayload.addNode(std::make_shared<XMLRawTextNode>(serializer->serialize(subPayload)));
             }
         }
     }
 
     if (payload->getReason().is_initialized()) {
         std::shared_ptr<XMLElement> reason = std::make_shared<XMLElement>("reason");
         reason->addNode(std::make_shared<XMLElement>(reasonTypeToString(payload->getReason()->type)));
         if (!payload->getReason()->text.empty()) {
             reason->addNode(std::make_shared<XMLElement>("desc", "", payload->getReason()->text));
         }
         jinglePayload.addNode(reason);
     }
 
     return jinglePayload.serialize();
 }
 
 std::string JinglePayloadSerializer::actionToString(JinglePayload::Action action) const {
     switch(action) {
         case JinglePayload::ContentAccept:
             return "content-accept";
         case JinglePayload::ContentAdd:
             return "content-add";
         case JinglePayload::ContentModify:
             return "content-modify";
         case JinglePayload::ContentReject:
             return "content-reject";
         case JinglePayload::ContentRemove: