From 859f30d21532644c3b90e79f6686aa7375046087 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 12 Jan 2017 12:54:14 +0100
Subject: syncThen is no longer necessary.

---
 framework/accounts/accountfactory.cpp     | 2 +-
 framework/accounts/gmailcontroller.cpp    | 2 +-
 framework/accounts/kolabnowcontroller.cpp | 2 +-
 framework/accounts/maildircontroller.cpp  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'framework/accounts')

diff --git a/framework/accounts/accountfactory.cpp b/framework/accounts/accountfactory.cpp
index 182a0a1d..c590e4b6 100644
--- a/framework/accounts/accountfactory.cpp
+++ b/framework/accounts/accountfactory.cpp
@@ -44,7 +44,7 @@ void AccountFactory::setAccountId(const QString &accountId)
 {
     mAccountId = accountId;
     Sink::Store::fetchOne<Sink::ApplicationDomain::SinkAccount>(Sink::Query().filter(accountId.toUtf8()))
-        .syncThen<void, Sink::ApplicationDomain::SinkAccount>([this](const Sink::ApplicationDomain::SinkAccount &account) {
+        .then([this](const Sink::ApplicationDomain::SinkAccount &account) {
             mAccountType = account.getProperty("type").toByteArray();
             loadPackage();
         }).exec();
diff --git a/framework/accounts/gmailcontroller.cpp b/framework/accounts/gmailcontroller.cpp
index bc644ae9..89877117 100644
--- a/framework/accounts/gmailcontroller.cpp
+++ b/framework/accounts/gmailcontroller.cpp
@@ -80,7 +80,7 @@ void GmailController::load(const QByteArray &id) {
     m_accountId = id;
 
     Store::fetchOne<SinkAccount>(Query().filter(m_accountId))
-    .syncThen<void, SinkAccount>([this](const SinkAccount &account) {
+    .then([this](const SinkAccount &account) {
         setName(account.getName());
     }).exec();
 
diff --git a/framework/accounts/kolabnowcontroller.cpp b/framework/accounts/kolabnowcontroller.cpp
index 94ca2e01..5968dc26 100644
--- a/framework/accounts/kolabnowcontroller.cpp
+++ b/framework/accounts/kolabnowcontroller.cpp
@@ -80,7 +80,7 @@ void KolabNowController::load(const QByteArray &id) {
     m_accountId = id;
 
     Store::fetchOne<SinkAccount>(Query().filter(m_accountId))
-    .syncThen<void, SinkAccount>([this](const SinkAccount &account) {
+    .then([this](const SinkAccount &account) {
         setName(account.getName());
     }).exec();
 
diff --git a/framework/accounts/maildircontroller.cpp b/framework/accounts/maildircontroller.cpp
index 481d43d8..c2e15eb8 100644
--- a/framework/accounts/maildircontroller.cpp
+++ b/framework/accounts/maildircontroller.cpp
@@ -65,13 +65,13 @@ void MaildirController::load(const QByteArray &id) {
     clear();
 
     Store::fetchOne<SinkAccount>(Query().filter(m_accountId))
-    .syncThen<void, SinkAccount>([this](const SinkAccount &account) {
+    .then([this](const SinkAccount &account) {
         setIcon(account.getIcon());
         setName(account.getName());
     }).exec();
 
     Store::fetchOne<SinkResource>(Query().filter<SinkResource::Account>(m_accountId).containsFilter<SinkResource::Capabilities>(ResourceCapabilities::Mail::storage))
-    .syncThen<void, SinkResource>([this](const SinkResource &resource) {
+    .then([this](const SinkResource &resource) {
         m_resourceId = resource.identifier();
         setPath(resource.getProperty("path").toString());
     }).exec();
-- 
cgit v1.2.3