diff -r 2872ae438bf7 -r e538444823de harvester/common/inc/harvestdata.inl --- a/harvester/common/inc/harvestdata.inl Wed Sep 15 12:40:59 2010 +0300 +++ b/harvester/common/inc/harvestdata.inl Wed Oct 13 15:02:02 2010 +0300 @@ -80,55 +80,9 @@ // void CObjectDataArray::Append( CMdEObject* aMdeObject, CLocationData* aLocationData, CMdEQuery* aQuery ) { - TInt mdeObjectIndex(KErrNone); - TInt locationDataIndex(KErrNone); - - mdeObjectIndex = iMdeObjectArray.Append( aMdeObject ); - - if( mdeObjectIndex != KErrNone ) - { - delete aMdeObject; - aMdeObject = NULL; - - delete aLocationData; - aLocationData = NULL; - - delete aQuery; - aQuery = NULL; - } - else - { - locationDataIndex = iLocationArray.Append( aLocationData ); - - if( locationDataIndex != KErrNone ) - { - iMdeObjectArray.Remove( mdeObjectIndex ); - delete aMdeObject; - aMdeObject = NULL; - - delete aLocationData; - aLocationData = NULL; - - delete aQuery; - aQuery = NULL; - } - else - { - if( iQueryArray.Append( aQuery ) != KErrNone ) - { - iMdeObjectArray.Remove( mdeObjectIndex ); - delete aMdeObject; - aMdeObject = NULL; - - iLocationArray.Remove( locationDataIndex ); - delete aLocationData; - aLocationData = NULL; - - delete aQuery; - aQuery = NULL; - } - } - } + iMdeObjectArray.Append( aMdeObject ); + iLocationArray.Append( aLocationData ); + iQueryArray.Append( aQuery ); } // --------------------------------------------------------------------------- @@ -142,14 +96,8 @@ return; } delete iMdeObjectArray[aIndex]; - iMdeObjectArray[aIndex] = NULL; - delete iLocationArray[aIndex]; - iLocationArray[aIndex] = NULL; - delete iQueryArray[aIndex]; - iQueryArray[aIndex] = NULL; - iMdeObjectArray.Remove( aIndex ); iLocationArray.Remove( aIndex ); iQueryArray.Remove( aIndex );