diff -r 6b5524b4f673 -r 38bb213f60ba phonebookui/Phonebook2/UIControls/src/CPbk2FetchDlg.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2FetchDlg.cpp Wed Sep 15 11:56:55 2010 +0300 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2FetchDlg.cpp Wed Oct 13 14:15:33 2010 +0300 @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -149,8 +149,7 @@ inline CPbk2FetchDlg::CPbk2FetchDlg ( TParams aParams, MPbk2FetchDlgObserver& aObserver ) : iParams( aParams ), - iObserver( aObserver ), - iSelectPermitted( ETrue ) + iObserver( aObserver ) { } @@ -259,7 +258,6 @@ ( aContactLink, Phonebook2::Pbk2AppUi()->ApplicationServices(). ContactManager().ContactStoresL() ); - // Append the selected contact to results. if ( linkArray->Count() > 0 ) { const MVPbkContactLink& link = linkArray->At( KFirstElement ); @@ -270,28 +268,6 @@ } // -------------------------------------------------------------------------- -// CPbk2FetchDlg::AcceptDelayedFetchL -// -------------------------------------------------------------------------- -// -EXPORT_C void CPbk2FetchDlg::DenyDelayedFetchL - ( const TDesC8& aContactLink ) - { - CVPbkContactLinkArray* linkArray = CVPbkContactLinkArray::NewLC - ( aContactLink, Phonebook2::Pbk2AppUi()->ApplicationServices(). - ContactManager().ContactStoresL() ); - - // Unmark the selected contact - if ( linkArray->Count() > 0 ) - { - const MVPbkContactLink& link = linkArray->At( KFirstElement ); - iResults->DenyAppendDelayedL( link ); - iPages->SelectContactL( link, EFalse ); - } - - CleanupStack::PopAndDestroy(); // linkArray - } - -// -------------------------------------------------------------------------- // CPbk2FetchDlg::ExecuteLD // -------------------------------------------------------------------------- // @@ -412,12 +388,6 @@ } } - // Only multiple fetch needs to wait buffered operations finished - if ( !canceled && ( iParams.iFlags & EFetchMultiple ) ) - { - iResults->WaitOperationsCompleteL(); - } - // Notify observer if ( canceled ) { @@ -465,11 +435,6 @@ // Reset results iResults->ResetAndDestroy(); } - else - { - // Permit selection again - iSelectPermitted = ETrue; - } iExitRecord.Set( EExitOrdered ); // exit is now ordered and // when client later requests @@ -560,12 +525,6 @@ } else { - // EKeyApplicationF means left softkey is pressed - if ( EKeyApplicationF == aKeyEvent.iCode && - ( iParams.iFlags & EFetchMultiple ) ) - { - iSelectPermitted = EFalse; - } if( !Phonebook2::Pbk2AppUi()->KeyEventHandler().Pbk2ProcessKeyEventL( aKeyEvent, aType ) ) { @@ -829,14 +788,6 @@ } } } -// -------------------------------------------------------------------------- -// CPbk2FetchDlg::IsSelectPermitted -// -------------------------------------------------------------------------- -// -TBool CPbk2FetchDlg::IsSelectPermitted() - { - return iSelectPermitted; - } // -------------------------------------------------------------------------- // CPbk2FetchDlg::HandleControlEventL @@ -1327,21 +1278,6 @@ // void CPbk2FetchDlg::RestoreSelectionsL() { - // Remove selections in all pages. Selections will be restored later. - // In case of sort order change the selections will be in a new position, - // that's why they need to be removed. - if ( iPages ) - { - const TInt pageCount = iPages->DlgPageCount(); - for ( TInt i = 0; i < pageCount; i++ ) - { - if ( iPages->DlgPageAt(i).Control().ContactsMarked() ) - { - iPages->DlgPageAt(i).Control().ClearMarks(); - } - } - } - if ( iResults ) { for ( TInt i = 0; i < iResults->Count(); ++i )