diff --git a/src/akonadi/akonadidatasourcequeries.cpp b/src/akonadi/akonadidatasourcequeries.cpp
--- a/src/akonadi/akonadidatasourcequeries.cpp
+++ b/src/akonadi/akonadidatasourcequeries.cpp
@@ -96,7 +96,7 @@
 
 DataSourceQueries::CollectionInputQuery::PredicateFunction DataSourceQueries::createFetchPredicate(const Collection &root) const
 {
-    return [this, root] (const Collection &collection) {
+    return [root] (const Collection &collection) {
         return collection.isValid()
             && collection.parentCollection() == root;
     };
diff --git a/src/akonadi/akonadistorage.cpp b/src/akonadi/akonadistorage.cpp
--- a/src/akonadi/akonadistorage.cpp
+++ b/src/akonadi/akonadistorage.cpp
@@ -82,7 +82,7 @@
             collections.erase(std::remove_if(collections.begin(), collections.end(),
                                              [allowedMimeTypes] (const Collection &collection) {
                                                 auto mimeTypes = collection.contentMimeTypes().toSet();
-                                                return mimeTypes.intersect(allowedMimeTypes).isEmpty();
+                                                return !mimeTypes.intersects(allowedMimeTypes);
                                              }),
                               collections.end());
         }
diff --git a/src/domain/datasource.h b/src/domain/datasource.h
--- a/src/domain/datasource.h
+++ b/src/domain/datasource.h
@@ -36,7 +36,6 @@
 class DataSource : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(ContentType)
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(QString iconName READ iconName WRITE setIconName NOTIFY iconNameChanged)
     Q_PROPERTY(Domain::DataSource::ContentTypes contentTypes READ contentTypes WRITE setContentTypes NOTIFY contentTypesChanged)
@@ -49,6 +48,7 @@
         NoContent = 0,
         Tasks,
     };
+    Q_ENUM(ContentType)
     Q_DECLARE_FLAGS(ContentTypes, ContentType)
 
     explicit DataSource(QObject *parent = nullptr);
diff --git a/src/presentation/availablepagessortfilterproxymodel.h b/src/presentation/availablepagessortfilterproxymodel.h
--- a/src/presentation/availablepagessortfilterproxymodel.h
+++ b/src/presentation/availablepagessortfilterproxymodel.h
@@ -32,7 +32,6 @@
 class AvailablePagesSortFilterProxyModel : public QSortFilterProxyModel
 {
     Q_OBJECT
-    Q_ENUMS(SortType)
 public:
     explicit AvailablePagesSortFilterProxyModel(QObject *parent = 0);
 
diff --git a/src/presentation/taskfilterproxymodel.h b/src/presentation/taskfilterproxymodel.h
--- a/src/presentation/taskfilterproxymodel.h
+++ b/src/presentation/taskfilterproxymodel.h
@@ -32,12 +32,12 @@
 class TaskFilterProxyModel : public QSortFilterProxyModel
 {
     Q_OBJECT
-    Q_ENUMS(SortType)
 public:
     enum SortType {
         TitleSort = 0,
         DateSort
     };
+    Q_ENUM(SortType)
 
     explicit TaskFilterProxyModel(QObject *parent = nullptr);
 
diff --git a/tests/units/domain/livequerytest.cpp b/tests/units/domain/livequerytest.cpp
--- a/tests/units/domain/livequerytest.cpp
+++ b/tests/units/domain/livequerytest.cpp
@@ -89,8 +89,8 @@
     {
         // GIVEN
         auto query = Domain::LiveQuery<QString, QObject*>();
-        query.setFetchFunction([this] (const Domain::LiveQueryInput<QString>::AddFunction &add) {
-            Utils::JobHandler::install(new FakeJob, [this, add] {
+        query.setFetchFunction([] (const Domain::LiveQueryInput<QString>::AddFunction &add) {
+            Utils::JobHandler::install(new FakeJob, [add] {
                 add(QStringLiteral("0"));
                 add(QStringLiteral("1"));
                 add(QString());
@@ -131,16 +131,16 @@
     {
         // GIVEN
         auto query = Domain::LiveQuery<QString, QObjectPtr>();
-        query.setFetchFunction([this] (const Domain::LiveQueryInput<QString>::AddFunction &add) {
-            Utils::JobHandler::install(new FakeJob, [this, add] {
+        query.setFetchFunction([] (const Domain::LiveQueryInput<QString>::AddFunction &add) {
+            Utils::JobHandler::install(new FakeJob, [add] {
                 add(QStringLiteral("0"));
                 add(QStringLiteral("1"));
                 add(QString());
                 add(QStringLiteral("a"));
                 add(QStringLiteral("2"));
             });
         });
-        query.setConvertFunction([this] (const QString &s) {
+        query.setConvertFunction([] (const QString &s) {
             bool ok = false;
             const int id = s.toInt(&ok);
             if (ok) {
diff --git a/tests/units/domain/liverelationshipquerytest.cpp b/tests/units/domain/liverelationshipquerytest.cpp
--- a/tests/units/domain/liverelationshipquerytest.cpp
+++ b/tests/units/domain/liverelationshipquerytest.cpp
@@ -107,8 +107,8 @@
     {
         // GIVEN
         auto query = Domain::LiveRelationshipQuery<QString, QObject*>();
-        query.setFetchFunction([this] (const Domain::LiveQueryInput<QString>::AddFunction &add) {
-            Utils::JobHandler::install(new FakeJob, [this, add] {
+        query.setFetchFunction([] (const Domain::LiveQueryInput<QString>::AddFunction &add) {
+            Utils::JobHandler::install(new FakeJob, [add] {
                 add(QStringLiteral("0"));
                 add(QStringLiteral("1"));
                 add(QString());
@@ -148,16 +148,16 @@
     {
         // GIVEN
         auto query = Domain::LiveRelationshipQuery<QString, QObjectPtr>();
-        query.setFetchFunction([this] (const Domain::LiveQueryInput<QString>::AddFunction &add) {
-            Utils::JobHandler::install(new FakeJob, [this, add] {
+        query.setFetchFunction([] (const Domain::LiveQueryInput<QString>::AddFunction &add) {
+            Utils::JobHandler::install(new FakeJob, [add] {
                 add(QStringLiteral("0"));
                 add(QStringLiteral("1"));
                 add(QString());
                 add(QStringLiteral("a"));
                 add(QStringLiteral("2"));
             });
         });
-        query.setConvertFunction([this] (const QString &s) {
+        query.setConvertFunction([] (const QString &s) {
             bool ok = false;
             const int id = s.toInt(&ok);
             if (ok) {
@@ -294,8 +294,8 @@
         QTRY_COMPARE(result->data(), expected);
 
         // WHEN
-        query.setFetchFunction([this] (const Domain::LiveRelationshipQuery<QObject*, QString>::AddFunction &add) {
-            Utils::JobHandler::install(new FakeJob, [this, add] {});
+        query.setFetchFunction([] (const Domain::LiveRelationshipQuery<QObject*, QString>::AddFunction &) {
+            Utils::JobHandler::install(new FakeJob, [] {});
         });
 
         // unrelated remove -> ignore
@@ -364,7 +364,7 @@
         // GIVEN
         Domain::LiveRelationshipQuery<QObject*, QPair<int, QString>> query;
         bool listingDone = false;
-        query.setFetchFunction([this, &listingDone] (const Domain::LiveRelationshipQuery<QObject*, QString>::AddFunction &add) {
+        query.setFetchFunction([&listingDone] (const Domain::LiveRelationshipQuery<QObject*, QString>::AddFunction &add) {
             Q_UNUSED(add);
             Utils::JobHandler::install(new FakeJob, [&listingDone] {
                 listingDone = true;
diff --git a/tests/units/presentation/taskfilterproxymodeltest.cpp b/tests/units/presentation/taskfilterproxymodeltest.cpp
--- a/tests/units/presentation/taskfilterproxymodeltest.cpp
+++ b/tests/units/presentation/taskfilterproxymodeltest.cpp
@@ -96,10 +96,10 @@
         // GIVEN
         QStandardItemModel input;
         const auto today = Utils::DateTime::currentDate();
-        input.appendRow(createTaskItem(QStringLiteral("1. past"), QStringLiteral(""), today.addDays(-1)));
-        input.appendRow(createTaskItem(QStringLiteral("2. present"), QStringLiteral(""), today));
-        input.appendRow(createTaskItem(QStringLiteral("3. future"), QStringLiteral(""), today.addDays(1)));
-        input.appendRow(createTaskItem(QStringLiteral("4. whatever"), QStringLiteral("")));
+        input.appendRow(createTaskItem(QStringLiteral("1. past"), QString(), today.addDays(-1)));
+        input.appendRow(createTaskItem(QStringLiteral("2. present"), QString(), today));
+        input.appendRow(createTaskItem(QStringLiteral("3. future"), QString(), today.addDays(1)));
+        input.appendRow(createTaskItem(QStringLiteral("4. whatever"), QString()));
 
         Presentation::TaskFilterProxyModel output;
         output.setSourceModel(&input);
diff --git a/tests/units/widgets/applicationcomponentstest.cpp b/tests/units/widgets/applicationcomponentstest.cpp
--- a/tests/units/widgets/applicationcomponentstest.cpp
+++ b/tests/units/widgets/applicationcomponentstest.cpp
@@ -692,18 +692,21 @@
 
         // availablePages view
         auto available = components.availablePagesView();
-        foreach (const auto &key,  available->globalActions().keys())
-            QCOMPARE(actions.value(key), available->globalActions().value(key));
+        auto availableGlobalActions = available->globalActions();
+        for (auto it = availableGlobalActions.cbegin(); it != availableGlobalActions.cend(); ++it)
+            QCOMPARE(actions.value(it.key()), it.value());
 
         // availableSources view
         auto availableSources = components.availableSourcesView();
-        foreach (const auto &key, availableSources->globalActions().keys())
-            QCOMPARE(actions.value(key), availableSources->globalActions().value(key));
+        auto availableSourcesGlobalActions = availableSources->globalActions();
+        for (auto it = availableSourcesGlobalActions.cbegin(); it != availableSourcesGlobalActions.cend(); ++it)
+            QCOMPARE(actions.value(it.key()), it.value());
 
         // page view
         auto page = components.pageView();
-        foreach (const auto &key, page->globalActions().keys())
-            QCOMPARE(actions.value(key), page->globalActions().value(key));
+        auto pageGlobalActions = page->globalActions();
+        for (auto it = pageGlobalActions.cbegin(); it != pageGlobalActions.cend(); ++it)
+            QCOMPARE(actions.value(it.key()), it.value());
 
         // application component own action
         auto moveAction = components.findChild<QAction*>(QStringLiteral("moveItemAction"));