summaryrefslogtreecommitdiffstats
path: root/examples/carddavresource
diff options
context:
space:
mode:
Diffstat (limited to 'examples/carddavresource')
-rw-r--r--examples/carddavresource/carddavresource.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/examples/carddavresource/carddavresource.cpp b/examples/carddavresource/carddavresource.cpp
index 0bf851b..916312f 100644
--- a/examples/carddavresource/carddavresource.cpp
+++ b/examples/carddavresource/carddavresource.cpp
@@ -54,12 +54,11 @@ public:
54 const auto bufferType = ENTITY_TYPE_ADDRESSBOOK; 54 const auto bufferType = ENTITY_TYPE_ADDRESSBOOK;
55 Sink::ApplicationDomain::Addressbook addressbook; 55 Sink::ApplicationDomain::Addressbook addressbook;
56 addressbook.setName(addressbookName); 56 addressbook.setName(addressbookName);
57 QHash<QByteArray, Query::Comparator> mergeCriteria;
58 57
59 if (!parentAddressbookRid.isEmpty()) { 58 if (!parentAddressbookRid.isEmpty()) {
60 addressbook.setParent(syncStore().resolveRemoteId(ENTITY_TYPE_ADDRESSBOOK, parentAddressbookRid.toUtf8())); 59 addressbook.setParent(syncStore().resolveRemoteId(ENTITY_TYPE_ADDRESSBOOK, parentAddressbookRid.toUtf8()));
61 } 60 }
62 createOrModify(bufferType, remoteId, addressbook, mergeCriteria); 61 createOrModify(bufferType, remoteId, addressbook, {});
63 return remoteId; 62 return remoteId;
64 } 63 }
65 64
@@ -83,8 +82,7 @@ protected:
83 localContact.setVcard(remoteContact.data()); 82 localContact.setVcard(remoteContact.data());
84 localContact.setAddressbook(addressbookLocalId); 83 localContact.setAddressbook(addressbookLocalId);
85 84
86 QHash<QByteArray, Query::Comparator> mergeCriteria; 85 createOrModify(ENTITY_TYPE_CONTACT, resourceID(remoteContact), localContact, {});
87 createOrModify(ENTITY_TYPE_CONTACT, resourceID(remoteContact), localContact, mergeCriteria);
88 } 86 }
89 87
90 QByteArray collectionLocalResourceID(const KDAV2::DavCollection &addressbook) Q_DECL_OVERRIDE 88 QByteArray collectionLocalResourceID(const KDAV2::DavCollection &addressbook) Q_DECL_OVERRIDE