1 files changed, 1 insertions, 2 deletions
diff --git a/Swiften/Client/UnitTest/ClientBlockListManagerTest.cpp b/Swiften/Client/UnitTest/ClientBlockListManagerTest.cpp
index aaf99e0..5d22cac 100644
--- a/Swiften/Client/UnitTest/ClientBlockListManagerTest.cpp
+++ b/Swiften/Client/UnitTest/ClientBlockListManagerTest.cpp
@@ -1,48 +1,47 @@
 /*
  * Copyright (c) 2013 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
  * Copyright (c) 2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <algorithm>
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Client/ClientBlockListManager.h>
 #include <Swiften/Client/DummyStanzaChannel.h>
 #include <Swiften/Client/StanzaChannel.h>
 #include <Swiften/Elements/IQ.h>
 #include <Swiften/Queries/IQRouter.h>
 
 using namespace Swift;
 
 class ClientBlockListManagerTest : public CppUnit::TestFixture {
         CPPUNIT_TEST_SUITE(ClientBlockListManagerTest);
         CPPUNIT_TEST(testFetchBlockList);
         CPPUNIT_TEST(testBlockCommand);
         CPPUNIT_TEST(testUnblockCommand);
         CPPUNIT_TEST(testUnblockAllCommand);
         CPPUNIT_TEST_SUITE_END();
 
     public:
         void setUp() {
             ownJID_ = JID("kev@wonderland.lit");
             stanzaChannel_ = new DummyStanzaChannel();
             iqRouter_ = new IQRouter(stanzaChannel_);
             iqRouter_->setJID(ownJID_);
             clientBlockListManager_ = new ClientBlockListManager(iqRouter_);
         }
 
         void testFetchBlockList() {
             std::vector<JID> blockJids;
             blockJids.push_back(JID("romeo@montague.net"));
             blockJids.push_back(JID("iago@shakespeare.lit"));
             helperInitialBlockListFetch(blockJids);
@@ -144,52 +143,52 @@ class ClientBlockListManagerTest : public CppUnit::TestFixture {
             std::shared_ptr<UnblockPayload> pushPayload = std::make_shared<UnblockPayload>();
             IQ::ref unblockPush = IQ::createRequest(IQ::Set, ownJID_, "push1", pushPayload);
             stanzaChannel_->sendIQ(unblockPush);
             stanzaChannel_->onIQReceived(unblockPush);
 
             CPPUNIT_ASSERT_EQUAL(true, clientBlockListManager_->getBlockList()->getItems().empty());
         }
 
         void tearDown() {
             delete clientBlockListManager_;
             delete iqRouter_;
             delete stanzaChannel_;
         }
 
     private:
         void helperInitialBlockListFetch(const std::vector<JID>& blockedJids) {
             std::shared_ptr<BlockList> blockList = clientBlockListManager_->requestBlockList();
             CPPUNIT_ASSERT(blockList);
 
             // check for IQ request
             IQ::ref request = stanzaChannel_->getStanzaAtIndex<IQ>(0);
             CPPUNIT_ASSERT(request.get() != nullptr);
             std::shared_ptr<BlockListPayload> requestPayload = request->getPayload<BlockListPayload>();
             CPPUNIT_ASSERT(requestPayload.get() != nullptr);
 
             CPPUNIT_ASSERT_EQUAL(BlockList::Requesting, blockList->getState());
             CPPUNIT_ASSERT_EQUAL(BlockList::Requesting, clientBlockListManager_->getBlockList()->getState());
 
             // build IQ response
             std::shared_ptr<BlockListPayload> responsePayload = std::make_shared<BlockListPayload>();
-            foreach(const JID& jid, blockedJids) {
+            for (const auto& jid : blockedJids) {
                 responsePayload->addItem(jid);
             }
 
             IQ::ref response = IQ::createResult(ownJID_, JID(), request->getID(), responsePayload);
             stanzaChannel_->sendIQ(response);
             stanzaChannel_->onIQReceived(response);
 
             CPPUNIT_ASSERT_EQUAL(BlockList::Available, clientBlockListManager_->getBlockList()->getState());
             CPPUNIT_ASSERT(responsePayload->getItems() == clientBlockListManager_->getBlockList()->getItems());
         }
 
 
     private:
         JID ownJID_;
         IQRouter* iqRouter_;
         DummyStanzaChannel* stanzaChannel_;
         ClientBlockListManager* clientBlockListManager_;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ClientBlockListManagerTest);