1 files changed, 2 insertions, 3 deletions
diff --git a/Swiften/Chat/UnitTest/ChatStateNotifierTest.cpp b/Swiften/Chat/UnitTest/ChatStateNotifierTest.cpp
index 278068a..7eeb531 100644
--- a/Swiften/Chat/UnitTest/ChatStateNotifierTest.cpp
+++ b/Swiften/Chat/UnitTest/ChatStateNotifierTest.cpp
@@ -1,42 +1,41 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <boost/bind.hpp>
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Chat/ChatStateNotifier.h>
 #include <Swiften/Client/DummyStanzaChannel.h>
 #include <Swiften/Disco/DummyEntityCapsProvider.h>
 
 using namespace Swift;
 
 class ChatStateNotifierTest : public CppUnit::TestFixture {
     CPPUNIT_TEST_SUITE(ChatStateNotifierTest);
     CPPUNIT_TEST(testStartTypingReply_CapsNotIncluded);
     CPPUNIT_TEST(testStartTypingReply_CapsIncluded);
     CPPUNIT_TEST(testCancelledNewMessage);
     CPPUNIT_TEST(testContinueTypingReply_CapsIncluded);
     CPPUNIT_TEST(testTypeReplies_WentOffline);
     CPPUNIT_TEST(testContactShouldReceiveStates_CapsOnly);
     CPPUNIT_TEST(testContactShouldReceiveStates_CapsNorActive);
     CPPUNIT_TEST(testContactShouldReceiveStates_ActiveOverrideOn);
     CPPUNIT_TEST(testContactShouldReceiveStates_ActiveOverrideOff);
     CPPUNIT_TEST_SUITE_END();
 
 public:
     void setUp() {
         stanzaChannel = new DummyStanzaChannel();
         stanzaChannel->setAvailable(true);
         entityCapsProvider = new DummyEntityCapsProvider();
         notifier_ = new ChatStateNotifier(stanzaChannel, JID("foo@bar.com/baz"), entityCapsProvider);
         notifier_->setContactIsOnline(true);
     }
 
     void tearDown() {
         delete notifier_;
@@ -115,55 +114,55 @@ public:
         notifier_->setUserIsTyping();
         notifier_->setUserIsTyping();
         notifier_->setUserIsTyping();
         CPPUNIT_ASSERT_EQUAL(1, getComposingCount());
         notifier_->userSentMessage();
         notifier_->setUserIsTyping();
         CPPUNIT_ASSERT_EQUAL(2, getComposingCount());
 
     }
 
     void testTypeReplies_WentOffline() {
             setContactHas85Caps();
             notifier_->setUserIsTyping();
             CPPUNIT_ASSERT_EQUAL(1, getComposingCount());
             notifier_->setContactIsOnline(false);
             notifier_->userSentMessage();
             notifier_->setUserIsTyping();
             CPPUNIT_ASSERT_EQUAL(1, getComposingCount());
         }
 
     private:
         void setContactHas85Caps() {
             DiscoInfo::ref caps(new DiscoInfo());
             caps->addFeature(DiscoInfo::ChatStatesFeature);
             entityCapsProvider->caps[JID("foo@bar.com/baz")] = caps;
             entityCapsProvider->onCapsChanged(JID("foo@bar.com/baz"));
         }
 
         int getComposingCount() const {
             int result = 0;
-            foreach(std::shared_ptr<Stanza> stanza, stanzaChannel->sentStanzas) {
+            for (auto&& stanza : stanzaChannel->sentStanzas) {
                 if (stanza->getPayload<ChatState>() && stanza->getPayload<ChatState>()->getChatState() == ChatState::Composing) {
                     result++;
                 }
             }
             return result;
         }
 
         int getActiveCount() const {
             int result = 0;
-            foreach(std::shared_ptr<Stanza> stanza, stanzaChannel->sentStanzas) {
+            for (auto&& stanza : stanzaChannel->sentStanzas) {
                 if (stanza->getPayload<ChatState>() && stanza->getPayload<ChatState>()->getChatState() == ChatState::Active) {
                     result++;
                 }
             }
             return result;
         }
 
     private:
         DummyStanzaChannel* stanzaChannel;
         DummyEntityCapsProvider* entityCapsProvider;
         ChatStateNotifier* notifier_;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ChatStateNotifierTest);