From 381957eeb8b029037bed1a6714b9f801198ffaef Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 2 Aug 2018 20:21:22 +0200
Subject: Cleanup

---
 examples/caldavresource/caldavresource.cpp   | 9 +++------
 examples/carddavresource/carddavresource.cpp | 6 ++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/examples/caldavresource/caldavresource.cpp b/examples/caldavresource/caldavresource.cpp
index df9ab52..4a73521 100644
--- a/examples/caldavresource/caldavresource.cpp
+++ b/examples/caldavresource/caldavresource.cpp
@@ -64,8 +64,7 @@ protected:
             localCalendar.setName(remoteCalendar.displayName());
             localCalendar.setColor(remoteCalendar.color().name().toLatin1());
 
-            createOrModify(ENTITY_TYPE_CALENDAR, rid, localCalendar,
-                /* mergeCriteria = */ QHash<QByteArray, Sink::Query::Comparator>{});
+            createOrModify(ENTITY_TYPE_CALENDAR, rid, localCalendar, {});
         }
     }
 
@@ -86,8 +85,7 @@ protected:
 
                 SinkTrace() << "Found an event with id:" << rid;
 
-                createOrModify(ENTITY_TYPE_EVENT, rid, localEvent,
-                    /* mergeCriteria = */ QHash<QByteArray, Sink::Query::Comparator>{});
+                createOrModify(ENTITY_TYPE_EVENT, rid, localEvent, {});
                 break;
             }
             case Type::TypeTodo: {
@@ -97,8 +95,7 @@ protected:
 
                 SinkTrace() << "Found a Todo with id:" << rid;
 
-                createOrModify(ENTITY_TYPE_TODO, rid, localTodo,
-                    /* mergeCriteria = */ QHash<QByteArray, Sink::Query::Comparator>{});
+                createOrModify(ENTITY_TYPE_TODO, rid, localTodo, {});
                 break;
             }
             case Type::TypeJournal:
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:
         const auto bufferType = ENTITY_TYPE_ADDRESSBOOK;
         Sink::ApplicationDomain::Addressbook addressbook;
         addressbook.setName(addressbookName);
-        QHash<QByteArray, Query::Comparator> mergeCriteria;
 
         if (!parentAddressbookRid.isEmpty()) {
             addressbook.setParent(syncStore().resolveRemoteId(ENTITY_TYPE_ADDRESSBOOK, parentAddressbookRid.toUtf8()));
         }
-        createOrModify(bufferType, remoteId, addressbook, mergeCriteria);
+        createOrModify(bufferType, remoteId, addressbook, {});
         return remoteId;
     }
 
@@ -83,8 +82,7 @@ protected:
         localContact.setVcard(remoteContact.data());
         localContact.setAddressbook(addressbookLocalId);
 
-        QHash<QByteArray, Query::Comparator> mergeCriteria;
-        createOrModify(ENTITY_TYPE_CONTACT, resourceID(remoteContact), localContact, mergeCriteria);
+        createOrModify(ENTITY_TYPE_CONTACT, resourceID(remoteContact), localContact, {});
     }
 
     QByteArray collectionLocalResourceID(const KDAV2::DavCollection &addressbook) Q_DECL_OVERRIDE
-- 
cgit v1.2.3