Fixes: NB#288314 - Adapt merging logic for multiple MFE accounts
authorAdrien Bustany <adrien.bustany@nokia.com>
Thu, 27 Oct 2011 09:04:29 +0000 (12:04 +0300)
committerMathias Hasselmann <mathias@openismus.com>
Mon, 31 Oct 2011 13:46:33 +0000 (14:46 +0100)
commit68b8015b8b297a30b54407afe30a2df0692d66a4
tree0fe476095810563944e42ab4e76fb85efaf13589
parent233ecb00af616fc2cba2bac3d9e8740ab868e5be
Fixes: NB#288314 - Adapt merging logic for multiple MFE accounts

RevBy: cocos (MR#298)
Details:
- Factor out the sync target computation to make
  QTrackerContactCopyAndRemoveRequest::buildMergeQuery more readable
- Adapt the merging rules so that MFE sync targets always have priority
- Adapt the merging rules to detect MFE sync targets for multiple accounts
  (match on "mfe" prefix, and not "mfe" strict equality)
src/engine/contactcopyandremoverequest.cpp
src/engine/contactcopyandremoverequest.h
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp