--- a/phonebookui/Speeddial/VPbkControlSrc/speeddialprivate.cpp Wed Sep 15 11:56:55 2010 +0300
+++ b/phonebookui/Speeddial/VPbkControlSrc/speeddialprivate.cpp Wed Oct 13 14:15:33 2010 +0300
@@ -44,7 +44,7 @@
#include <StringLoader.h>
-#include <spdctrl.rsg>
+#include <SpdCtrl.rsg>
#include <spdctrl.mbg>
#include <avkon.mbg>
#include <gdi.h>
@@ -97,7 +97,7 @@
#include <AiwServiceHandler.h>
#include <telvmbxsettingscrkeys.h>
-#include <vpbkeng.rsg>
+#include <VPbkEng.rsg>
#include <AiwContactAssignDataTypes.h>
#include "SpdiaContainer.h"
@@ -223,8 +223,7 @@
iFetchmail(EFalse),
iServiceHandler(NULL),
iCancelFlag(0),
- iRemoveConfirmQueryDialog( NULL ),
- iFindOperation( NULL )
+ iRemoveConfirmQueryDialog( NULL )
/*iOperationComplete(EFalse),*/
{
@@ -496,10 +495,7 @@
iRemoveConfirmQueryDialog = NULL;
}
- ixspIconInfoArray.Close();
-
- // Make sure iFindOperation released if it has not release in InitIndexDataL()
- delete iFindOperation;
+ ixspIconInfoArray.Close();
}
// ---------------------------------------------------------
@@ -2699,16 +2695,15 @@
iFetchAll = EFalse;
iSpeedDial->SetIndex(CVPbkSpeedDialAttribute::KSpeedDialIndexNotDefined);
// iSpeedDial->SetIndex(2);
- iFindOperation = iAttributeManager->ListContactsL( *iSpeedDial , ( *this ) );
+ MVPbkContactOperationBase* findOperation = iAttributeManager->ListContactsL(*iSpeedDial,(*this));
- while( iFindOperation != NULL && !iFetchAll )
+ while(findOperation != NULL && !iFetchAll)
{
//Wait till every contactlink is fetched and set.
Wait();
}
//Delete the handle
- delete iFindOperation;
- iFindOperation = NULL;
+ delete findOperation;
MVPbkContactOperationBase* retrieveOperation = NULL;
for(TInt count =0; iContactLinkArray && count < iContactLinkArray->Count();++count)