1 files changed, 4 insertions, 8 deletions
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,22 +1,19 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtStatusWidget.h>
 
 #include <algorithm>
 
-#include <boost/lambda/bind.hpp>
-#include <boost/lambda/lambda.hpp>
-
 #include <QApplication>
 #include <QBoxLayout>
 #include <QComboBox>
 #include <QDesktopWidget>
 #include <QFrame>
 #include <QLabel>
 #include <QListWidget>
 #include <QListWidgetItem>
 #include <QMovie>
@@ -26,20 +23,18 @@
 #include <qdebug.h>
 
 #include <Swift/Controllers/StatusCache.h>
 #include <Swift/Controllers/StatusUtil.h>
 
 #include <Swift/QtUI/QtElidingLabel.h>
 #include <Swift/QtUI/QtLineEdit.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
 
-namespace lambda = boost::lambda;
-
 namespace Swift {
 
 QtStatusWidget::QtStatusWidget(StatusCache* statusCache, QWidget *parent) : QWidget(parent), statusCache_(statusCache), editCursor_(Qt::IBeamCursor), viewCursor_(Qt::PointingHandCursor) {
     allTypes_.push_back(StatusShow::Online);
     allTypes_.push_back(StatusShow::FFC);
     allTypes_.push_back(StatusShow::Away);
     allTypes_.push_back(StatusShow::XA);
     allTypes_.push_back(StatusShow::DND);
     allTypes_.push_back(StatusShow::None);
@@ -147,20 +142,21 @@ void QtStatusWidget::generateList() {
     for (const auto& type : icons_.keys()) {
         QListWidgetItem* item = new QListWidgetItem(text == "" ? getNoMessage() : text, menu_);
         item->setIcon(icons_[type]);
         item->setToolTip(P2QSTRING(statusShowTypeToFriendlyName(type)) + ": " + item->text());
         item->setStatusTip(item->toolTip());
         item->setData(Qt::UserRole, QVariant(type));
     }
     std::vector<StatusCache::PreviousStatus> previousStatuses = statusCache_->getMatches(Q2PSTRING(text), 8);
     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;
         }
         QListWidgetItem* item = new QListWidgetItem(P2QSTRING(savedStatus.first), menu_);
         item->setIcon(icons_[savedStatus.second]);
         item->setToolTip(item->text());
         item->setStatusTip(item->toolTip());
         item->setData(Qt::UserRole, QVariant(savedStatus.second));
     }
     for (const auto& type : icons_.keys()) {