[libcommhistory] Use collection instead of syncTarget to filter aggre…

…gates. JB#50658

src/contactlistener.cpp

@@ -31,7 +31,6 @@
 #include <QContactOnlineAccount>
 #include <QContactPhoneNumber>
 #include <QContactEmailAddress>
-#include <QContactSyncTarget>
 
 #include "commonutils.h"
 #include "contactresolver.h"
@@ -163,9 +162,7 @@ void ContactListenerPrivate::itemUpdated(SeasideCache::CacheItem *item)
     Q_Q(ContactListener);
 
     // Only aggregate contacts are relevant
-    static const QString aggregateTarget(QString::fromLatin1("aggregate"));
-    QContactSyncTarget syncTarget(item->contact.detail<QContactSyncTarget>());
-    if (syncTarget.syncTarget() != aggregateTarget)
+    if (item->contact.collectionId() != SeasideCache::aggregateCollectionId())
         return;
 
     // Make a list of Recipient from the contacts addresses to compare against

tests/common.cpp

@@ -41,7 +41,6 @@
 #include <QContactNickname>
 #include <QContactOnlineAccount>
 #include <QContactPhoneNumber>
-#include <QContactSyncTarget>
 
 #include <QEventLoop>
 #include <QFile>
@@ -88,13 +87,6 @@ QContact createTestContact(const QString &name, const QString &remoteUid, const
 {
     QContact contact;
 
-    QContactSyncTarget syncTarget;
-    syncTarget.setSyncTarget(QLatin1String("commhistory-tests"));
-    if (!contact.saveDetail(&syncTarget)) {
-        qWarning() << "Unable to add sync target to contact:" << contactUri;
-        return QContact();
-    }
-
     if (!localUid.isEmpty() && !localUidComparesPhoneNumbers(localUid)) {
         // Create a metadata detail to link the contact with the account
         QContactOriginMetadata metadata;