equal
deleted
inserted
replaced
80 { |
80 { |
81 Cancel(); // Cancel any request, if outstanding |
81 Cancel(); // Cancel any request, if outstanding |
82 // Delete instance variables if any |
82 // Delete instance variables if any |
83 |
83 |
84 delete iMmcFileList; |
84 delete iMmcFileList; |
|
85 iMmcFileList = NULL; |
85 |
86 |
86 iEntryArray.ResetAndDestroy(); |
87 iEntryArray.ResetAndDestroy(); |
87 iEntryArray.Close(); |
88 iEntryArray.Close(); |
88 |
89 |
89 iHarvestEntryArray.ResetAndDestroy(); |
90 iHarvestEntryArray.ResetAndDestroy(); |
246 ei->PresentState() == EMdsModified ) |
247 ei->PresentState() == EMdsModified ) |
247 { |
248 { |
248 hd->SetEventType( EHarvesterEdit ); |
249 hd->SetEventType( EHarvesterEdit ); |
249 hd->SetObjectType( ENormal ); |
250 hd->SetObjectType( ENormal ); |
250 delete ei; |
251 delete ei; |
|
252 ei = NULL; |
251 } |
253 } |
252 else |
254 else |
253 { |
255 { |
254 hd->SetEventType( EHarvesterAdd ); |
256 hd->SetEventType( EHarvesterAdd ); |
255 hd->SetObjectType( EPlaceholder ); |
257 hd->SetObjectType( EPlaceholder ); |
256 hd->SetClientData( ei ); |
258 hd->SetClientData( ei ); |
257 } |
259 } |
258 iHdArray.Append( hd ); |
260 |
|
261 if(iHdArray.Append( hd ) != KErrNone ) |
|
262 { |
|
263 delete hd; |
|
264 hd = NULL; |
|
265 } |
259 iHarvestEntryArray.Remove( i ); |
266 iHarvestEntryArray.Remove( i ); |
260 } |
267 } |
261 |
268 |
262 if( iHarvestEntryArray.Count() == 0 ) |
269 if( iHarvestEntryArray.Count() == 0 ) |
263 { |
270 { |