calendarui/organizerplugin/aiagendapluginengine/src/CalenAsyncCommands.cpp
branchRCL_3
changeset 27 aba12c885d83
parent 15 9711e452b5e9
equal deleted inserted replaced
25:bf573002ff72 27:aba12c885d83
   416                     if( ( iInstanceArray[i]->Entry().EntryTypeL() == CCalEntry::EAppt ||
   416                     if( ( iInstanceArray[i]->Entry().EntryTypeL() == CCalEntry::EAppt ||
   417                           iInstanceArray[i]->Entry().EntryTypeL() == CCalEntry::EReminder )
   417                           iInstanceArray[i]->Entry().EntryTypeL() == CCalEntry::EReminder )
   418                         &&
   418                         &&
   419                         iInstanceArray[i]->StartTimeL().TimeLocalL() < iDay )
   419                         iInstanceArray[i]->StartTimeL().TimeLocalL() < iDay )
   420                         {
   420                         {
   421                         delete iInstanceArray[i];
   421                         CCalInstance* instance = iInstanceArray[i];
   422                         iInstanceArray.Remove( i );
   422                         iInstanceArray.Remove( i );
       
   423                         delete instance;
       
   424                         
   423                         }
   425                         }
   424                     else
   426                     else
   425                         {
   427                         {
   426                         i++;
   428                         i++;
   427                         }
   429                         }
   950                     CCalEntry& entry = iInstanceArray[i]->Entry();
   952                     CCalEntry& entry = iInstanceArray[i]->Entry();
   951 
   953 
   952                     if( entry.EntryTypeL() == CCalEntry::EAppt && 
   954                     if( entry.EntryTypeL() == CCalEntry::EAppt && 
   953                         entry.StatusL() == CCalEntry::ECancelled )
   955                         entry.StatusL() == CCalEntry::ECancelled )
   954                         {
   956                         {
   955                         delete iInstanceArray[i];
   957                         CCalInstance* instance = iInstanceArray[i];
   956                         iInstanceArray.Remove( i );
   958                         iInstanceArray.Remove( i );
       
   959                         delete instance;
   957                         }
   960                         }
   958                     else
   961                     else
   959                         {
   962                         {
   960                         i++;
   963                         i++;
   961                         }
   964                         }