summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-11-23 07:09:39 (GMT)
committerTobias Markmann <tm@ayena.de>2016-11-23 11:30:02 (GMT)
commite405ff3561be3d3c0bd79d7d5173923a8828cf02 (patch)
tree9118ef838ebfaec1df90ec24761944b5d833774c /Swiften/Queries/IQRouter.cpp
parent8a71b91be885652f37c5aab5e1ecf25af4599fbc (diff)
downloadswift-e405ff3561be3d3c0bd79d7d5173923a8828cf02.zip
swift-e405ff3561be3d3c0bd79d7d5173923a8828cf02.tar.bz2
Migrate remaining Swiften/Base/foreach.h use to range-based for loop
Test-Information: Build on macOS 10.12.1 and all tests pass. Change-Id: Iedaa3fa7e7672c77909fd0568bf30e9393cb87e0
Diffstat (limited to 'Swiften/Queries/IQRouter.cpp')
-rw-r--r--Swiften/Queries/IQRouter.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/Swiften/Queries/IQRouter.cpp b/Swiften/Queries/IQRouter.cpp
index e28c2f4..286b65f 100644
--- a/Swiften/Queries/IQRouter.cpp
+++ b/Swiften/Queries/IQRouter.cpp
@@ -1,86 +1,85 @@
/*
* Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swiften/Queries/IQRouter.h>
#include <boost/bind.hpp>
#include <Swiften/Base/Algorithm.h>
-#include <Swiften/Base/foreach.h>
#include <Swiften/Elements/ErrorPayload.h>
#include <Swiften/Queries/IQChannel.h>
#include <Swiften/Queries/IQHandler.h>
namespace Swift {
static void noop(IQHandler*) {}
IQRouter::IQRouter(IQChannel* channel) : channel_(channel), queueRemoves_(false) {
channel->onIQReceived.connect(boost::bind(&IQRouter::handleIQ, this, _1));
}
IQRouter::~IQRouter() {
channel_->onIQReceived.disconnect(boost::bind(&IQRouter::handleIQ, this, _1));
}
bool IQRouter::isAvailable() {
return channel_->isAvailable();
}
void IQRouter::handleIQ(std::shared_ptr<IQ> iq) {
queueRemoves_ = true;
bool handled = false;
// Go through the handlers in reverse order, to give precedence to the last added handler
std::vector<std::shared_ptr<IQHandler> >::const_reverse_iterator i = handlers_.rbegin();
std::vector<std::shared_ptr<IQHandler> >::const_reverse_iterator rend = handlers_.rend();
for (; i != rend; ++i) {
handled |= (*i)->handleIQ(iq);
if (handled) {
break;
}
}
if (!handled && (iq->getType() == IQ::Get || iq->getType() == IQ::Set) ) {
sendIQ(IQ::createError(iq->getFrom(), iq->getID(), ErrorPayload::FeatureNotImplemented, ErrorPayload::Cancel));
}
processPendingRemoves();
queueRemoves_ = false;
}
void IQRouter::processPendingRemoves() {
- foreach(std::shared_ptr<IQHandler> handler, queuedRemoves_) {
+ for (auto&& handler : queuedRemoves_) {
erase(handlers_, handler);
}
queuedRemoves_.clear();
}
void IQRouter::addHandler(IQHandler* handler) {
addHandler(std::shared_ptr<IQHandler>(handler, noop));
}
void IQRouter::removeHandler(IQHandler* handler) {
removeHandler(std::shared_ptr<IQHandler>(handler, noop));
}
void IQRouter::addHandler(std::shared_ptr<IQHandler> handler) {
handlers_.push_back(handler);
}
void IQRouter::removeHandler(std::shared_ptr<IQHandler> handler) {
if (queueRemoves_) {
queuedRemoves_.push_back(handler);
}
else {
erase(handlers_, handler);
}
}
void IQRouter::sendIQ(std::shared_ptr<IQ> iq) {
if (from_.isValid() && !iq->getFrom().isValid()) {
iq->setFrom(from_);
}