diff -r 94dc1107e8b2 -r 40a3f856b14d phoneengine/PhoneCntFinder/ContactService/inc/CPhCntMatcherImpl.h --- a/phoneengine/PhoneCntFinder/ContactService/inc/CPhCntMatcherImpl.h Thu Jul 15 18:38:16 2010 +0300 +++ b/phoneengine/PhoneCntFinder/ContactService/inc/CPhCntMatcherImpl.h Thu Aug 19 09:54:27 2010 +0300 @@ -21,6 +21,8 @@ #include #include "CPhCntMatcher.h" #include "MVPbkContactLink.h" +#include "MPhCntContactManager.h" +#include "tphcntcontactselectionstrategy.h" class MPhCntContactStores; class CPhCntContactManager; @@ -165,16 +167,14 @@ TInt GetContactL( MPhCntMatch*& aMatch, const TDesC& aTelNumber ); - + /** - * Match contacts against product specific stores. - * - * @since S60 v3.2 - * @param aLinkArray Array of contacts to match - * @return Error code. + * Matches contacts */ - TInt MatchFromAdditionalStore( const MVPbkContactLinkArray& aLinkArray ) const; - + TInt MatchContactL( + const MVPbkContactLinkArray*& aContactLinkArray, + const TDesC& aTelNumber, + MPhCntContactManager::TDuplicateRemovalStrategy aRemoveDuplicatesStrategy ); protected: @@ -259,6 +259,9 @@ * Own. */ MPhCntContactMatchStrategy* iCSMatchStrategy; + + + TPhCntContactSelectionStrategy iContactSelectionStrategy; };