3 files changed, 6 insertions, 6 deletions

diff --git a/accounts/imap/imapsettings.cpp b/accounts/imap/imapsettings.cpp
index 7d93606d..6e45b197 100644
--- a/accounts/imap/imapsettings.cpp
+++ b/accounts/imap/imapsettings.cpp
@@ -59,7 +59,7 @@ void ImapSettings::setAccountIdentifier(const QByteArray &id)
             emit changed();
         }).exec();
 
-    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::AccountFilter(id) + Sink::Query::CapabilityFilter("storage"))
+    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::AccountFilter(id) + Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::storage))
         .then<void, Sink::ApplicationDomain::SinkResource>([this](const Sink::ApplicationDomain::SinkResource &resource) {
             mIdentifier = resource.identifier();
             mImapServer = resource.getProperty("server").toString();
@@ -71,7 +71,7 @@ void ImapSettings::setAccountIdentifier(const QByteArray &id)
             qWarning() << "Failed to find the imap resource: " << errorMessage;
         }).exec();
 
-    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::AccountFilter(id) + Sink::Query::CapabilityFilter("transport"))
+    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::AccountFilter(id) + Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::transport))
         .then<void, Sink::ApplicationDomain::SinkResource>([this](const Sink::ApplicationDomain::SinkResource &resource) {
             mMailtransportIdentifier = resource.identifier();
             mSmtpServer = resource.getProperty("server").toString();
diff --git a/accounts/maildir/maildirsettings.cpp b/accounts/maildir/maildirsettings.cpp
index c66f9729..5125bbe7 100644
--- a/accounts/maildir/maildirsettings.cpp
+++ b/accounts/maildir/maildirsettings.cpp
@@ -57,7 +57,7 @@ void MaildirSettings::setAccountIdentifier(const QByteArray &id)
             emit changed();
         }).exec();
 
-    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::AccountFilter(id) + Sink::Query::CapabilityFilter("storage"))
+    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::AccountFilter(id) + Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::storage))
         .then<void, Sink::ApplicationDomain::SinkResource>([this](const Sink::ApplicationDomain::SinkResource &resource) {
             mIdentifier = resource.identifier();
             auto path = resource.getProperty("path").toString();
@@ -70,7 +70,7 @@ void MaildirSettings::setAccountIdentifier(const QByteArray &id)
             qWarning() << "Failed to find the maildir resource: " << errorMessage;
         }).exec();
 
-    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::AccountFilter(id) + Sink::Query::CapabilityFilter("transport"))
+    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::AccountFilter(id) + Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::transport))
         .then<void, Sink::ApplicationDomain::SinkResource>([this](const Sink::ApplicationDomain::SinkResource &resource) {
             mMailtransportIdentifier = resource.identifier();
             mSmtpServer = resource.getProperty("server").toString();
diff --git a/framework/domain/actions/sinkactions.cpp b/framework/domain/actions/sinkactions.cpp
index 129b538a..e4fb73ed 100644
--- a/framework/domain/actions/sinkactions.cpp
+++ b/framework/domain/actions/sinkactions.cpp
@@ -85,7 +85,7 @@ static ActionHandlerHelper sendMailHandler("org.kde.kube.actions.sendmail",
         qWarning() << "Sending a mail: ";
 
         Sink::Query query;
-        query += Sink::Query::CapabilityFilter("transport");
+        query += Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::transport);
         query += Sink::Query::AccountFilter(accountId);
         Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(query)
             .then<void, QList<Sink::ApplicationDomain::SinkResource::Ptr>>([=](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
@@ -120,7 +120,7 @@ static ActionHandlerHelper saveAsDraft("org.kde.kube.actions.save-as-draft",
 
         if (existingMail.identifier().isEmpty()) {
             Sink::Query query;
-            query += Sink::Query::CapabilityFilter("drafts");
+            query += Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::drafts);
             query += Sink::Query::AccountFilter(accountId);
             return Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(query)
                 .then<void, KAsync::Job<void>, Sink::ApplicationDomain::SinkResource>([=](const Sink::ApplicationDomain::SinkResource &resource) -> KAsync::Job<void> {