summaryrefslogtreecommitdiffstats
path: root/accounts
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-01-12 12:54:14 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-01-12 12:54:14 +0100
commit859f30d21532644c3b90e79f6686aa7375046087 (patch)
treed01790bfed07916ccada9193650f56127cb3e715 /accounts
parent654092d41253ff993095b845a6c3e338a563547e (diff)
downloadkube-859f30d21532644c3b90e79f6686aa7375046087.tar.gz
kube-859f30d21532644c3b90e79f6686aa7375046087.zip
syncThen is no longer necessary.
Diffstat (limited to 'accounts')
-rw-r--r--accounts/imap/tests/settingstest.cpp4
-rw-r--r--accounts/maildir/maildircontroller.cpp2
-rw-r--r--accounts/maildir/tests/settingstest.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/accounts/imap/tests/settingstest.cpp b/accounts/imap/tests/settingstest.cpp
index 2fbc9b7b..69d93079 100644
--- a/accounts/imap/tests/settingstest.cpp
+++ b/accounts/imap/tests/settingstest.cpp
@@ -43,7 +43,7 @@ private slots:
43 settings.setProperty("emailAddress", emailAddress); 43 settings.setProperty("emailAddress", emailAddress);
44 settings.save(); 44 settings.save();
45 45
46 Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).syncThen<void, QList<Sink::ApplicationDomain::SinkResource::Ptr>>([](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) { 46 Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).then([](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
47 QCOMPARE(resources.size(), 2); 47 QCOMPARE(resources.size(), 2);
48 }) 48 })
49 .exec().waitForFinished(); 49 .exec().waitForFinished();
@@ -76,7 +76,7 @@ private slots:
76 settings.remove(); 76 settings.remove();
77 } 77 }
78 78
79 Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).syncThen<void, QList<Sink::ApplicationDomain::SinkResource::Ptr>>([](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) { 79 Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).then([](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
80 QCOMPARE(resources.size(), 0); 80 QCOMPARE(resources.size(), 0);
81 }) 81 })
82 .exec().waitForFinished(); 82 .exec().waitForFinished();
diff --git a/accounts/maildir/maildircontroller.cpp b/accounts/maildir/maildircontroller.cpp
index dc34d59a..fa211284 100644
--- a/accounts/maildir/maildircontroller.cpp
+++ b/accounts/maildir/maildircontroller.cpp
@@ -85,7 +85,7 @@ void MaildirController::loadAccount(const QByteArray &id)
85{ 85{
86 Q_ASSERT(!mAccountIdentifier.isEmpty()); 86 Q_ASSERT(!mAccountIdentifier.isEmpty());
87 Store::fetchOne<SinkAccount>(Query().filter(mAccountIdentifier)) 87 Store::fetchOne<SinkAccount>(Query().filter(mAccountIdentifier))
88 .syncThen<void, SinkAccount>([this](const SinkAccount &account) { 88 .then([this](const SinkAccount &account) {
89 mIcon = account.getIcon(); 89 mIcon = account.getIcon();
90 mName = account.getName(); 90 mName = account.getName();
91 emit nameChanged(); 91 emit nameChanged();
diff --git a/accounts/maildir/tests/settingstest.cpp b/accounts/maildir/tests/settingstest.cpp
index 47cb3b35..bf041e3c 100644
--- a/accounts/maildir/tests/settingstest.cpp
+++ b/accounts/maildir/tests/settingstest.cpp
@@ -39,7 +39,7 @@ private slots:
39 settings.setProperty("emailAddress", emailAddress); 39 settings.setProperty("emailAddress", emailAddress);
40 settings.save(); 40 settings.save();
41 41
42 Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).syncThen<void, QList<Sink::ApplicationDomain::SinkResource::Ptr>>([](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) { 42 Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).then([](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
43 QCOMPARE(resources.size(), 2); 43 QCOMPARE(resources.size(), 2);
44 }) 44 })
45 .exec().waitForFinished(); 45 .exec().waitForFinished();
@@ -70,7 +70,7 @@ private slots:
70 settings.remove(); 70 settings.remove();
71 } 71 }
72 72
73 Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).syncThen<void, QList<Sink::ApplicationDomain::SinkResource::Ptr>>([](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) { 73 Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).then([](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
74 QCOMPARE(resources.size(), 0); 74 QCOMPARE(resources.size(), 0);
75 }) 75 })
76 .exec().waitForFinished(); 76 .exec().waitForFinished();