From 98e17d6a8ecd46a9d6956d81f781b05e940387e4 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 15 Sep 2016 11:58:26 +0200 Subject: Adapt to KAsync changes. --- framework/domain/settings/accountsettings.cpp | 88 +++++++++++++-------------- 1 file changed, 43 insertions(+), 45 deletions(-) (limited to 'framework/domain/settings/accountsettings.cpp') diff --git a/framework/domain/settings/accountsettings.cpp b/framework/domain/settings/accountsettings.cpp index cf348f39..9a3be059 100644 --- a/framework/domain/settings/accountsettings.cpp +++ b/framework/domain/settings/accountsettings.cpp @@ -135,18 +135,18 @@ void AccountSettings::saveAccount() account.setProperty("name", mName); account.setProperty("icon", mIcon); Q_ASSERT(!account.identifier().isEmpty()); - Sink::Store::modify(account).then([]() {}, - [](int errorCode, const QString &errorMessage) { - qWarning() << "Error while creating account: " << errorMessage; - }) - .exec(); + Sink::Store::modify(account) + .onError([](const KAsync::Error &error) { + qWarning() << "Error while creating account: " << error.errorMessage;; + }) + .exec(); } void AccountSettings::loadAccount() { Q_ASSERT(!mAccountIdentifier.isEmpty()); Sink::Store::fetchOne(Sink::Query::IdentityFilter(mAccountIdentifier)) - .then([this](const Sink::ApplicationDomain::SinkAccount &account) { + .syncThen([this](const Sink::ApplicationDomain::SinkAccount &account) { mIcon = account.getProperty("icon").toString(); mName = account.getProperty("name").toString(); emit changed(); @@ -156,46 +156,43 @@ void AccountSettings::loadAccount() void AccountSettings::loadImapResource() { Sink::Store::fetchOne(Sink::Query::AccountFilter(mAccountIdentifier) + Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::storage)) - .then([this](const Sink::ApplicationDomain::SinkResource &resource) { + .syncThen([this](const Sink::ApplicationDomain::SinkResource &resource) { mImapIdentifier = resource.identifier(); mImapServer = resource.getProperty("server").toString(); mImapUsername = resource.getProperty("username").toString(); mImapPassword = resource.getProperty("password").toString(); emit imapResourceChanged(); - }, - [](int errorCode, const QString &errorMessage) { - qWarning() << "Failed to find the imap resource: " << errorMessage; + }).onError([](const KAsync::Error &error) { + qWarning() << "Failed to find the imap resource: " << error.errorMessage; }).exec(); } void AccountSettings::loadMaildirResource() { Sink::Store::fetchOne(Sink::Query::AccountFilter(mAccountIdentifier) + Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::storage)) - .then([this](const Sink::ApplicationDomain::SinkResource &resource) { + .syncThen([this](const Sink::ApplicationDomain::SinkResource &resource) { mMaildirIdentifier = resource.identifier(); auto path = resource.getProperty("path").toString(); if (mPath != path) { mPath = path; emit pathChanged(); } - }, - [](int errorCode, const QString &errorMessage) { - qWarning() << "Failed to find the maildir resource: " << errorMessage; + }).onError([](const KAsync::Error &error) { + qWarning() << "Failed to find the maildir resource: " << error.errorMessage; }).exec(); } void AccountSettings::loadMailtransportResource() { Sink::Store::fetchOne(Sink::Query::AccountFilter(mAccountIdentifier) + Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::transport)) - .then([this](const Sink::ApplicationDomain::SinkResource &resource) { + .syncThen([this](const Sink::ApplicationDomain::SinkResource &resource) { mMailtransportIdentifier = resource.identifier(); mSmtpServer = resource.getProperty("server").toString(); mSmtpUsername = resource.getProperty("username").toString(); mSmtpPassword = resource.getProperty("password").toString(); emit smtpResourceChanged(); - }, - [](int errorCode, const QString &errorMessage) { - qWarning() << "Failed to find the smtp resource: " << errorMessage; + }).onError([](const KAsync::Error &error) { + qWarning() << "Failed to find the smtp resource: " << error.errorMessage; }).exec(); } @@ -203,14 +200,13 @@ void AccountSettings::loadIdentity() { //FIXME this assumes that we only ever have one identity per account Sink::Store::fetchOne(Sink::Query::AccountFilter(mAccountIdentifier)) - .then([this](const Sink::ApplicationDomain::Identity &identity) { + .syncThen([this](const Sink::ApplicationDomain::Identity &identity) { mIdentityIdentifier = identity.identifier(); mUsername = identity.getProperty("username").toString(); mEmailAddress = identity.getProperty("address").toString(); emit identityChanged(); - }, - [](int errorCode, const QString &errorMessage) { - qWarning() << "Failed to find the identity resource: " << errorMessage; + }).onError([](const KAsync::Error &error) { + qWarning() << "Failed to find the identity resource: " << error.errorMessage; }).exec(); } @@ -224,21 +220,22 @@ static QByteArray saveResource(const QByteArray &accountIdentifier, const QByteA for (const auto &pair : properties) { resource.setProperty(pair.first, pair.second); } - Sink::Store::modify(resource).then([](){}, [](int errorCode, const QString &errorMessage) { - qWarning() << "Error while modifying resource: " << errorMessage; - }) - .exec(); + Sink::Store::modify(resource) + .onError([](const KAsync::Error &error) { + qWarning() << "Error while modifying resource: " << error.errorMessage; + }) + .exec(); } else { auto resource = ResourceType::create(accountIdentifier); auto newIdentifier = resource.identifier(); for (const auto &pair : properties) { resource.setProperty(pair.first, pair.second); } - Sink::Store::create(resource).template then([]() {}, - [](int errorCode, const QString &errorMessage) { - qWarning() << "Error while creating resource: " << errorMessage; - }) - .exec(); + Sink::Store::create(resource) + .onError([](const KAsync::Error &error) { + qWarning() << "Error while creating resource: " << error.errorMessage; + }) + .exec(); return newIdentifier; } return identifier; @@ -275,8 +272,9 @@ void AccountSettings::saveIdentity() Sink::ApplicationDomain::Identity identity(mMailtransportIdentifier); identity.setProperty("username", mUsername); identity.setProperty("address", mEmailAddress); - Sink::Store::modify(identity).then([](){}, [](int errorCode, const QString &errorMessage) { - qWarning() << "Error while modifying identity: " << errorMessage; + Sink::Store::modify(identity) + .onError([](const KAsync::Error &error) { + qWarning() << "Error while modifying identity: " << error.errorMessage; }) .exec(); } else { @@ -285,9 +283,9 @@ void AccountSettings::saveIdentity() identity.setProperty("account", mAccountIdentifier); identity.setProperty("username", mUsername); identity.setProperty("address", mEmailAddress); - Sink::Store::create(identity).then([]() {}, - [](int errorCode, const QString &errorMessage) { - qWarning() << "Error while creating identity: " << errorMessage; + Sink::Store::create(identity) + .onError([](const KAsync::Error &error) { + qWarning() << "Error while creating identity: " << error.errorMessage; }) .exec(); } @@ -299,9 +297,9 @@ void AccountSettings::removeResource(const QByteArray &identifier) qWarning() << "We're missing an identifier"; } else { Sink::ApplicationDomain::SinkResource resource("", identifier, 0, QSharedPointer::create()); - Sink::Store::remove(resource).template then([]() {}, - [](int errorCode, const QString &errorMessage) { - qWarning() << "Error while removing resource: " << errorMessage; + Sink::Store::remove(resource) + .onError([](const KAsync::Error &error) { + qWarning() << "Error while removing resource: " << error.errorMessage; }) .exec(); } @@ -313,9 +311,9 @@ void AccountSettings::removeAccount() qWarning() << "We're missing an identifier"; } else { Sink::ApplicationDomain::SinkAccount account("", mAccountIdentifier, 0, QSharedPointer::create()); - Sink::Store::remove(account).then([]() {}, - [](int errorCode, const QString &errorMessage) { - qWarning() << "Error while removing account: " << errorMessage; + Sink::Store::remove(account) + .onError([](const KAsync::Error &error) { + qWarning() << "Error while removing account: " << error.errorMessage; }) .exec(); } @@ -327,9 +325,9 @@ void AccountSettings::removeIdentity() qWarning() << "We're missing an identifier"; } else { Sink::ApplicationDomain::Identity identity("", mIdentityIdentifier, 0, QSharedPointer::create()); - Sink::Store::remove(identity).then([]() {}, - [](int errorCode, const QString &errorMessage) { - qWarning() << "Error while removing identity: " << errorMessage; + Sink::Store::remove(identity) + .onError([](const KAsync::Error &error) { + qWarning() << "Error while removing identity: " << error.errorMessage; }) .exec(); } -- cgit v1.2.3 From dd060cc5e3b336a77f8e5e76df4bc76a58e22cd4 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 4 Oct 2016 12:10:06 +0200 Subject: Adapted to new query api --- framework/domain/settings/accountsettings.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'framework/domain/settings/accountsettings.cpp') diff --git a/framework/domain/settings/accountsettings.cpp b/framework/domain/settings/accountsettings.cpp index 9a3be059..020fd503 100644 --- a/framework/domain/settings/accountsettings.cpp +++ b/framework/domain/settings/accountsettings.cpp @@ -155,7 +155,7 @@ void AccountSettings::loadAccount() void AccountSettings::loadImapResource() { - Sink::Store::fetchOne(Sink::Query::AccountFilter(mAccountIdentifier) + Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::storage)) + Sink::Store::fetchOne(Sink::Query().filter(Sink::ApplicationDomain::SinkAccount(mAccountIdentifier)).containsFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::storage)) .syncThen([this](const Sink::ApplicationDomain::SinkResource &resource) { mImapIdentifier = resource.identifier(); mImapServer = resource.getProperty("server").toString(); @@ -169,7 +169,7 @@ void AccountSettings::loadImapResource() void AccountSettings::loadMaildirResource() { - Sink::Store::fetchOne(Sink::Query::AccountFilter(mAccountIdentifier) + Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::storage)) + Sink::Store::fetchOne(Sink::Query().filter(Sink::ApplicationDomain::SinkAccount(mAccountIdentifier)).containsFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::storage)) .syncThen([this](const Sink::ApplicationDomain::SinkResource &resource) { mMaildirIdentifier = resource.identifier(); auto path = resource.getProperty("path").toString(); @@ -184,7 +184,7 @@ void AccountSettings::loadMaildirResource() void AccountSettings::loadMailtransportResource() { - Sink::Store::fetchOne(Sink::Query::AccountFilter(mAccountIdentifier) + Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::transport)) + Sink::Store::fetchOne(Sink::Query().filter(Sink::ApplicationDomain::SinkAccount(mAccountIdentifier)).containsFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::transport)) .syncThen([this](const Sink::ApplicationDomain::SinkResource &resource) { mMailtransportIdentifier = resource.identifier(); mSmtpServer = resource.getProperty("server").toString(); @@ -199,7 +199,7 @@ void AccountSettings::loadMailtransportResource() void AccountSettings::loadIdentity() { //FIXME this assumes that we only ever have one identity per account - Sink::Store::fetchOne(Sink::Query::AccountFilter(mAccountIdentifier)) + Sink::Store::fetchOne(Sink::Query().filter(Sink::ApplicationDomain::SinkAccount(mAccountIdentifier))) .syncThen([this](const Sink::ApplicationDomain::Identity &identity) { mIdentityIdentifier = identity.identifier(); mUsername = identity.getProperty("username").toString(); -- cgit v1.2.3 From 268eb7207b955bb92e4ae2572996877e7f837325 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 4 Oct 2016 12:19:27 +0200 Subject: Less namespaces improve readability --- framework/domain/settings/accountsettings.cpp | 59 ++++++++++++++------------- 1 file changed, 31 insertions(+), 28 deletions(-) (limited to 'framework/domain/settings/accountsettings.cpp') diff --git a/framework/domain/settings/accountsettings.cpp b/framework/domain/settings/accountsettings.cpp index 020fd503..635aef6e 100644 --- a/framework/domain/settings/accountsettings.cpp +++ b/framework/domain/settings/accountsettings.cpp @@ -23,6 +23,9 @@ #include #include +using namespace Sink; +using namespace Sink::ApplicationDomain; + AccountSettings::AccountSettings(QObject *parent) : QObject(parent) { @@ -130,12 +133,12 @@ void AccountSettings::saveAccount() { qDebug() << "Saving account " << mAccountIdentifier << mMailtransportIdentifier; Q_ASSERT(!mAccountIdentifier.isEmpty()); - Sink::ApplicationDomain::SinkAccount account(mAccountIdentifier); + SinkAccount account(mAccountIdentifier); account.setProperty("type", "imap"); account.setProperty("name", mName); account.setProperty("icon", mIcon); Q_ASSERT(!account.identifier().isEmpty()); - Sink::Store::modify(account) + Store::modify(account) .onError([](const KAsync::Error &error) { qWarning() << "Error while creating account: " << error.errorMessage;; }) @@ -145,8 +148,8 @@ void AccountSettings::saveAccount() void AccountSettings::loadAccount() { Q_ASSERT(!mAccountIdentifier.isEmpty()); - Sink::Store::fetchOne(Sink::Query::IdentityFilter(mAccountIdentifier)) - .syncThen([this](const Sink::ApplicationDomain::SinkAccount &account) { + Store::fetchOne(Query::IdentityFilter(mAccountIdentifier)) + .syncThen([this](const SinkAccount &account) { mIcon = account.getProperty("icon").toString(); mName = account.getProperty("name").toString(); emit changed(); @@ -155,8 +158,8 @@ void AccountSettings::loadAccount() void AccountSettings::loadImapResource() { - Sink::Store::fetchOne(Sink::Query().filter(Sink::ApplicationDomain::SinkAccount(mAccountIdentifier)).containsFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::storage)) - .syncThen([this](const Sink::ApplicationDomain::SinkResource &resource) { + Store::fetchOne(Query().filter(SinkAccount(mAccountIdentifier)).containsFilter(ResourceCapabilities::Mail::storage)) + .syncThen([this](const SinkResource &resource) { mImapIdentifier = resource.identifier(); mImapServer = resource.getProperty("server").toString(); mImapUsername = resource.getProperty("username").toString(); @@ -169,8 +172,8 @@ void AccountSettings::loadImapResource() void AccountSettings::loadMaildirResource() { - Sink::Store::fetchOne(Sink::Query().filter(Sink::ApplicationDomain::SinkAccount(mAccountIdentifier)).containsFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::storage)) - .syncThen([this](const Sink::ApplicationDomain::SinkResource &resource) { + Store::fetchOne(Query().filter(SinkAccount(mAccountIdentifier)).containsFilter(ResourceCapabilities::Mail::storage)) + .syncThen([this](const SinkResource &resource) { mMaildirIdentifier = resource.identifier(); auto path = resource.getProperty("path").toString(); if (mPath != path) { @@ -184,8 +187,8 @@ void AccountSettings::loadMaildirResource() void AccountSettings::loadMailtransportResource() { - Sink::Store::fetchOne(Sink::Query().filter(Sink::ApplicationDomain::SinkAccount(mAccountIdentifier)).containsFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::transport)) - .syncThen([this](const Sink::ApplicationDomain::SinkResource &resource) { + Store::fetchOne(Query().filter(SinkAccount(mAccountIdentifier)).containsFilter(ResourceCapabilities::Mail::transport)) + .syncThen([this](const SinkResource &resource) { mMailtransportIdentifier = resource.identifier(); mSmtpServer = resource.getProperty("server").toString(); mSmtpUsername = resource.getProperty("username").toString(); @@ -199,8 +202,8 @@ void AccountSettings::loadMailtransportResource() void AccountSettings::loadIdentity() { //FIXME this assumes that we only ever have one identity per account - Sink::Store::fetchOne(Sink::Query().filter(Sink::ApplicationDomain::SinkAccount(mAccountIdentifier))) - .syncThen([this](const Sink::ApplicationDomain::Identity &identity) { + Store::fetchOne(Query().filter(SinkAccount(mAccountIdentifier))) + .syncThen([this](const Identity &identity) { mIdentityIdentifier = identity.identifier(); mUsername = identity.getProperty("username").toString(); mEmailAddress = identity.getProperty("address").toString(); @@ -216,11 +219,11 @@ template static QByteArray saveResource(const QByteArray &accountIdentifier, const QByteArray &identifier, const std::map &properties) { if (!identifier.isEmpty()) { - Sink::ApplicationDomain::SinkResource resource(identifier); + SinkResource resource(identifier); for (const auto &pair : properties) { resource.setProperty(pair.first, pair.second); } - Sink::Store::modify(resource) + Store::modify(resource) .onError([](const KAsync::Error &error) { qWarning() << "Error while modifying resource: " << error.errorMessage; }) @@ -231,7 +234,7 @@ static QByteArray saveResource(const QByteArray &accountIdentifier, const QByteA for (const auto &pair : properties) { resource.setProperty(pair.first, pair.second); } - Sink::Store::create(resource) + Store::create(resource) .onError([](const KAsync::Error &error) { qWarning() << "Error while creating resource: " << error.errorMessage; }) @@ -243,7 +246,7 @@ static QByteArray saveResource(const QByteArray &accountIdentifier, const QByteA void AccountSettings::saveImapResource() { - mImapIdentifier = saveResource(mAccountIdentifier, mImapIdentifier, { + mImapIdentifier = saveResource(mAccountIdentifier, mImapIdentifier, { {"server", mImapServer}, {"username", mImapUsername}, {"password", mImapPassword}, @@ -252,14 +255,14 @@ void AccountSettings::saveImapResource() void AccountSettings::saveMaildirResource() { - mMaildirIdentifier = saveResource(mAccountIdentifier, mMaildirIdentifier, { + mMaildirIdentifier = saveResource(mAccountIdentifier, mMaildirIdentifier, { {"path", mPath}, }); } void AccountSettings::saveMailtransportResource() { - mMailtransportIdentifier = saveResource(mAccountIdentifier, mMailtransportIdentifier, { + mMailtransportIdentifier = saveResource(mAccountIdentifier, mMailtransportIdentifier, { {"server", mSmtpServer}, {"username", mSmtpUsername}, {"password", mSmtpPassword}, @@ -269,21 +272,21 @@ void AccountSettings::saveMailtransportResource() void AccountSettings::saveIdentity() { if (!mIdentityIdentifier.isEmpty()) { - Sink::ApplicationDomain::Identity identity(mMailtransportIdentifier); + Identity identity(mMailtransportIdentifier); identity.setProperty("username", mUsername); identity.setProperty("address", mEmailAddress); - Sink::Store::modify(identity) + Store::modify(identity) .onError([](const KAsync::Error &error) { qWarning() << "Error while modifying identity: " << error.errorMessage; }) .exec(); } else { - auto identity = Sink::ApplicationDomain::ApplicationDomainType::createEntity(); + auto identity = ApplicationDomainType::createEntity(); mIdentityIdentifier = identity.identifier(); identity.setProperty("account", mAccountIdentifier); identity.setProperty("username", mUsername); identity.setProperty("address", mEmailAddress); - Sink::Store::create(identity) + Store::create(identity) .onError([](const KAsync::Error &error) { qWarning() << "Error while creating identity: " << error.errorMessage; }) @@ -296,8 +299,8 @@ void AccountSettings::removeResource(const QByteArray &identifier) if (identifier.isEmpty()) { qWarning() << "We're missing an identifier"; } else { - Sink::ApplicationDomain::SinkResource resource("", identifier, 0, QSharedPointer::create()); - Sink::Store::remove(resource) + SinkResource resource("", identifier, 0, QSharedPointer::create()); + Store::remove(resource) .onError([](const KAsync::Error &error) { qWarning() << "Error while removing resource: " << error.errorMessage; }) @@ -310,8 +313,8 @@ void AccountSettings::removeAccount() if (mAccountIdentifier.isEmpty()) { qWarning() << "We're missing an identifier"; } else { - Sink::ApplicationDomain::SinkAccount account("", mAccountIdentifier, 0, QSharedPointer::create()); - Sink::Store::remove(account) + SinkAccount account("", mAccountIdentifier, 0, QSharedPointer::create()); + Store::remove(account) .onError([](const KAsync::Error &error) { qWarning() << "Error while removing account: " << error.errorMessage; }) @@ -324,8 +327,8 @@ void AccountSettings::removeIdentity() if (mIdentityIdentifier.isEmpty()) { qWarning() << "We're missing an identifier"; } else { - Sink::ApplicationDomain::Identity identity("", mIdentityIdentifier, 0, QSharedPointer::create()); - Sink::Store::remove(identity) + Identity identity("", mIdentityIdentifier, 0, QSharedPointer::create()); + Store::remove(identity) .onError([](const KAsync::Error &error) { qWarning() << "Error while removing identity: " << error.errorMessage; }) -- cgit v1.2.3 From 5fa8608e9877eab40336a60ed8ed979aaf3cfbd0 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 5 Oct 2016 22:42:53 +0200 Subject: Adapted to new API --- framework/domain/settings/accountsettings.cpp | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'framework/domain/settings/accountsettings.cpp') diff --git a/framework/domain/settings/accountsettings.cpp b/framework/domain/settings/accountsettings.cpp index 635aef6e..ea798a73 100644 --- a/framework/domain/settings/accountsettings.cpp +++ b/framework/domain/settings/accountsettings.cpp @@ -134,9 +134,9 @@ void AccountSettings::saveAccount() qDebug() << "Saving account " << mAccountIdentifier << mMailtransportIdentifier; Q_ASSERT(!mAccountIdentifier.isEmpty()); SinkAccount account(mAccountIdentifier); - account.setProperty("type", "imap"); - account.setProperty("name", mName); - account.setProperty("icon", mIcon); + account.setAccountType("imap"); + account.setName(mName); + account.setIcon(mIcon); Q_ASSERT(!account.identifier().isEmpty()); Store::modify(account) .onError([](const KAsync::Error &error) { @@ -148,17 +148,17 @@ void AccountSettings::saveAccount() void AccountSettings::loadAccount() { Q_ASSERT(!mAccountIdentifier.isEmpty()); - Store::fetchOne(Query::IdentityFilter(mAccountIdentifier)) + Store::fetchOne(Query().filter(mAccountIdentifier)) .syncThen([this](const SinkAccount &account) { - mIcon = account.getProperty("icon").toString(); - mName = account.getProperty("name").toString(); + mIcon = account.getIcon(); + mName = account.getName(); emit changed(); }).exec(); } void AccountSettings::loadImapResource() { - Store::fetchOne(Query().filter(SinkAccount(mAccountIdentifier)).containsFilter(ResourceCapabilities::Mail::storage)) + Store::fetchOne(Query().filter(mAccountIdentifier).containsFilter(ResourceCapabilities::Mail::storage)) .syncThen([this](const SinkResource &resource) { mImapIdentifier = resource.identifier(); mImapServer = resource.getProperty("server").toString(); @@ -172,7 +172,7 @@ void AccountSettings::loadImapResource() void AccountSettings::loadMaildirResource() { - Store::fetchOne(Query().filter(SinkAccount(mAccountIdentifier)).containsFilter(ResourceCapabilities::Mail::storage)) + Store::fetchOne(Query().filter(mAccountIdentifier).containsFilter(ResourceCapabilities::Mail::storage)) .syncThen([this](const SinkResource &resource) { mMaildirIdentifier = resource.identifier(); auto path = resource.getProperty("path").toString(); @@ -187,7 +187,7 @@ void AccountSettings::loadMaildirResource() void AccountSettings::loadMailtransportResource() { - Store::fetchOne(Query().filter(SinkAccount(mAccountIdentifier)).containsFilter(ResourceCapabilities::Mail::transport)) + Store::fetchOne(Query().filter(mAccountIdentifier).containsFilter(ResourceCapabilities::Mail::transport)) .syncThen([this](const SinkResource &resource) { mMailtransportIdentifier = resource.identifier(); mSmtpServer = resource.getProperty("server").toString(); @@ -202,7 +202,7 @@ void AccountSettings::loadMailtransportResource() void AccountSettings::loadIdentity() { //FIXME this assumes that we only ever have one identity per account - Store::fetchOne(Query().filter(SinkAccount(mAccountIdentifier))) + Store::fetchOne(Query().filter(mAccountIdentifier)) .syncThen([this](const Identity &identity) { mIdentityIdentifier = identity.identifier(); mUsername = identity.getProperty("username").toString(); @@ -283,7 +283,7 @@ void AccountSettings::saveIdentity() } else { auto identity = ApplicationDomainType::createEntity(); mIdentityIdentifier = identity.identifier(); - identity.setProperty("account", mAccountIdentifier); + identity.setAccount(mAccountIdentifier); identity.setProperty("username", mUsername); identity.setProperty("address", mEmailAddress); Store::create(identity) @@ -299,7 +299,7 @@ void AccountSettings::removeResource(const QByteArray &identifier) if (identifier.isEmpty()) { qWarning() << "We're missing an identifier"; } else { - SinkResource resource("", identifier, 0, QSharedPointer::create()); + SinkResource resource(identifier); Store::remove(resource) .onError([](const KAsync::Error &error) { qWarning() << "Error while removing resource: " << error.errorMessage; @@ -313,7 +313,7 @@ void AccountSettings::removeAccount() if (mAccountIdentifier.isEmpty()) { qWarning() << "We're missing an identifier"; } else { - SinkAccount account("", mAccountIdentifier, 0, QSharedPointer::create()); + SinkAccount account(mAccountIdentifier); Store::remove(account) .onError([](const KAsync::Error &error) { qWarning() << "Error while removing account: " << error.errorMessage; @@ -327,7 +327,7 @@ void AccountSettings::removeIdentity() if (mIdentityIdentifier.isEmpty()) { qWarning() << "We're missing an identifier"; } else { - Identity identity("", mIdentityIdentifier, 0, QSharedPointer::create()); + Identity identity(mIdentityIdentifier); Store::remove(identity) .onError([](const KAsync::Error &error) { qWarning() << "Error while removing identity: " << error.errorMessage; -- cgit v1.2.3