equal
deleted
inserted
replaced
153 // |
153 // |
154 CFolderRenamedHarvester::~CFolderRenamedHarvester() |
154 CFolderRenamedHarvester::~CFolderRenamedHarvester() |
155 { |
155 { |
156 delete iDir; |
156 delete iDir; |
157 delete iDirscan; |
157 delete iDirscan; |
|
158 for ( int i =0; i < iRenamedFolders.Count(); i++ ) |
|
159 { |
|
160 CFolderRenamedItem* item = iRenamedFolders[0]; |
|
161 iRenamedFolders.Remove(0); |
|
162 delete item; |
|
163 item = NULL; |
|
164 } |
158 iRenamedFolders.ResetAndDestroy(); |
165 iRenamedFolders.ResetAndDestroy(); |
159 iRenamedFolders.Close(); |
166 iRenamedFolders.Close(); |
160 Cancel(); |
167 Cancel(); |
161 } |
168 } |
162 |
169 |
411 // |
418 // |
412 TInt CFolderRenamedHarvester::RunError(TInt aError) |
419 TInt CFolderRenamedHarvester::RunError(TInt aError) |
413 { |
420 { |
414 OstTrace1( TRACE_NORMAL, CFOLDERRENAMEDHARVESTER_RUNERROR, "CFolderRenamedHarvester::RunError;aError=%d", aError ); |
421 OstTrace1( TRACE_NORMAL, CFOLDERRENAMEDHARVESTER_RUNERROR, "CFolderRenamedHarvester::RunError;aError=%d", aError ); |
415 CPIXLOGSTRING2("CFolderRenamedHarvester::RunError - aError: %d", aError ); |
422 CPIXLOGSTRING2("CFolderRenamedHarvester::RunError - aError: %d", aError ); |
|
423 for ( int i =0; i < iRenamedFolders.Count(); i++ ) |
|
424 { |
|
425 CFolderRenamedItem* item = iRenamedFolders[0]; |
|
426 iRenamedFolders.Remove(0); |
|
427 delete item; |
|
428 item = NULL; |
|
429 } |
416 iRenamedFolders.ResetAndDestroy(); |
430 iRenamedFolders.ResetAndDestroy(); |
417 iHarvestState = EFolderRenamedIdleState; |
431 iHarvestState = EFolderRenamedIdleState; |
418 return KErrNone; |
432 return KErrNone; |
419 } |
433 } |
420 |
434 |