2 files changed, 2 insertions, 3 deletions
diff --git a/Swift/QtUI/UserSearch/ContactListModel.cpp b/Swift/QtUI/UserSearch/ContactListModel.cpp
index 376d3b1..6ef85d7 100644
--- a/Swift/QtUI/UserSearch/ContactListModel.cpp
+++ b/Swift/QtUI/UserSearch/ContactListModel.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) 2014-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/UserSearch/ContactListModel.h>
 
 #include <QMimeData>
 
 #include <Swiften/Base/Path.h>
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Elements/StatusShow.h>
 
 #include <Swift/QtUI/QtResourceHelper.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
 
 namespace Swift {
 
 QDataStream& operator >>(QDataStream& in, StatusShow::Type& e){
     quint32 buffer;
     in >> buffer;
     switch(buffer) {
         case StatusShow::Online:
             e = StatusShow::Online;
             break;
         case StatusShow::Away:
             e = StatusShow::Away;
             break;
         case StatusShow::FFC:
             e = StatusShow::FFC;
             break;
         case StatusShow::XA:
             e = StatusShow::XA;
             break;
         case StatusShow::DND:
             e = StatusShow::DND;
             break;
         default:
             e = StatusShow::None;
             break;
     }
diff --git a/Swift/QtUI/UserSearch/QtContactListWidget.cpp b/Swift/QtUI/UserSearch/QtContactListWidget.cpp
index 1dbfc1f..73a8482 100644
--- a/Swift/QtUI/UserSearch/QtContactListWidget.cpp
+++ b/Swift/QtUI/UserSearch/QtContactListWidget.cpp
@@ -58,46 +58,46 @@ QtContactListWidget::QtContactListWidget(QWidget* parent, SettingsProvider* sett
 }
 
 QtContactListWidget::~QtContactListWidget() {
     delete contactListDelegate_;
     delete removableItemDelegate_;
     delete contactListModel_;
 }
 
 void QtContactListWidget::setList(const std::vector<Contact::ref>& list) {
     contactListModel_->setList(list);
 }
 
 std::vector<Contact::ref> QtContactListWidget::getList() const {
     return contactListModel_->getList();
 }
 
 Contact::ref QtContactListWidget::getContact(const size_t i) {
     return contactListModel_->getContact(i);
 }
 
 void QtContactListWidget::setMaximumNoOfContactsToOne(bool limited) {
     limited_ = limited;
 }
 
 bool QtContactListWidget::isFull() const {
     return limited_ && (getList().size() == 1);
 }
 
 void QtContactListWidget::updateContacts(const std::vector<Contact::ref>& contactUpdates) {
     std::vector<Contact::ref> contacts = contactListModel_->getList();
-    foreach(const Contact::ref& contactUpdate, contactUpdates) {
-        for(auto& contact : contacts) {
+    for (const auto& contactUpdate : contactUpdates) {
+        for (auto&& contact : contacts) {
             if (contactUpdate->jid == contact->jid) {
                 contact = contactUpdate;
                 break;
             }
         }
     }
     contactListModel_->setList(contacts);
 }
 
 void QtContactListWidget::handleSettingsChanged(const std::string&) {
     contactListDelegate_->setCompact(settings_->getSetting(QtUISettingConstants::COMPACT_ROSTER));
 }
 
 }