1 files changed, 20 insertions, 27 deletions

diff --git a/examples/davresource/davresource.cpp b/examples/davresource/davresource.cpp
index 50471ed..465220f 100644
--- a/examples/davresource/davresource.cpp
+++ b/examples/davresource/davresource.cpp
@@ -31,19 +31,17 @@
 
 #include "contactpreprocessor.h"
 
-#include <KDAV/DavCollection>
-#include <KDAV/DavCollectionsFetchJob>
-#include <KDAV/DavItem>
-#include <KDAV/DavItemsListJob>
-#include <KDAV/DavItemFetchJob>
-#include <KDAV/EtagCache>
+#include <KDAV2/DavCollection>
+#include <KDAV2/DavCollectionsFetchJob>
+#include <KDAV2/DavItem>
+#include <KDAV2/DavItemsListJob>
+#include <KDAV2/DavItemFetchJob>
+#include <KDAV2/EtagCache>
 
 //This is the resources entity type, and not the domain type
 #define ENTITY_TYPE_CONTACT "contact"
 #define ENTITY_TYPE_ADDRESSBOOK "addressbook"
 
-SINK_DEBUG_AREA("davresource")
-
 using namespace Sink;
 
 static KAsync::Job<void> runJob(KJob *job)
@@ -87,7 +85,7 @@ public:
         return remoteId;
     }
 
-    void synchronizeAddressbooks(const KDAV::DavCollection::List &addressbookList)
+    void synchronizeAddressbooks(const KDAV2::DavCollection::List &addressbookList)
     {
         const QByteArray bufferType = ENTITY_TYPE_ADDRESSBOOK;
         SinkTrace() << "Found addressbooks " << addressbookList.size();
@@ -121,12 +119,12 @@ public:
         return list;
     }
 
-    static QByteArray getRid(const KDAV::DavItem &item)
+    static QByteArray getRid(const KDAV2::DavItem &item)
     {
         return item.url().toDisplayString().toUtf8();
     }
 
-    static QByteArray getRid(const KDAV::DavCollection &item)
+    static QByteArray getRid(const KDAV2::DavCollection &item)
     {
         return item.url().toDisplayString().toUtf8();
     }
@@ -135,7 +133,7 @@ public:
     {
         if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Addressbook>()) {
             SinkLogCtx(mLogCtx) << "Synchronizing addressbooks:" <<  mResourceUrl.url();
-            auto collectionsFetchJob = new KDAV::DavCollectionsFetchJob(mResourceUrl);
+            auto collectionsFetchJob = new KDAV2::DavCollectionsFetchJob(mResourceUrl);
             auto job = runJob(collectionsFetchJob).then([this, collectionsFetchJob] (const KAsync::Error &error) {
                 if (error) {
                     SinkWarningCtx(mLogCtx) << "Failed to synchronize addressbooks." << collectionsFetchJob->errorString();
@@ -147,29 +145,29 @@ public:
         } else if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Contact>()) {
             SinkLogCtx(mLogCtx) << "Synchronizing contacts.";
             auto ridList = QSharedPointer<QByteArrayList>::create();
-            auto collectionsFetchJob = new KDAV::DavCollectionsFetchJob(mResourceUrl);
+            auto collectionsFetchJob = new KDAV2::DavCollectionsFetchJob(mResourceUrl);
             auto job = runJob(collectionsFetchJob).then([this, collectionsFetchJob] {
                 synchronizeAddressbooks(collectionsFetchJob ->collections());
                 return collectionsFetchJob->collections();
             })
-            .serialEach([this, ridList](const KDAV::DavCollection &collection) {
+            .serialEach([this, ridList](const KDAV2::DavCollection &collection) {
                 auto collId = getRid(collection);
                 const auto addressbookLocalId = syncStore().resolveRemoteId(ENTITY_TYPE_ADDRESSBOOK, collId);
                 auto ctag = collection.CTag().toLatin1();
                 if (ctag != syncStore().readValue(collId + "_ctagXX")) {
                     SinkTraceCtx(mLogCtx) << "Syncing " << collId;
-                    auto cache = std::shared_ptr<KDAV::EtagCache>(new KDAV::EtagCache());
-                    auto davItemsListJob = new KDAV::DavItemsListJob(collection.url(), cache);
+                    auto cache = std::shared_ptr<KDAV2::EtagCache>(new KDAV2::EtagCache());
+                    auto davItemsListJob = new KDAV2::DavItemsListJob(collection.url(), cache);
                     const QByteArray bufferType = ENTITY_TYPE_CONTACT;
                     QHash<QByteArray, Query::Comparator> mergeCriteria;
                     auto colljob = runJob(davItemsListJob).then([davItemsListJob] {
                         return KAsync::value(davItemsListJob->items());
                     })
-                    .serialEach([=] (const KDAV::DavItem &item) {
+                    .serialEach([=] (const KDAV2::DavItem &item) {
                         QByteArray rid = getRid(item);
                         if (item.etag().toLatin1() != syncStore().readValue(rid + "_etag")){
                             SinkTrace() << "Updating " << rid;
-                            auto davItemFetchJob = new KDAV::DavItemFetchJob(item);
+                            auto davItemFetchJob = new KDAV2::DavItemFetchJob(item);
                             auto itemjob = runJob(davItemFetchJob)
                             .then([=] {
                                 const auto item = davItemFetchJob->item();
@@ -180,7 +178,7 @@ public:
                                 createOrModify(bufferType, rid, contact, mergeCriteria);
                                 return item;
                             })
-                            .then([this, ridList] (const KDAV::DavItem &item) {
+                            .then([this, ridList] (const KDAV2::DavItem &item) {
                                 const auto rid = getRid(item);
                                 syncStore().writeValue(rid + "_etag", item.etag().toLatin1());
                                 ridList->append(rid);
@@ -227,24 +225,19 @@ KAsync::Job<QByteArray> replay(const ApplicationDomain::Contact &contact, Sink::
     }
 
 public:
-    KDAV::DavUrl mResourceUrl;
+    KDAV2::DavUrl mResourceUrl;
 };
 
 
 DavResource::DavResource(const Sink::ResourceContext &resourceContext)
     : Sink::GenericResource(resourceContext)
 {
-    /*
-     * Fork KIO slaves (used in kdav), instead of starting them via klauncher.
-     * Otherwise we have yet another runtime dependency that will i.e. not work in the docker container.
-     */
-    qputenv("KDE_FORK_SLAVES", "TRUE");
     auto config = ResourceConfig::getConfiguration(resourceContext.instanceId());
     auto resourceUrl = QUrl::fromUserInput(config.value("server").toString());
     resourceUrl.setUserName(config.value("username").toString());
     resourceUrl.setPassword(config.value("password").toString());
 
-    mResourceUrl = KDAV::DavUrl(resourceUrl, KDAV::CardDav);
+    mResourceUrl = KDAV2::DavUrl(resourceUrl, KDAV2::CardDav);
 
     auto synchronizer = QSharedPointer<ContactSynchronizer>::create(resourceContext);
     synchronizer->mResourceUrl = mResourceUrl;
@@ -271,7 +264,7 @@ Sink::Resource *DavResourceFactory::createResource(const ResourceContext &contex
 void DavResourceFactory::registerFacades(const QByteArray &name, Sink::FacadeFactory &factory)
 {
     factory.registerFacade<ApplicationDomain::Contact, DefaultFacade<ApplicationDomain::Contact>>(name);
-    factory.registerFacade<ApplicationDomain::Addressbook, DefaultFacade<ApplicationDomain::Contact>>(name);
+    factory.registerFacade<ApplicationDomain::Addressbook, DefaultFacade<ApplicationDomain::Addressbook>>(name);
 }
 
 void DavResourceFactory::registerAdaptorFactories(const QByteArray &name, Sink::AdaptorFactoryRegistry &registry)