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/domain/composercontroller.cpp       |  6 +++---
 framework/domain/identitiesmodel.cpp          |  2 +-
 framework/domain/settings/accountsettings.cpp | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'framework/domain')

diff --git a/framework/domain/composercontroller.cpp b/framework/domain/composercontroller.cpp
index 9fb2c6f8..f1c04ea9 100644
--- a/framework/domain/composercontroller.cpp
+++ b/framework/domain/composercontroller.cpp
@@ -123,7 +123,7 @@ void ComposerController::loadMessage(const QVariant &message, bool loadAsDraft)
 {
     Sink::Query query(*message.value<Sink::ApplicationDomain::Mail::Ptr>());
     query.request<Sink::ApplicationDomain::Mail::MimeMessage>();
-    Sink::Store::fetchOne<Sink::ApplicationDomain::Mail>(query).syncThen<void, Sink::ApplicationDomain::Mail>([this, loadAsDraft](const Sink::ApplicationDomain::Mail &mail) {
+    Sink::Store::fetchOne<Sink::ApplicationDomain::Mail>(query).then([this, loadAsDraft](const Sink::ApplicationDomain::Mail &mail) {
         setExistingMail(mail);
 
         //TODO this should probably happen as reaction to the property being set.
@@ -233,7 +233,7 @@ void ComposerController::send()
             }
             return KAsync::error<void>(0, "Failed to find a MailTransport resource.");
         })
-        .syncThen<void>([&] (const KAsync::Error &error) {
+        .then([&] (const KAsync::Error &error) {
             emit done();
         });
     run(job);
@@ -279,7 +279,7 @@ void ComposerController::saveAsDraft()
             return Store::modify(existingMail);
         }
     }();
-    job = job.syncThen<void>([&] {
+    job = job.then([&] {
         emit done();
     });
     run(job);
diff --git a/framework/domain/identitiesmodel.cpp b/framework/domain/identitiesmodel.cpp
index 33cc191c..49c08005 100644
--- a/framework/domain/identitiesmodel.cpp
+++ b/framework/domain/identitiesmodel.cpp
@@ -88,7 +88,7 @@ void IdentitiesModel::runQuery(const Sink::Query &query)
     setSourceModel(mModel.data());
 
     Sink::Store::fetchAll<Sink::ApplicationDomain::SinkAccount>(Sink::Query())
-        .syncThen<void, QList<Sink::ApplicationDomain::SinkAccount::Ptr> >([this](const QList<Sink::ApplicationDomain::SinkAccount::Ptr> &accounts) {
+        .then([this](const QList<Sink::ApplicationDomain::SinkAccount::Ptr> &accounts) {
             for (const auto &account : accounts) {
                 mAccountNames.insert(account->identifier(), account->getName());
                 mAccountIcons.insert(account->identifier(), account->getIcon());
diff --git a/framework/domain/settings/accountsettings.cpp b/framework/domain/settings/accountsettings.cpp
index 067d1d79..d7c8c1c0 100644
--- a/framework/domain/settings/accountsettings.cpp
+++ b/framework/domain/settings/accountsettings.cpp
@@ -152,7 +152,7 @@ void AccountSettings::loadAccount()
 {
     Q_ASSERT(!mAccountIdentifier.isEmpty());
     Store::fetchOne<SinkAccount>(Query().filter(mAccountIdentifier))
-        .syncThen<void, SinkAccount>([this](const SinkAccount &account) {
+        .then([this](const SinkAccount &account) {
             mIcon = account.getIcon();
             mName = account.getName();
             emit changed();
@@ -162,7 +162,7 @@ void AccountSettings::loadAccount()
 void AccountSettings::loadImapResource()
 {
     Store::fetchOne<SinkResource>(Query().filter<SinkResource::Account>(mAccountIdentifier).containsFilter<SinkResource::Capabilities>(ResourceCapabilities::Mail::storage))
-        .syncThen<void, SinkResource>([this](const SinkResource &resource) {
+        .then([this](const SinkResource &resource) {
             mImapIdentifier = resource.identifier();
             mImapServer = resource.getProperty("server").toString();
             mImapUsername = resource.getProperty("username").toString();
@@ -176,7 +176,7 @@ void AccountSettings::loadImapResource()
 void AccountSettings::loadMaildirResource()
 {
     Store::fetchOne<SinkResource>(Query().filter<SinkResource::Account>(mAccountIdentifier).containsFilter<SinkResource::Capabilities>(ResourceCapabilities::Mail::storage))
-        .syncThen<void, SinkResource>([this](const SinkResource &resource) {
+        .then([this](const SinkResource &resource) {
             mMaildirIdentifier = resource.identifier();
             auto path = resource.getProperty("path").toString();
             if (mPath != path) {
@@ -191,7 +191,7 @@ void AccountSettings::loadMaildirResource()
 void AccountSettings::loadMailtransportResource()
 {
     Store::fetchOne<SinkResource>(Query().filter<SinkResource::Account>(mAccountIdentifier).containsFilter<SinkResource::Capabilities>(ResourceCapabilities::Mail::transport))
-        .syncThen<void, SinkResource>([this](const SinkResource &resource) {
+        .then([this](const SinkResource &resource) {
             mMailtransportIdentifier = resource.identifier();
             mSmtpServer = resource.getProperty("server").toString();
             mSmtpUsername = resource.getProperty("username").toString();
@@ -206,7 +206,7 @@ void AccountSettings::loadIdentity()
 {
     //FIXME this assumes that we only ever have one identity per account
     Store::fetchOne<Identity>(Query().filter<Identity::Account>(mAccountIdentifier))
-        .syncThen<void, Identity>([this](const Identity &identity) {
+        .then([this](const Identity &identity) {
             mIdentityIdentifier = identity.identifier();
             mUsername = identity.getName();
             mEmailAddress = identity.getAddress();
-- 
cgit v1.2.3