diff -r 2b40d63a9c3d -r 90517678cc4f qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.cpp --- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.cpp Fri Apr 16 15:51:22 2010 +0300 +++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.cpp Mon May 03 13:18:40 2010 +0300 @@ -57,14 +57,12 @@ if( !r ) { - QContactManagerEngine::updateRelationshipFetchRequest(r, QList(), QContactManager::UnspecifiedError); - QContactManagerEngine::updateRequestState(req, QContactAbstractRequest::FinishedState); + QContactManagerEngine::updateRelationshipFetchRequest(r, QList(), QContactManager::UnspecifiedError, QContactAbstractRequest::FinishedState); return; } - if (not r->relationshipType().isEmpty() && QContactRelationship::Is != r->relationshipType()) + if (not r->relationshipType().isEmpty() && QContactRelationship::IsSameAs != r->relationshipType()) { - QContactManagerEngine::updateRelationshipFetchRequest(r, r->relationships(), QContactManager::NotSupportedError); - QContactManagerEngine::updateRequestState(req, QContactAbstractRequest::FinishedState); + QContactManagerEngine::updateRelationshipFetchRequest(r, r->relationships(), QContactManager::NotSupportedError, QContactAbstractRequest::FinishedState); return; } QList dummy; @@ -101,8 +99,7 @@ QContactRelationshipFetchRequest* r = qobject_cast(req); if( !engine ) { - QContactManagerEngine::updateRelationshipFetchRequest(r, QList(), QContactManager::UnspecifiedError); - QContactManagerEngine::updateRequestState(req, QContactAbstractRequest::FinishedState); + QContactManagerEngine::updateRelationshipFetchRequest(r, QList(), QContactManager::UnspecifiedError, QContactAbstractRequest::FinishedState); return; } @@ -123,12 +120,11 @@ QContactRelationship rel; rel.setFirst(idfirst); rel.setSecond(idsecond); - rel.setRelationshipType(QContactRelationship::Is); + rel.setRelationshipType(QContactRelationship::IsSameAs); result.append(rel); } } - QContactManagerEngine::updateRelationshipFetchRequest(r, result, QContactManager::NoError); - QContactManagerEngine::updateRequestState(req, QContactAbstractRequest::FinishedState); + QContactManagerEngine::updateRelationshipFetchRequest(r, result, QContactManager::NoError, QContactAbstractRequest::FinishedState); }