1 files changed, 1 insertions, 2 deletions
diff --git a/Swiften/FileTransfer/JingleFileTransfer.cpp b/Swiften/FileTransfer/JingleFileTransfer.cpp
index 36725de..62c3a53 100644
--- a/Swiften/FileTransfer/JingleFileTransfer.cpp
+++ b/Swiften/FileTransfer/JingleFileTransfer.cpp
@@ -1,72 +1,71 @@
 /*
  * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/FileTransfer/JingleFileTransfer.h>
 
 #include <boost/typeof/typeof.hpp>
 
 #include <Swiften/Base/Log.h>
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/FileTransfer/FileTransferTransporter.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Jingle/JingleSession.h>
 #include <Swiften/StringCodecs/Hexify.h>
 
 using namespace Swift;
 
 JingleFileTransfer::JingleFileTransfer(
         std::shared_ptr<JingleSession> session,
         const JID& target,
         FileTransferTransporterFactory* transporterFactory) :
             session(session),
             target(target),
             transporterFactory(transporterFactory),
             transporter(nullptr),
             ourCandidateSelectFinished(false),
             theirCandidateSelectFinished(false) {
 
     session->addListener(this);
 
 }
 
 JingleFileTransfer::~JingleFileTransfer() {
     session->removeListener(this);
 }
 
 void JingleFileTransfer::fillCandidateMap(CandidateMap& map, const std::vector<JingleS5BTransportPayload::Candidate>& candidates) {
     map.clear();
-    foreach (JingleS5BTransportPayload::Candidate candidate, candidates) {
+    for (auto&& candidate : candidates) {
         map[candidate.cid] = candidate;
     }
 }
 
 /*
 std::string JingleFileTransfer::getS5BDstAddr(const JID& requester, const JID& target) const {
     return Hexify::hexify(crypto->getSHA1Hash(
                 createSafeByteArray(s5bSessionID + requester.toString() + target.toString())));
 }
 */
 
 const JID& JingleFileTransfer::getInitiator() const {
     return session->getInitiator();
 }
 
 const JID& JingleFileTransfer::getResponder() const {
     return target;
 }
 
 FileTransfer::State::Type JingleFileTransfer::getExternalFinishedState(JinglePayload::Reason::Type reason) {
     if (reason == JinglePayload::Reason::Cancel || reason == JinglePayload::Reason::Decline) {
         return FileTransfer::State::Canceled;
     }
     else if (reason == JinglePayload::Reason::Success) {
         return FileTransfer::State::Finished;
     }
     else {
         return FileTransfer::State::Failed;
     }
 }