[qtcontacts-sqlite] Remove duplicated effort from delta detection. Co…

…ntributes to JB#32526

The delta-detection algorithm calculates the entire set of possible
permutations of (added, removed) details to determine the likely
set of (modified) details.

This commit ensures that the entire set of possible permutations for
each detail type is only calculated once, rather than once for
each potential modification.

Contributes to JB#32526

src/extensions/twowaycontactsyncadapter_impl.h

@@ -938,7 +938,7 @@ QList<QContactDetail> TwoWayContactSyncAdapterPrivate::improveDelta(QList<QConta
         bucketedAdditions.insertMulti(additions->at(i).type(), additions->at(i));
 
     QSet<int> seenTypes;
-    foreach (int type, bucketedRemovals.keys()) {
+    foreach (int type, bucketedRemovals.uniqueKeys()) {
         QTCONTACTS_SQLITE_TWCSA_DEBUG_LOG("dealing with detail type:" << type);
         seenTypes.insert(type);
         QList<QContactDetail> removalsOfThisType = bucketedRemovals.values(type);
@@ -952,7 +952,7 @@ QList<QContactDetail> TwoWayContactSyncAdapterPrivate::improveDelta(QList<QConta
         finalModifications.append(modificationsOfThisType);
     }
 
-    foreach (int type, bucketedAdditions.keys()) {
+    foreach (int type, bucketedAdditions.uniqueKeys()) {
         if (!seenTypes.contains(type)) {
             finalAdditions.append(bucketedAdditions.values(type));
         }

tests/benchmarks/deltadetection/deltasyncadapter.h

@@ -30,8 +30,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
  */
 
-#ifndef TESTSYNCADAPTER_H
-#define TESTSYNCADAPTER_H
+#ifndef DELTASYNCADAPTER_H
+#define DELTASYNCADAPTER_H
 
 #include "../../../src/extensions/twowaycontactsyncadapter.h"
 #include <QContactManager>
@@ -106,4 +106,4 @@ class DeltaSyncAdapter : public QObject, public QtContactsSqliteExtensions::TwoW
     mutable QMap<QString, QMultiMap<QString, QString> > m_remoteServerDuplicates; // accountId to originalGuid to duplicateGuids.
 };
 
-#endif
+#endif // DELTASYNCADAPTER_H