FCL/sf/app/contacts: comparison predictivesearch/adapters/contacts/src/cpcscontactfetch.cpp

equal deleted inserted replaced

-:2828b4d142c0
+:4ae315f230bc
 	// Initialize virtual phonebook with uris read from central repository.
 	CVPbkContactStoreUriArray* uriArray = CVPbkContactStoreUriArray::NewLC();
 	for(TInt i = 0; i< iUriFromCenrep.Count();i++)
 	{
-		uriArray->AppendL( TVPbkContactStoreUriPtr(iUriFromCenrep[i]->Des()));
+		uriArray->AppendL( TVPbkContactStoreUriPtr(*iUriFromCenrep[i]) );
 	}
 	// Create the instance of the contact manager
 	iContactManager = CVPbkContactManager::NewL(*uriArray);
 	CleanupStack::PopAndDestroy(uriArray);
 	PRINT ( _L("End CPcsContactFetch::~CPcsContactFetch") );
 }
 // ----------------------------------------------------------------------------
-// CPsContactDataAdapter::SetObserver
+// CPcsContactFetch::SetObserver
 //
 // ----------------------------------------------------------------------------
 void CPcsContactFetch::SetObserver(MDataStoreObserver& aObserver)
 {
 	iObserver = &aObserver;
 }
 // ----------------------------------------------------------------------------
-// CPsContactDataAdapter::GetSupportedDataStoresL
+// CPcsContactFetch::GetSupportedDataStoresL
 //
 // ----------------------------------------------------------------------------
 void CPcsContactFetch::GetSupportedDataStoresL( RPointerArray<TDesC> &aDataStoresURIs )
 {
 	PRINT ( _L("Enter CPcsContactFetch::GetSupportedDataStoresL") );
 	PRINT ( _L("End CPcsContactFetch::GetSupportedDataStoresL") );
 }
 // ----------------------------------------------------------------------------
-// CPsContactDataAdapter::RequestForDataL
+// CPcsContactFetch::RequestForDataL
 //
 // ----------------------------------------------------------------------------
 void  CPcsContactFetch::RequestForDataL(TDesC& aDataStoreURI)
 {
 	PRINT ( _L("Enter CPcsContactFetch::RequestForDataL") );
 // ---------------------------------------------------------------------------
 void CPcsContactFetch::StoreReady(MVPbkContactStore& /*aStore*/)
 {
 	PRINT ( _L("Enter CPcsContactFetch::StoreReady") );
 	iAtLeastOneStoreReady = ETrue;
 	if( iWait->IsStarted() )
-			iWait->AsyncStop();
+		iWait->AsyncStop();
 	PRINT ( _L("End CPcsContactFetch::StoreReady") );
 }
 // ---------------------------------------------------------------------------
 	if (!iAtLeastOneStoreReady)
 	{
 		if( iWait->IsStarted() )
 			iWait->AsyncStop();
 	}
 }
 // ---------------------------------------------------------------------------------
 // Called in case of any errros
 // ---------------------------------------------------------------------------
 void CPcsContactFetch::ReadUrisFromCenrepL()
 {
-CRepository *repository = CRepository::NewL( KCRUidPSContacts );
+CRepository* repository = CRepository::NewL( KCRUidPSContacts );
+CleanupStack::PushL( repository );
 // Read the cenrep for URIs
-TBuf<KCRMaxLen> UriStr;
+TBuf<KCRMaxLen> uriStr;
 for (TInt i(KUriCenRepStartKey); i < KUriCenRepStartKey + KCenrepUriSupportedCount; i++ )
 {
-	    TInt err = repository->Get(i, UriStr );
+TInt err = repository->Get( i, uriStr );
-	    if (KErrNone != err)
+if (KErrNone != err)
-	    {
+{
-		    break;
+break;
-	    }
+}
-	    if (UriStr != KNullDesC)
+if (uriStr != KNullDesC)
-	    {
+{
-		    iUriFromCenrep.Append(UriStr.AllocL());
+HBufC* uri = uriStr.AllocLC();
-	    }
+iUriFromCenrep.AppendL(uri);
+CleanupStack::Pop(uri);
+}
 }
-delete repository;
+CleanupStack::PopAndDestroy( repository );
 }
 // ---------------------------------------------------------------------------
 // Creates the contact view
 	if (!iAtLeastOneStoreReady)
 	{
 		if( ! (iWait->IsStarted()) )
 	    {
 	    	iWait->Start();
 	    }
 	}
 	// Check if data store is already present
-	for ( int i = 0; i < iAllDataStores.Count(); i++ )
+	for ( TInt i = 0; i < iAllDataStores.Count(); i++ )
 	{
 	    CPcsContactStore* contactStore = iAllDataStores[i];
 		if ( contactStore->GetStoreUri().Compare(aDataStoreURI) == 0 )
 		{
 		    // Remove the store
 		    delete contactStore;
 			iAllDataStores.Remove(i);
 			break;
 		}
 	}
 	MVPbkContactStoreList& stores = iContactManager->ContactStoresL();
 for ( TInt i(0); i < stores.Count(); ++i )
 if(stores.At(i).StoreProperties().Uri().UriDes().Compare(aDataStoreURI) == 0)
 {
 	CPcsContactStore* contactStore = CPcsContactStore::NewL(*iContactManager,
 		                                                        *iObserver,
 		                                                        stores.At(i).StoreProperties().Uri().UriDes());
 			iAllDataStores.Append(contactStore);
 			break;
 }
 	}
 	PRINT ( _L("End CPcsContactFetch::CreateSubStoresL") );
 }
 // ----------------------------------------------------------------------------
 // CPcsContactFetch::GetSupportedDataFieldsL
 //
 	    }
 	    if ( fieldToCache != 0 )
 	    {
 		   aDataFields.Append(fieldToCache);
 	    }
 }
 delete repository;
 	PRINT ( _L("End CPcsContactFetch::GetSupportedDataFieldsL") );
 }
 //
 // ----------------------------------------------------------------------------
 TBool CPcsContactFetch::IsDataStoresSupportedL( TDesC& aDataStoreURI )
 {
-	for(TInt i =0 ; i<iUriFromCenrep.Count();i++)
+	for ( TInt i = 0 ; i < iUriFromCenrep.Count() ; i++ )
 	{
-		if(iUriFromCenrep[i]->Des().Compare(aDataStoreURI) ==0)
+		if ( iUriFromCenrep[i]->Compare(aDataStoreURI) == 0 )
 		    return ETrue;
 	}
 	return EFalse;
 }

branch	RCL_3
changeset 35	4ae315f230bc
parent 0	e686773b3f54
child 64	c1e8ba0c2b16