2 files changed, 8 insertions, 15 deletions
diff --git a/Swift/Controllers/ContactSuggester.cpp b/Swift/Controllers/ContactSuggester.cpp
index eb27ed4..4b621db 100644
--- a/Swift/Controllers/ContactSuggester.cpp
+++ b/Swift/Controllers/ContactSuggester.cpp
@@ -7,3 +7,3 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2018 Isode Limited.
  * All rights reserved.
@@ -21,4 +21,2 @@
 #include <boost/bind.hpp>
-#include <boost/lambda/bind.hpp>
-#include <boost/lambda/lambda.hpp>
 
@@ -29,4 +27,2 @@
 
-namespace lambda = boost::lambda;
-
 namespace Swift {
@@ -62,4 +58,5 @@ std::vector<Contact::ref> ContactSuggester::getSuggestions(const std::string& se
     results.erase(std::unique(results.begin(), results.end(), Contact::equalityPredicate), results.end());
-    results.erase(std::remove_if(results.begin(), results.end(), !lambda::bind(&matchContact, search, lambda::_1)),
-        results.end());
+    results.erase(std::remove_if(results.begin(), results.end(), [&](const Contact::ref contact) {
+        return !matchContact(search, contact);
+    }), results.end());
     std::sort(results.begin(), results.end(), boost::bind(&Contact::sortPredicate, _1, _2, search));
diff --git a/Swift/QtUI/QtStatusWidget.cpp b/Swift/QtUI/QtStatusWidget.cpp
index b175e5c..5e2ba5f 100644
--- a/Swift/QtUI/QtStatusWidget.cpp
+++ b/Swift/QtUI/QtStatusWidget.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
@@ -10,5 +10,2 @@
 
-#include <boost/lambda/bind.hpp>
-#include <boost/lambda/lambda.hpp>
-
 #include <QApplication>
@@ -34,4 +31,2 @@
 
-namespace lambda = boost::lambda;
-
 namespace Swift {
@@ -155,4 +150,5 @@ void QtStatusWidget::generateList() {
     for (const auto& savedStatus : previousStatuses) {
-        if (savedStatus.first.empty() || std::find_if(allTypes_.begin(), allTypes_.end(),
-                    savedStatus.second == lambda::_1 && savedStatus.first == lambda::bind(&statusShowTypeToFriendlyName, lambda::_1)) != allTypes_.end()) {
+        if (savedStatus.first.empty() || std::find_if(allTypes_.begin(), allTypes_.end(), [&](StatusShow::Type type) {
+            return (savedStatus.second == type) && (savedStatus.first == statusShowTypeToFriendlyName(type));
+            }) != allTypes_.end()) {
             continue;