# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284701481 -10800 # Node ID 3785f754ee62d2144c80fec2c8e5d728a04b3412 # Parent 03808033c9a2533e7300c606214552b2573f62bc Revision: 201035 Kit: 201037 diff -r 03808033c9a2 -r 3785f754ee62 homesync/contentmanager/cmserver/cmfillmanager/src/cmfmdownloadproxy.cpp --- a/homesync/contentmanager/cmserver/cmfillmanager/src/cmfmdownloadproxy.cpp Wed Aug 18 10:02:50 2010 +0300 +++ b/homesync/contentmanager/cmserver/cmfillmanager/src/cmfmdownloadproxy.cpp Fri Sep 17 08:31:21 2010 +0300 @@ -217,13 +217,13 @@ CCmFmDownloadMngr* mngr = CCmFmDownloadMngr::NewL( aAVController, aObserver, *(*aDevices)[aSessionCount], aSessionCount ); CleanupStack::PushL( mngr ); - iDownloadSessions.Append( mngr ); + iDownloadSessions.AppendL( mngr ); CleanupStack::Pop( mngr ); iDownloadSessionCount++; TCmFmDownloadSessionIndexes index; index.iDeviceIndex = aSessionCount; index.iSessionIndex = ( iDownloadSessions.Count() - 1 ); - iSessionIndexes.Append( index ); + iSessionIndexes.AppendL( index ); aSessionIndex = index.iSessionIndex; } diff -r 03808033c9a2 -r 3785f754ee62 homesync/contentmanager/cmserver/cmfillmanager/src/cmfmfillrulefilleddatamngr.cpp --- a/homesync/contentmanager/cmserver/cmfillmanager/src/cmfmfillrulefilleddatamngr.cpp Wed Aug 18 10:02:50 2010 +0300 +++ b/homesync/contentmanager/cmserver/cmfillmanager/src/cmfmfillrulefilleddatamngr.cpp Fri Sep 17 08:31:21 2010 +0300 @@ -12,7 +12,7 @@ * Contributors: * * Description: Fill rule and filled data processing -* Version : %version: tr1ido#17 % << Don't touch! +* Version : %version: ou1s60rt#18 % << Don't touch! * */ @@ -429,7 +429,7 @@ if( mediaServers[i]->DbId() != 0 && !( mediaServers[i]->FillUsage() ) ) { - iMetadataServersToBeDeleted.Append( mediaServers[i]->DbId() ); + iMetadataServersToBeDeleted.AppendL( mediaServers[i]->DbId() ); TRACE(Print(_L("[FILL MNGR]\t DbId = %ld"), mediaServers[i]->DbId() )); @@ -653,7 +653,7 @@ ret = iDBManager->QueryAllMediaServersL( server ); if( !ret ) { - servers.Append( server ); + servers.AppendL( server ); CleanupStack::Pop( server ); } else @@ -867,7 +867,7 @@ iDBManager->PrepareQueryCmdL(EFillRuleQuery); fillRule->SetNameL( aFillListName ); iDBManager->QueryFillRuleL( fillRule ); - iRuleArray.Append( fillRule ); + iRuleArray.AppendL( fillRule ); iContainer->AddFillRuleL( fillRule ); CleanupStack::Pop( fillRule ); } @@ -960,7 +960,7 @@ { if( iItems[k]->Priority() > iItems[j]->Priority() ) { - refIds.InsertInOrder( k ); + refIds.InsertInOrderL( k ); } else if ( iItems[k]->Priority() < iItems[j]->Priority() ) { @@ -969,7 +969,7 @@ if( ECmUnSelected == iItems[k]->Selected() && ECmSelected == iItems[j]->Selected() ) { - refIds.InsertInOrder( k ); + refIds.InsertInOrderL( k ); } else { @@ -1091,7 +1091,7 @@ { if( iItems[i]->ListId() == aId ) { - aList.InsertInOrder( i ); + aList.InsertInOrderL( i ); } } } @@ -1218,7 +1218,7 @@ iUpdateItems.Reset(); for( TInt j = 0; j < iItems.Count(); j++ ) { - iUpdateItems.Append( iItems[j] ); + iUpdateItems.AppendL( iItems[j] ); } } @@ -1273,7 +1273,7 @@ iItems[iFileIds[aIndex]]->Status() == ECmToBeShrinked ) { aRealSize -= iItems[iFileIds[aIndex]]->Size(); - aDelIds.InsertInOrder( iFileIds[aIndex] ); + aDelIds.InsertInOrderL( iFileIds[aIndex] ); aRealCount--; } else // ECmLocalCopy @@ -1431,13 +1431,13 @@ { LOG(_L("[FILL MNGR]\t Random rule is not processed")); // Don't remove rule - iRuleArray.Append( iContainer->FillRule( j ) ); + iRuleArray.AppendL( iContainer->FillRule( j ) ); } } else { LOG(_L("[FILL MNGR]\t Rule is not random rule")); - iRuleArray.Append( iContainer->FillRule( j ) ); + iRuleArray.AppendL( iContainer->FillRule( j ) ); } } } diff -r 03808033c9a2 -r 3785f754ee62 homesync/contentmanager/cmserver/cmfillmanager/src/cmfmmain.cpp --- a/homesync/contentmanager/cmserver/cmfillmanager/src/cmfmmain.cpp Wed Aug 18 10:02:50 2010 +0300 +++ b/homesync/contentmanager/cmserver/cmfillmanager/src/cmfmmain.cpp Fri Sep 17 08:31:21 2010 +0300 @@ -690,7 +690,7 @@ iItems[index]->SetStatus( ECmFilled ); RPointerArray items; CleanupClosePushL( items ); - items.Append( iItems[index] ); + items.AppendL( iItems[index] ); iDbManager->UpdateStatusValues( items ); items.Reset(); CleanupStack::PopAndDestroy( &items ); diff -r 03808033c9a2 -r 3785f754ee62 homesync/contentmanager/cmserver/cmmemorymanager/src/cmmmmain.cpp --- a/homesync/contentmanager/cmserver/cmmemorymanager/src/cmmmmain.cpp Wed Aug 18 10:02:50 2010 +0300 +++ b/homesync/contentmanager/cmserver/cmmemorymanager/src/cmmmmain.cpp Fri Sep 17 08:31:21 2010 +0300 @@ -184,7 +184,7 @@ CCmMmQuotaListener::NewL( iDbManager, drives[i]->DriveNumber() ); - iQuotaListeners.Append( listener ); + iQuotaListeners.AppendL( listener ); } drives.ResetAndDestroy(); } diff -r 03808033c9a2 -r 3785f754ee62 homesync/contentmanager/cmserver/cmserver/src/client/cmclientsession.cpp --- a/homesync/contentmanager/cmserver/cmserver/src/client/cmclientsession.cpp Wed Aug 18 10:02:50 2010 +0300 +++ b/homesync/contentmanager/cmserver/cmserver/src/client/cmclientsession.cpp Fri Sep 17 08:31:21 2010 +0300 @@ -904,7 +904,7 @@ { CCmDriveInfo* tempDrive = CCmDriveInfo::NewLC(); tempDrive->InternalizeL( stream ); - aDrives.Append( tempDrive ); + aDrives.AppendL( tempDrive ); CleanupStack::Pop( tempDrive ); } CleanupStack::PopAndDestroy( 2, buffer ); diff -r 03808033c9a2 -r 3785f754ee62 homesync/contentmanager/cmserver/cmserver/src/server/cmserversession.cpp --- a/homesync/contentmanager/cmserver/cmserver/src/server/cmserversession.cpp Wed Aug 18 10:02:50 2010 +0300 +++ b/homesync/contentmanager/cmserver/cmserver/src/server/cmserversession.cpp Fri Sep 17 08:31:21 2010 +0300 @@ -834,7 +834,7 @@ CCmMediaServerFull* mediaServer = CCmMediaServerFull::NewLC(); mediaServer->InternalizeL( stream ); - mediaServers.Append( mediaServer ); + mediaServers.AppendL( mediaServer ); CleanupStack::Pop( mediaServer ); } TInt ret = iDbManager.SetMediaServersL( mediaServers ); @@ -879,7 +879,7 @@ { CCmBaseListItem* item = CCmBaseListItem::NewLC(); item->InternalizeL( stream ); - items.Append( item ); + items.AppendL( item ); CleanupStack::Pop( item ); } TInt ret = iDbManager.UpdateStatusValues( items ); @@ -986,7 +986,7 @@ CCmDriveInfo* drive = CCmDriveInfo::NewLC(); drive->InternalizeL( stream ); - drives.Append( drive ); + drives.AppendL( drive ); } // Has drive slots changed or has some mmc taken away TBool driveSelected( EFalse ); diff -r 03808033c9a2 -r 3785f754ee62 homesync/contentmanager/cmserver/cmstoremanager/src/cmsmfilemngr.cpp --- a/homesync/contentmanager/cmserver/cmstoremanager/src/cmsmfilemngr.cpp Wed Aug 18 10:02:50 2010 +0300 +++ b/homesync/contentmanager/cmserver/cmstoremanager/src/cmsmfilemngr.cpp Fri Sep 17 08:31:21 2010 +0300 @@ -279,7 +279,7 @@ iDBManager->PrepareQueryCmdL(EStoreRuleQuery); storeRule->SetNameL( *array[i] ); iDBManager->QueryStoreRuleL( storeRule ); - iRuleArray.Append( storeRule ); + iRuleArray.AppendL( storeRule ); CleanupStack::Pop(storeRule); } array.ResetAndDestroy(); @@ -511,7 +511,7 @@ { if( KErrNone == ms.Compare( *iMsIds[l]->iUuid ) ) { - aIds.InsertInOrder( iMsIds[l]->iId ); + aIds.InsertInOrderL( iMsIds[l]->iId ); // End loop l = iMsIds.Count(); } @@ -543,8 +543,8 @@ { HBufC8* uuid = mediaServer.AllocLC(); CCmSmMsInfo* msInfo = CCmSmMsInfo::NewLC( *uuid, id ); - tempIds.Append(id); - iMsIds.Append(msInfo); + tempIds.AppendL(id); + iMsIds.AppendL(msInfo); CleanupStack::Pop( msInfo ); CleanupStack::PopAndDestroy( uuid ); } @@ -614,7 +614,7 @@ if( itemOnSelectedList && ECmStored != statusValues[ index ] ) { - aItemIds.Append( i ); + aItemIds.AppendL( i ); } } } diff -r 03808033c9a2 -r 3785f754ee62 homesync/contentmanager/cmserver/cmstoremanager/src/cmsmvideoandimagemngr.cpp --- a/homesync/contentmanager/cmserver/cmstoremanager/src/cmsmvideoandimagemngr.cpp Wed Aug 18 10:02:50 2010 +0300 +++ b/homesync/contentmanager/cmserver/cmstoremanager/src/cmsmvideoandimagemngr.cpp Fri Sep 17 08:31:21 2010 +0300 @@ -162,7 +162,7 @@ i++ ) { CMdEObject* object = (CMdEObject*)query.TakeOwnershipOfResult(i); - iObjects.Append(object); + iObjects.AppendL(object); } } diff -r 03808033c9a2 -r 3785f754ee62 homesync/contentmanager/homesyncgsplugin/src/mssettingitemmemory.cpp --- a/homesync/contentmanager/homesyncgsplugin/src/mssettingitemmemory.cpp Wed Aug 18 10:02:50 2010 +0300 +++ b/homesync/contentmanager/homesyncgsplugin/src/mssettingitemmemory.cpp Fri Sep 17 08:31:21 2010 +0300 @@ -340,7 +340,7 @@ // add quota to drive info iDriveArray[i]->SetDriveQuota( quota ); // add selected drive to array - activeDrives.Append( iDriveArray[i] ); + activeDrives.AppendL( iDriveArray[i] ); } } diff -r 03808033c9a2 -r 3785f754ee62 homesync/contentmanager/homesyncwizard/src/cmsappwizard.cpp --- a/homesync/contentmanager/homesyncwizard/src/cmsappwizard.cpp Wed Aug 18 10:02:50 2010 +0300 +++ b/homesync/contentmanager/homesyncwizard/src/cmsappwizard.cpp Fri Sep 17 08:31:21 2010 +0300 @@ -353,7 +353,7 @@ { if ( iMediaServers.operator[](index)->CopyCapability() ) { - iStoreServers.Append( + iStoreServers.AppendL( iMediaServers.operator[]( index ) ); } } @@ -877,14 +877,14 @@ TTime timeStamp; timeStamp.HomeTime(); tempServer->SetVisibleDate( timeStamp ); - iMediaServers.Append( tempServer ); + iMediaServers.AppendL( tempServer ); if ( iStep == EStep9 ) { // Add only store servers in step EStep9 if ( tempServer->CopyCapability() ) { - iStoreServers.Append( tempServer ); + iStoreServers.AppendL( tempServer ); AddDeviceNameL( aDevice ); } } diff -r 03808033c9a2 -r 3785f754ee62 homesync/contentmanager/mediaservant/src/msappui.cpp --- a/homesync/contentmanager/mediaservant/src/msappui.cpp Wed Aug 18 10:02:50 2010 +0300 +++ b/homesync/contentmanager/mediaservant/src/msappui.cpp Fri Sep 17 08:31:21 2010 +0300 @@ -492,7 +492,7 @@ driveArray[j]->SetDriveQuota( quota ); driveArray[j]->SetStatus( ETrue ); - massDrives.Append( driveArray[j] ); + massDrives.AppendL( driveArray[j] ); MSEngine()->SetDrivesL( massDrives ); CleanupStack::PopAndDestroy( );// &massDrives //break, for only one mass memory exist diff -r 03808033c9a2 -r 3785f754ee62 homesync/contentmanager/mediaservant/src/msfillcontainer.cpp --- a/homesync/contentmanager/mediaservant/src/msfillcontainer.cpp Wed Aug 18 10:02:50 2010 +0300 +++ b/homesync/contentmanager/mediaservant/src/msfillcontainer.cpp Fri Sep 17 08:31:21 2010 +0300 @@ -220,7 +220,7 @@ for ( TInt index = 0; index < selected->Count(); index++ ) { - iSelectedLists.Append( (*selected)[index] ); + iSelectedLists.AppendL( (*selected)[index] ); } // Set highlighted item @@ -727,7 +727,7 @@ for ( TInt index = 0; index < selected->Count(); index++ ) { TInt a = (*selected)[index]; - iSelectedLists.Append( (*selected)[index] ); + iSelectedLists.AppendL( (*selected)[index] ); } } diff -r 03808033c9a2 -r 3785f754ee62 homesync/contentmanager/mediaservant/src/msfillrulecontroller.cpp --- a/homesync/contentmanager/mediaservant/src/msfillrulecontroller.cpp Wed Aug 18 10:02:50 2010 +0300 +++ b/homesync/contentmanager/mediaservant/src/msfillrulecontroller.cpp Fri Sep 17 08:31:21 2010 +0300 @@ -159,7 +159,7 @@ CMSFillList* list = CMSFillList::NewL( *iMSEngine, *rule ); // add list to array - iFillListArray.Append( list ); + iFillListArray.AppendL( list ); // stop for loop index = rulecount; @@ -426,7 +426,7 @@ CMSFillList* list = CMSFillList::NewLC( *iMSEngine, *rule ); // add rule to array - iFillListArray.Append( list ); + iFillListArray.AppendL( list ); CleanupStack::Pop( list ); } } diff -r 03808033c9a2 -r 3785f754ee62 homesync/contentmanager/mediaservant/src/msfillruleeditlist.cpp --- a/homesync/contentmanager/mediaservant/src/msfillruleeditlist.cpp Wed Aug 18 10:02:50 2010 +0300 +++ b/homesync/contentmanager/mediaservant/src/msfillruleeditlist.cpp Fri Sep 17 08:31:21 2010 +0300 @@ -230,7 +230,7 @@ { for( TInt i=0; i