1 files changed, 1 insertions, 3 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamProxyFinder.cpp b/Swiften/FileTransfer/SOCKS5BytestreamProxyFinder.cpp
index 9624d4c..90c42dd 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamProxyFinder.cpp
+++ b/Swiften/FileTransfer/SOCKS5BytestreamProxyFinder.cpp
@@ -1,72 +1,70 @@
 /*
  * 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/FileTransfer/SOCKS5BytestreamProxyFinder.h>
 
 #include <memory>
 
 #include <boost/bind.hpp>
 
 #include <Swiften/Base/Log.h>
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Elements/S5BProxyRequest.h>
 #include <Swiften/Queries/GenericRequest.h>
 #include <Swiften/Queries/IQRouter.h>
 
 namespace Swift {
 
 SOCKS5BytestreamProxyFinder::SOCKS5BytestreamProxyFinder(const JID& service, IQRouter *iqRouter) : service(service), iqRouter(iqRouter) {
 }
 
 SOCKS5BytestreamProxyFinder::~SOCKS5BytestreamProxyFinder() {
 }
 
 void SOCKS5BytestreamProxyFinder::start() {
     serviceWalker = std::make_shared<DiscoServiceWalker>(service, iqRouter);
     serviceWalker->onServiceFound.connect(boost::bind(&SOCKS5BytestreamProxyFinder::handleServiceFound, this, _1, _2));
     serviceWalker->onWalkComplete.connect(boost::bind(&SOCKS5BytestreamProxyFinder::handleWalkEnded, this));
     serviceWalker->beginWalk();
 }
 
 void SOCKS5BytestreamProxyFinder::stop() {
-    typedef std::shared_ptr<GenericRequest<S5BProxyRequest> > S5BProxyRequestGenericRequest;
-    foreach (S5BProxyRequestGenericRequest requester, pendingRequests) {
+    for (auto&& requester : pendingRequests) {
         requester->onResponse.disconnect(boost::bind(&SOCKS5BytestreamProxyFinder::handleProxyResponse, this, requester, _1, _2));
     }
 
     serviceWalker->endWalk();
     serviceWalker->onServiceFound.disconnect(boost::bind(&SOCKS5BytestreamProxyFinder::handleServiceFound, this, _1, _2));
     serviceWalker->onWalkComplete.disconnect(boost::bind(&SOCKS5BytestreamProxyFinder::handleWalkEnded, this));
     serviceWalker.reset();
 }
 
 void SOCKS5BytestreamProxyFinder::sendBytestreamQuery(const JID& jid) {
     S5BProxyRequest::ref proxyRequest = std::make_shared<S5BProxyRequest>();
     std::shared_ptr<GenericRequest<S5BProxyRequest> > request = std::make_shared<GenericRequest<S5BProxyRequest> >(IQ::Get, jid, proxyRequest, iqRouter);
     request->onResponse.connect(boost::bind(&SOCKS5BytestreamProxyFinder::handleProxyResponse, this, request, _1, _2));
     pendingRequests.insert(request);
     request->send();
 }
 
 void SOCKS5BytestreamProxyFinder::handleServiceFound(const JID& jid, std::shared_ptr<DiscoInfo> discoInfo) {
     if (discoInfo->hasFeature(DiscoInfo::Bytestream)) {
         sendBytestreamQuery(jid);
     }
 }
 
 void SOCKS5BytestreamProxyFinder::handleWalkEnded() {
     if (pendingRequests.empty()) {
         onProxiesFound(proxyHosts);
     }
 }
 
 void SOCKS5BytestreamProxyFinder::handleProxyResponse(std::shared_ptr<GenericRequest<S5BProxyRequest> > requester, std::shared_ptr<S5BProxyRequest> request, ErrorPayload::ref error) {