1 files changed, 1 insertions, 4 deletions
diff --git a/Swift/Controllers/WhiteboardManager.cpp b/Swift/Controllers/WhiteboardManager.cpp
index fab5380..37fe8e3 100644
--- a/Swift/Controllers/WhiteboardManager.cpp
+++ b/Swift/Controllers/WhiteboardManager.cpp
@@ -1,69 +1,66 @@
 /*
  * Copyright (c) 2012 Mateusz Piękos
  * 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 <Swift/Controllers/WhiteboardManager.h>
 
 #include <boost/bind.hpp>
 
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Client/NickResolver.h>
 #include <Swiften/Client/StanzaChannel.h>
 #include <Swiften/Whiteboard/WhiteboardSessionManager.h>
 
 #include <Swift/Controllers/UIEvents/AcceptWhiteboardSessionUIEvent.h>
 #include <Swift/Controllers/UIEvents/CancelWhiteboardSessionUIEvent.h>
 #include <Swift/Controllers/UIEvents/RequestWhiteboardUIEvent.h>
 #include <Swift/Controllers/UIEvents/ShowWhiteboardUIEvent.h>
 
 namespace Swift {
-    typedef std::pair<JID, WhiteboardWindow*> JIDWhiteboardWindowPair;
-
     WhiteboardManager::WhiteboardManager(WhiteboardWindowFactory* whiteboardWindowFactory, UIEventStream* uiEventStream, NickResolver* nickResolver, WhiteboardSessionManager* whiteboardSessionManager) : whiteboardWindowFactory_(whiteboardWindowFactory), uiEventStream_(uiEventStream), nickResolver_(nickResolver), whiteboardSessionManager_(whiteboardSessionManager) {
 
 #ifdef SWIFT_EXPERIMENTAL_WB
         whiteboardSessionManager_->onSessionRequest.connect(boost::bind(&WhiteboardManager::handleIncomingSession, this, _1));
 #endif
         uiEventConnection_ = uiEventStream_->onUIEvent.connect(boost::bind(&WhiteboardManager::handleUIEvent, this, _1));
     }
 
     WhiteboardManager::~WhiteboardManager() {
-        foreach (JIDWhiteboardWindowPair whiteboardWindowPair, whiteboardWindows_) {
+        for (auto&& whiteboardWindowPair : whiteboardWindows_) {
             delete whiteboardWindowPair.second;
         }
     }
 
     WhiteboardWindow* WhiteboardManager::createNewWhiteboardWindow(const JID& contact, WhiteboardSession::ref session) {
         WhiteboardWindow *window = whiteboardWindowFactory_->createWhiteboardWindow(session);
         window->setName(nickResolver_->jidToNick(contact));
         whiteboardWindows_[contact.toBare()] = window;
         return window;
     }
 
     WhiteboardWindow* WhiteboardManager::findWhiteboardWindow(const JID& contact) {
         if (whiteboardWindows_.find(contact.toBare()) == whiteboardWindows_.end()) {
             return nullptr;
         }
         return whiteboardWindows_[contact.toBare()];
     }
 
     void WhiteboardManager::handleUIEvent(std::shared_ptr<UIEvent> event) {
         std::shared_ptr<RequestWhiteboardUIEvent> requestWhiteboardEvent = std::dynamic_pointer_cast<RequestWhiteboardUIEvent>(event);
         if (requestWhiteboardEvent) {
             requestSession(requestWhiteboardEvent->getContact());
         }
         std::shared_ptr<AcceptWhiteboardSessionUIEvent> sessionAcceptEvent = std::dynamic_pointer_cast<AcceptWhiteboardSessionUIEvent>(event);
         if (sessionAcceptEvent) {
             acceptSession(sessionAcceptEvent->getContact());
         }
         std::shared_ptr<CancelWhiteboardSessionUIEvent> sessionCancelEvent = std::dynamic_pointer_cast<CancelWhiteboardSessionUIEvent>(event);
         if (sessionCancelEvent) {
             cancelSession(sessionCancelEvent->getContact());