--- 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;
}
--- 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 ) );
}
}
}
--- 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<CCmBaseListItem> items;
CleanupClosePushL( items );
- items.Append( iItems[index] );
+ items.AppendL( iItems[index] );
iDbManager->UpdateStatusValues( items );
items.Reset();
CleanupStack::PopAndDestroy( &items );
--- 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();
}
--- 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 );
--- 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 );
--- 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 );
}
}
}
--- 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);
}
}
--- 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] );
}
}
--- 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 );
}
}
--- 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
--- 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] );
}
}
--- 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 );
}
}
--- 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<count; i++ )
{
- iTrackArray.Append( iVideoTitleArray[i] );
+ iTrackArray.AppendL( iVideoTitleArray[i] );
}
}
@@ -1176,7 +1176,7 @@
}
// Remember IDs of template rules - rules will be set
// visible later
- iVisibleRules.Append( ruleId );
+ iVisibleRules.AppendL( ruleId );
// set value of rule
SetDefaultValue( ruleId, value );
@@ -1277,7 +1277,7 @@
// add only hidden items to the list
if ( SearchItemById( value )->IsHidden() )
{
- indexArray.Append( value );
+ indexArray.AppendL( value );
ruleNames->AppendL( text );
}
}
@@ -1418,28 +1418,28 @@
{
case ECmArtist:
{
- iArtistArray.Append( ruleParam );
+ iArtistArray.AppendL( ruleParam );
break;
}
case ECmAlbum:
{
- iAlbumArray.Append( ruleParam );
+ iAlbumArray.AppendL( ruleParam );
break;
}
case ECmGenre:
{
- iGenreArray.Append( ruleParam );
+ iGenreArray.AppendL( ruleParam );
break;
}
case ECmTitle:
{
if ( iMediaType == ECmAudio )
{
- iTrackArray.Append( ruleParam );
+ iTrackArray.AppendL( ruleParam );
}
else // video
{
- iVideoTitleArray.Append( ruleParam );
+ iVideoTitleArray.AppendL( ruleParam );
}
break;
@@ -1971,7 +1971,7 @@
{
for( TInt i=0; i<count; i++ )
{
- iTrackArray.Append( iVideoTitleArray[i] );
+ iTrackArray.AppendL( iVideoTitleArray[i] );
}
}
--- a/upnpavcontroller/upnpavcontrollerclient/src/upnpavcontrolleractive.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpavcontroller/upnpavcontrollerclient/src/upnpavcontrolleractive.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -416,7 +416,7 @@
}
CUPnPAVBrowsingSessionImpl* sessionImpl =
CUPnPAVBrowsingSessionImpl::NewL( iServer, aDevice );
- iBrowsingSessions.Append( sessionImpl );
+ iBrowsingSessions.AppendL( sessionImpl );
return *sessionImpl;
}
@@ -463,7 +463,7 @@
}
CUPnPAVRenderingSessionImpl* sessionImpl =
CUPnPAVRenderingSessionImpl::NewL( iServer, aDevice );
- iRenderingSessions.Append( sessionImpl );
+ iRenderingSessions.AppendL( sessionImpl );
return *sessionImpl;
}
@@ -510,7 +510,7 @@
}
CUPnPFileUploadSessionImpl* sessionImpl =
CUPnPFileUploadSessionImpl::NewL( iServer, aDevice );
- iUploadSessions.Append( sessionImpl );
+ iUploadSessions.AppendL( sessionImpl );
return *sessionImpl;
}
@@ -558,7 +558,7 @@
}
CUPnPFileDownloadSessionImpl* sessionImpl =
CUPnPFileDownloadSessionImpl::NewL( iServer, aDevice );
- iDownloadSessions.Append( sessionImpl );
+ iDownloadSessions.AppendL( sessionImpl );
return *sessionImpl;
}
--- a/upnpavcontroller/upnpavcontrollerhelper/src/upnpremoteitemresolver.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpavcontroller/upnpavcontrollerhelper/src/upnpremoteitemresolver.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -249,7 +249,7 @@
void CUPnPRemoteItemResolver::ProcessResultObjectL(
const CUpnpObject* aResult )
{
- if ( aResult->ObjectType() != EUPnPItem )
+ /* if ( aResult->ObjectType() != EUPnPItem )
{
User::Leave( KErrArgument );
}
@@ -305,7 +305,7 @@
if( item )
{
CleanupStack::PopAndDestroy( item );
- }
+ }*/
}
--- a/upnpavcontroller/upnpavcontrollerserver/src/upnpavcontrollerimpl.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpavcontroller/upnpavcontrollerserver/src/upnpavcontrollerimpl.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -514,7 +514,7 @@
iMediaServer, iServer, id, *buf );
CleanupStack::PopAndDestroy( buf );
- iPlaybackSessions.Append( tempPtr );
+ iPlaybackSessions.AppendL( tempPtr );
aMessage.Complete( KErrNone );
}
@@ -1161,7 +1161,7 @@
iMediaServer, iServer, id, *buf );
CleanupStack::PopAndDestroy( buf );
- iBrowsingSessions.Append( tempPtr );
+ iBrowsingSessions.AppendL( tempPtr );
aMessage.Complete( KErrNone );
}
@@ -1694,7 +1694,7 @@
CUPnPDownloadSession* tempPtr = CUPnPDownloadSession::NewL(
iServer, id, *buf );
CleanupStack::PopAndDestroy( buf );
- iDownloadSessions.Append( tempPtr );
+ iDownloadSessions.AppendL( tempPtr );
aMessage.Complete( KErrNone );
}
@@ -1938,7 +1938,7 @@
CUPnPUploadSession* tempPtr = CUPnPUploadSession::NewL(
iServer, id, *buf );
CleanupStack::PopAndDestroy( buf );
- iUploadSessions.Append( tempPtr );
+ iUploadSessions.AppendL( tempPtr );
aMessage.Complete( KErrNone );
}
--- a/upnpavcontroller/upnpavcontrollerserver/src/upnpavdeviceextended.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpavcontroller/upnpavcontrollerserver/src/upnpavdeviceextended.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -225,7 +225,7 @@
if( err == KErrNone && tmpInfo )
{
// Transfer ownership of tmpInfo
- iSinkProtocolInfo.Append( tmpInfo );
+ iSinkProtocolInfo.AppendL( tmpInfo );
}
else
{
@@ -276,7 +276,7 @@
if( err == KErrNone && tmpInfo )
{
// Transfer ownership of tmpInfo
- iSourceProtocolInfo.Append( tmpInfo );
+ iSourceProtocolInfo.AppendL( tmpInfo );
}
else
{
@@ -655,7 +655,7 @@
{
CUpnpDlnaProtocolInfo* tmpInfo = CUpnpDlnaProtocolInfo::NewL(
aProtocolInfo[ i ]->ProtocolInfoL() );
- iSourceProtocolInfo.Append( tmpInfo ); // Ownership is transferred
+ iSourceProtocolInfo.AppendL( tmpInfo ); // Ownership is transferred
}
}
@@ -672,7 +672,7 @@
{
CUpnpDlnaProtocolInfo* tmpInfo = CUpnpDlnaProtocolInfo::NewL(
aProtocolInfo[ i ]->ProtocolInfoL() );
- iSinkProtocolInfo.Append( tmpInfo ); // Ownership is transferred
+ iSinkProtocolInfo.AppendL( tmpInfo ); // Ownership is transferred
}
}
--- a/upnpavcontroller/upnpavcontrollerserver/src/upnpavdispatcher.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpavcontroller/upnpavcontrollerserver/src/upnpavdispatcher.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -1005,7 +1005,7 @@
tempInfo->SetObserver( aObserver );
//tempInfo->SetUuidL( aUuid );
CleanupStack::Pop( tempInfo );
- iActionInfos.Append( tempInfo );
+ iActionInfos.AppendL( tempInfo );
}
void CUPnPAVDispatcher::UnRegister( TInt aSessionId
@@ -1048,7 +1048,7 @@
tempInfo->SetObserver( aObserver );
tempInfo->SetUuidL( aUuid );
CleanupStack::Pop( tempInfo );
- iActionInfosEvent.Append( tempInfo );
+ iActionInfosEvent.AppendL( tempInfo );
}
void CUPnPAVDispatcher::UnRegisterEvents(
--- a/upnpavcontroller/upnpavcontrollerserver/src/upnpdevicerepository.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpavcontroller/upnpavcontrollerserver/src/upnpdevicerepository.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -183,7 +183,7 @@
ParseDeviceServicesL( aDevice, *dev );
CleanupStack::Pop( dev );
- iDevices.Append( dev );
+ iDevices.AppendL( dev );
}
// --------------------------------------------------------------------------
--- a/upnpavcontroller/upnpavcontrollerserver/src/upnpfiletransfersessionbase.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpavcontroller/upnpavcontrollerserver/src/upnpfiletransfersessionbase.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -254,7 +254,7 @@
__LOG1( "iEvent = %d", aEvent.iEvent );
__LOG1( "iKey = %d", aEvent.iKey );
__LOG1( "iStatus = %d", aEvent.iStatus );
- iEventQueu.Append( aEvent );
+ iEventQueu.AppendL( aEvent );
}
}
--- a/upnpavcontroller/upnpavcontrollerserver/src/upnpplaybacksession.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpavcontroller/upnpavcontrollerserver/src/upnpplaybacksession.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -1326,7 +1326,7 @@
// If iEventMessage is invalid and mute's value is
// right, we will append event to iEventQue.
// Else nothing to do.
- iEventQue.Append( unEvent );
+ iEventQue.AppendL( unEvent );
}
}
@@ -1359,7 +1359,7 @@
}
else
{
- iEventQue.Append( unEvent );
+ iEventQue.AppendL( unEvent );
}
}
@@ -1397,7 +1397,7 @@
else
{
__LOG( "AvtLastChangeEvent - appending playuser" );
- iEventQue.Append( event );
+ iEventQue.AppendL( event );
}
}
else if( aLastChange.Find( KStopped ) >= 0 &&
@@ -1416,7 +1416,7 @@
else
{
__LOG( "AvtLastChangeEvent - appending stopuser" );
- iEventQue.Append( event );
+ iEventQue.AppendL( event );
}
}
else if( aLastChange.Find( KPaused ) >= 0 &&
@@ -1436,7 +1436,7 @@
else
{
__LOG( "AvtLastChangeEvent - appending pauseuser" );
- iEventQue.Append( event );
+ iEventQue.AppendL( event );
}
}
}
--- a/upnpavcontroller/upnpavcontrollerserver/src/upnpuploadsession.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpavcontroller/upnpavcontrollerserver/src/upnpuploadsession.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -379,7 +379,7 @@
CUPnPResourceHelper* helper = CUPnPResourceHelper::NewL();
CleanupStack::Pop( tmpUpnpItem );
helper->SetItem( tmpUpnpItem ); // Transfer ownership
- iResources.Append( helper );
+ iResources.AppendL( helper );
iUploader->MoveToTransferQueueL( (TAny*)transferItem.iKey );
--- a/upnpavcontrolpoint/avcpengine/src/upnpavcpenginesession.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpavcontrolpoint/avcpengine/src/upnpavcpenginesession.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -98,7 +98,7 @@
CUpnpCommand* command = CUpnpCommand::NewL(iAVCPManager, *this, aMessage);
if (command)
{
- iCommandList.Append(command);
+ iCommandList.AppendL(command);
CleanupStack::PushL(command);
command->ExecuteL();
CleanupStack::Pop(command); // it will be destroyed after completion
--- a/upnpavcontrolpoint/avcpengine/src/upnpavcpmanager.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpavcontrolpoint/avcpengine/src/upnpavcpmanager.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -122,7 +122,7 @@
User::Leave(KErrNotFound);
}
CleanupStack::Pop(resolver);
- iPathResolvers.Append(resolver);
+ iPathResolvers.AppendL(resolver);
}
resolver->RegisterSession(aSession);
@@ -163,7 +163,7 @@
// -----------------------------------------------------------------------------
void CUpnpAVCPManager::RegisterForAction(MUpnpResponseHandler& aHandler)
{
- iPendingHandlers.Append(&aHandler);
+ iPendingHandlers.AppendL(&aHandler);
}
// -----------------------------------------------------------------------------
@@ -189,7 +189,7 @@
// -----------------------------------------------------------------------------
void CUpnpAVCPManager::RegisterForHttp(MUpnpHttpResponseHandler& aHandler)
{
- iHttpPendingHandlers.Append(&aHandler);
+ iHttpPendingHandlers.AppendL(&aHandler);
}
// -----------------------------------------------------------------------------
--- a/upnpavcontrolpoint/avcpengine/src/upnppathresolver.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpavcontrolpoint/avcpengine/src/upnppathresolver.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -122,7 +122,7 @@
TInt index = iAVCPSessions.Find(aSession);
if (index == KErrNotFound)
{
- iAVCPSessions.Append(aSession);
+ iAVCPSessions.AppendL(aSession);
}
}
@@ -203,7 +203,7 @@
elem->SetImportURIL(aImportURI);
}
CleanupStack::Pop(elem);
- iPathElements.Append(elem);
+ iPathElements.AppendL(elem);
return elem->Name();
}
@@ -254,7 +254,7 @@
{
CUpnpResolveHandler* handler = CUpnpResolveHandler::NewL(iManager,*this, aObserver);
CleanupStack::PushL(handler);
- iResolveHandlers.Append(handler);
+ iResolveHandlers.AppendL(handler);
handler->ResolveL(aPath);
CleanupStack::Pop(handler);
}
--- a/upnpavcontrolpoint/avcpengineclient/src/upnpavcpenginemsclient.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpavcontrolpoint/avcpengineclient/src/upnpavcpenginemsclient.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -50,7 +50,7 @@
for (TInt i = 0; i < size; i++)
{
- aDeviceList.Append(devices[i]);
+ aDeviceList.AppendL(devices[i]);
}
delete[] devices;
}
--- a/upnpavcontrolpoint/avcpengineclient/src/upnpavcpenginerfsclient.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpavcontrolpoint/avcpengineclient/src/upnpavcpenginerfsclient.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -70,7 +70,7 @@
for (TInt i = 0; i < size; i++)
{
CRsfwDirEnt* entry = GetFileInformationL(dirs[i]);
- aDirList.Append(entry);
+ aDirList.AppendL(entry);
}
delete[] dirs;
}
--- a/upnpframework/upnpaiwengine/src/upnpaiwengine.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpframework/upnpaiwengine/src/upnpaiwengine.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -882,13 +882,13 @@
}
if (fileTitle)
{
- fileTitles.Append(fileTitle);
+ fileTitles.AppendL(fileTitle);
}
}
aFilePaths.ResetAndDestroy();
for (TInt index = 0; index < fileTitles.Count(); index++)
{
- aFilePaths.Append(fileTitles[index]);
+ aFilePaths.AppendL(fileTitles[index]);
}
fileTitles.Reset();
--- a/upnpframework/upnpaiwengine/src/upnpdrmfilter.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpframework/upnpaiwengine/src/upnpdrmfilter.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -150,10 +150,10 @@
Filter , drmError :%d" , drmError );
// Add the file to aDRMProtectedFiles array.
- iDRMProtectedFiles.Append( iFiles[index + iStartPoint] );
+ iDRMProtectedFiles.AppendL( iFiles[index + iStartPoint] );
// save the drm file index to array. These files will be removed
// from the aFiles array soon.
- iRemovedIndexArray.Append( index + iStartPoint );
+ iRemovedIndexArray.AppendL( index + iStartPoint );
}
if ( KErrNone != drmError )
{
@@ -182,10 +182,10 @@
Filter , drmError :%d" , drmError );
// Add the file to aDRMProtectedFiles array.
- iDRMProtectedFiles.Append( iFiles[index + iStartPoint] );
+ iDRMProtectedFiles.AppendL( iFiles[index + iStartPoint] );
// save the drm file index to array. These files will be removed
// from the aFiles array soon.
- iRemovedIndexArray.Append( index + iStartPoint );
+ iRemovedIndexArray.AppendL( index + iStartPoint );
}
if ( KErrNone != drmError )
{
--- a/upnpframework/upnpcommonui/src/upnpadvfindlist.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpframework/upnpcommonui/src/upnpadvfindlist.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -305,7 +305,7 @@
CleanupStack::PushL( item );
item->CopyL( *aResultArray[count] );
//And if item is correct type
- iResultArray.Append( item ); // item ownership transferred
+ iResultArray.AppendL( item ); // item ownership transferred
CleanupStack::Pop( item );
}
}
--- a/upnpframework/upnpcommonui/src/upnpbrowsedialog.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpframework/upnpcommonui/src/upnpbrowsedialog.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -1580,12 +1580,12 @@
{
HBufC8* containerId =
( iResultArray[ 0 ]->ParentId() ).AllocL();
- iParentId.Append( containerId );
+ iParentId.AppendL( containerId );
// store parent name
HBufC8* name =
( iResultArray[ iSelectedItem ]->Title() ).AllocL();
- iParentName.Append( name );
+ iParentName.AppendL( name );
}
}
}
@@ -1672,7 +1672,7 @@
CleanupStack::PushL( container );
container->CopyL( *aResultArray[ index ] );
CleanupStack::Pop( container );
- iResultArray.Append( container );
+ iResultArray.AppendL( container );
}
else
{
@@ -1681,7 +1681,7 @@
CleanupStack::PushL( item );
item->CopyL( *aResultArray[ index ] );
CleanupStack::Pop( item );
- iResultArray.Append( item );
+ iResultArray.AppendL( item );
}
}
else if ( iBrowseDirection == EBackward )
@@ -1692,7 +1692,7 @@
CleanupStack::PushL( container );
container->CopyL( *aResultArray[ index ] );
CleanupStack::Pop( container );
- iResultArray.Insert( container, index );
+ iResultArray.InsertL( container, index );
iUppermostItem--;
}
else
@@ -1702,7 +1702,7 @@
CleanupStack::PushL( item );
item->CopyL( *aResultArray[ index ] );
CleanupStack::Pop( item );
- iResultArray.Insert( item, index );
+ iResultArray.InsertL( item, index );
iUppermostItem--;
}
}
@@ -2378,7 +2378,7 @@
TInt numberOfItems = iBrowseCacheItems[ aCacheIndex ]->GetNumberOfItems();
for ( TInt index = 0; index < numberOfItems; index++ )
{
- iTempArray.Append( iBrowseCacheItems[ aCacheIndex ]->
+ iTempArray.Appendl( iBrowseCacheItems[ aCacheIndex ]->
GetItem( index ) );
}
iUppermostItem = iBrowseCacheItems[ aCacheIndex ]->GetUpperMostItem();
@@ -2404,7 +2404,7 @@
iPrevHighlighteditem,
iUppermostItem );
CleanupStack::PushL( test );
- iBrowseCacheItems.Append( test );
+ iBrowseCacheItems.AppendL( test );
CleanupStack::Pop( test );
}
else //update current item
--- a/upnpframework/upnpmusicadapter/src/upnpalbumservices.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpframework/upnpmusicadapter/src/upnpalbumservices.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -132,8 +132,8 @@
RArray<TMPXAttribute> attrs;
CleanupClosePushL( attrs );
- attrs.Append( KMPXMediaGeneralId );
- attrs.Append( KMPXMediaGeneralTitle );
+ attrs.AppendL( KMPXMediaGeneralId );
+ attrs.AppendL( KMPXMediaGeneralTitle );
// Get album list from collection. Callback to HandleCollectionMediaL
iCollectionUtility->Collection().MediaL( *path, attrs.Array() );
@@ -368,8 +368,8 @@
RArray<TMPXAttribute> attrs;
CleanupClosePushL( attrs );
- attrs.Append( KMPXMediaGeneralId );
- attrs.Append( KMPXMediaGeneralTitle );
+ attrs.AppendL( KMPXMediaGeneralId );
+ attrs.AppendL( KMPXMediaGeneralTitle );
// Get album data. Callback to HandleCollectionMediaL
iCollectionUtility->Collection().MediaL( *mediaPath, attrs.Array() );
--- a/upnpframework/upnputilities/src/upnpmetadatautility.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpframework/upnputilities/src/upnpmetadatautility.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -95,11 +95,11 @@
RArray<TMetaDataFieldId> wantedFields;
CleanupClosePushL( wantedFields );
- wantedFields.Append( EMetaDataSongTitle );
- wantedFields.Append( EMetaDataArtist );
- wantedFields.Append( EMetaDataAlbum );
- wantedFields.Append( EMetaDataGenre );
- wantedFields.Append( EMetaDataDate );
+ wantedFields.AppendL( EMetaDataSongTitle );
+ wantedFields.AppendL( EMetaDataArtist );
+ wantedFields.AppendL( EMetaDataAlbum );
+ wantedFields.AppendL( EMetaDataGenre );
+ wantedFields.AppendL( EMetaDataDate );
// Reset to be sure that no allocations are left over
iMetaDataUtility->ResetL();
--- a/upnpharvester/cdssync/cdssynclib/src/cdssyncimplsql.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpharvester/cdssync/cdssynclib/src/cdssyncimplsql.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -349,7 +349,7 @@
KMetadataTypes[namesCount]
);
iSqlAo->Activate();
- iNames.Append( nameArray );
+ iNames.AppendL( nameArray );
}
break;
}
@@ -1127,7 +1127,7 @@
res->iProtocol = attrValue;
}
}
- iResources.Append( res );
+ iResources.AppendL( res );
CleanupStack::Pop( res );
}
}
@@ -1352,7 +1352,7 @@
currentTime.HomeTime();
item->SetHarvestDate( currentTime );
item->SetSearchId( iSearchIndex );
- iItemsToAdd.Append( item ); // transfer ownership
+ iItemsToAdd.AppendL( item ); // transfer ownership
ProgressL(1);
iProcessedItems++;
CleanupStack::Pop( item );
--- a/upnpharvester/common/cmlibrary/src/cmrule.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpharvester/common/cmlibrary/src/cmrule.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -71,7 +71,7 @@
{
CCmParam* param = CCmParam::NewLC();
param->SetComparisonDataL( aParam );
- iRuleParamsArray.Append( param ); // transfer ownership
+ iRuleParamsArray.AppendL( param ); // transfer ownership
CleanupStack::Pop( param );
TInt index = iRuleParamsArray.Count() - 1;
return index;
@@ -85,7 +85,7 @@
{
CCmParam* param = CCmParam::NewLC();
param->SetComparisonData( aParam );
- iRuleParamsArray.Append( param ); // transfer ownership
+ iRuleParamsArray.AppendL( param ); // transfer ownership
CleanupStack::Pop( param );
TInt index = iRuleParamsArray.Count() - 1;
return index;
--- a/upnpharvester/common/cmlibrary/src/cmsqlgenericitem.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpharvester/common/cmlibrary/src/cmsqlgenericitem.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -165,7 +165,7 @@
{
CCmSqlItemResource* item = CCmSqlItemResource::NewLC(
aUri, aSize, aDuration, aBitrate, aResolutionId );
- iResources.Append( item );
+ iResources.AppendL( item );
CleanupStack::Pop( item );
}
--- a/upnpharvester/common/cmlibrary/src/cmstorelistitem.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpharvester/common/cmlibrary/src/cmstorelistitem.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -81,7 +81,7 @@
TCmListItemStatus aStatus )
{
iDeviceIds.Append( aId );
- iStatusValues.Append( aStatus );
+ iStatusValues.AppendL( aStatus );
}
// ---------------------------------------------------------------------------
@@ -165,7 +165,7 @@
iStatusValues.Reset();
for( TInt i = 0; i < count; i++ )
{
- iStatusValues.Append( (TCmListItemStatus) aStream.ReadInt16L() );
+ iStatusValues.AppendL( (TCmListItemStatus) aStream.ReadInt16L() );
}
CCmBaseListItem::InternalizeL(aStream);
}
--- a/upnpharvester/common/cmlibrary/src/cmstorerule.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpharvester/common/cmlibrary/src/cmstorerule.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -104,7 +104,7 @@
{
CCmMediaServer* server = CCmMediaServer::NewLC();
server->SetUDNL( aUDN );
- iMediaServers.Append( server );
+ iMediaServers.AppendL( server );
CleanupStack::Pop( server );
TInt index = iMediaServers.Count() - 1;
return index;
@@ -389,7 +389,7 @@
// Then internalize them from the stream one by one
for (TInt index = 0; index < ruleCount; index++ )
{
- iRuleDefs.Append((TCmMediaType)aStream.ReadInt16L());
+ iRuleDefs.AppendL((TCmMediaType)aStream.ReadInt16L());
}
// cleanup
@@ -403,7 +403,7 @@
{
CCmMediaServer* server = CCmMediaServer::NewLC();
server->InternalizeL( aStream );
- iMediaServers.Append( server );
+ iMediaServers.AppendL( server );
CleanupStack::Pop( server );
server = NULL;
}
--- a/upnpharvester/common/cmsettings/src/cmsettingsengine.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpharvester/common/cmsettings/src/cmsettingsengine.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -511,7 +511,7 @@
driveInfo->SetDriveSize( volInfo.iSize );
driveInfo->SetDriveId( volInfo.iUniqueID );
- aDrives.Append( driveInfo );
+ aDrives.AppendL( driveInfo );
if ( memoryCardName )
{
--- a/upnpharvester/common/dbmanager/src/cmdmsqliteconnection.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpharvester/common/dbmanager/src/cmdmsqliteconnection.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -1361,7 +1361,7 @@
err = iStatement.Next() )
{
// Get cell contents
- mediaServerIds.Append(
+ mediaServerIds.AppendL(
iStatement.ColumnInt64(0) );
}
iStatement.Reset();
@@ -1410,7 +1410,7 @@
err = iStatement.Next() )
{
// Get cell content
- ruleIds.Append( iStatement.ColumnInt64( 0 ) );
+ ruleIds.AppendL( iStatement.ColumnInt64( 0 ) );
aFillRule->AddRuleL(
(TCmMetadataField)iStatement.ColumnInt( 1 ),
(TCmOperatorType)iStatement.ColumnInt( 2 ) );
@@ -1595,7 +1595,7 @@
err = iStatement.Next() )
{
// Get cell contents
- mediaServerIds.Append(
+ mediaServerIds.AppendL(
iStatement.ColumnInt64( 0 ));
}
iStatement.Reset();
@@ -1910,7 +1910,7 @@
filled->SetSize( size );
filled->SetListId( listId );
filled->SetDbId( fileId );
- aFilled.Append( filled );
+ aFilled.AppendL( filled );
CleanupStack::Pop( filled );
}
}
@@ -2098,7 +2098,7 @@
item->SetListId( iStatement.ColumnInt( 5 ) );
devId = iStatement.ColumnInt( 6 );
item->SetDevId( devId, (TCmListItemStatus)status );
- aItems.Append( item ); // transfer ownership
+ aItems.AppendL( item ); // transfer ownership
CleanupStack::Pop( item );
}
iStatement.Reset();
@@ -2152,7 +2152,7 @@
iStatement.ColumnInt( 15 ));
item->SetDriveId( iStatement.ColumnInt64( 16 ) );
item->SetDriveNumber( iStatement.ColumnInt( 17 ) );
- aItems.Append( item ); // transfer ownership
+ aItems.AppendL( item ); // transfer ownership
CleanupStack::Pop( item );
}
iStatement.Reset();
@@ -2204,7 +2204,7 @@
}
if( !found )
{
- aItems.Append( item ); // transfer ownership
+ aItems.AppendL( item ); // transfer ownership
CleanupStack::Pop( item );
}
else
@@ -2343,7 +2343,7 @@
drive->SetUsedDriveQuota( iStatement.ColumnInt64( 5 ) );
drive->SetDriveId( iStatement.ColumnInt64( 6 ) );
drive->SetStatus( (TBool)iStatement.ColumnInt( 7 ) );
- aDrives.Append( drive );
+ aDrives.AppendL( drive );
CleanupStack::Pop( drive );
}
iStatement.Reset();
--- a/upnpmediaserver/contentdirectoryservice/src/upnpcdutils.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpcdutils.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -624,7 +624,7 @@
//
TBool UpnpCdUtils::ValidateDateL( TPtrC8 aValue )
{
- TBool wrong = 0;
+ /* TBool wrong = 0;
TInt dateLength = aValue.Length();
@@ -824,7 +824,7 @@
{
return EFalse;
}
-
+*/
return ETrue;
}
--- a/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectory.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectory.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -1413,7 +1413,7 @@
//
TUpnpErrorCode CUpnpContentDirectory::ExportResourceL( CUpnpAction*& aAction )
{
- if ( iTransferController->IsMaxImportExportTransfers( ) )
+ /* if ( iTransferController->IsMaxImportExportTransfers( ) )
{
return ETransferBusy;
}
@@ -1530,7 +1530,7 @@
CleanupStack::PopAndDestroy( srcNoEsc );
CleanupStack::PopAndDestroy( rscBean );
CleanupStack::PopAndDestroy( srcBuf );
-
+*/
return EHttpOk;
}
@@ -2352,7 +2352,7 @@
iThumbnailCreators.AppendL( thumbCreator );
TInt index = iThumbnailCreators.Find( thumbCreator );
User::LeaveIfError( index );
- iThObjectIds.Insert( aObjectId, index );
+ iThObjectIds.InsertL( aObjectId, index );
CleanupStack::Pop( thumbCreator );
}
return thumbCreator;
--- a/upnpmediaserver/contentdirectoryservice/src/upnpelementfactory.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpelementfactory.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -144,6 +144,7 @@
TUpnpErrorCode CUpnpElementFactory::ValidateNewObjectL( const TXmlEngElement& aNewElement, TBool aNew, TBool aLocalSharing)
{
+ /*
TInt i;
TPtrC8 objectType = KItem();
@@ -606,7 +607,7 @@
// * has the all required fields (if some were missing, they are added)
// * had a proper xml structure (_not_ using UpnpDomInterface:: functions that do not care)
// * has for sure a mostly proper object structure
-
+*/
return EUndefined;
}
// -----------------------------------------------------------------------------
@@ -923,7 +924,7 @@
RXmlEngNodeList<TXmlEngElement> children;
CleanupClosePushL(children);
root.GetChildElements( children );
- children.HasNext();
+ // children.HasNext();
CleanupStack::PopAndDestroy(&children);
return children.Next();
}
@@ -943,7 +944,7 @@
ret.OpenL(iDOMImpl);
CleanupClosePushL(ret);
- if( aDocument.IsNull() || aDocument.DocumentElement().IsNull() )
+ /* if( aDocument.IsNull() || aDocument.DocumentElement().IsNull() )
{
User::Leave( KErrNotFound );
}
@@ -963,7 +964,7 @@
CleanupStack::PopAndDestroy(&children);
}
ret.SetDocumentElement(active);
-
+ */
CleanupStack::Pop(&ret);
return ret;
@@ -1209,7 +1210,7 @@
// if such type found
if ( objectDescription.NotNull() )
{
- aArray.Append( objectDescription );
+ aArray.AppendL( objectDescription );
}
/* This case is valid for any numeric value of containerID used in CreateObject() action
* We do some checking starting from 3rd string of <upnp:class> element, if the string isn't
--- a/upnpmediaserver/contentdirectoryservice/src/upnplocalstorage.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnplocalstorage.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -495,7 +495,7 @@
parentId = iMetadataStorage->GetParentIdL( aObjList[i] );
if ( parentId>=0 )
{
- objCommitedList.Append(parentId);
+ objCommitedList.AppendL(parentId);
// commit every KCommitEveryNum inserts
if( !( i%KCommitEveryNum ) )
{
--- a/upnpmediaserver/contentdirectoryservice/src/upnpmetadatastorage.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpmetadatastorage.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -1655,7 +1655,7 @@
CleanupStack::PushL( colSet );
TDbColNo colNo(colSet->ColNo( KObjParentIdColName ) );
ret = table.ColInt( colNo );
- aRefList.Append( ret );
+ aRefList.AppendL( ret );
CleanupStack::PopAndDestroy( colSet );
// delete the row
table.DeleteL( );
--- a/upnpmediaserver/contentdirectoryservice/src/upnpstatehandler.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpmediaserver/contentdirectoryservice/src/upnpstatehandler.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -185,7 +185,7 @@
//First time of modification, thus ID is 1.
// No magic (white nor black) used here.
cui.iUpdateId = 1;
- iContainerUpdateIds.Append( cui );
+ iContainerUpdateIds.AppendL( cui );
updateId = cui.iUpdateId;
}
else
@@ -243,7 +243,7 @@
newEl.iContainerId = properContainerID->AllocL();
newEl.iUpdateId = updateId;
- iCurrentContainerUpdateIds.Append(newEl);
+ iCurrentContainerUpdateIds.AppendL(newEl);
}
// preparing new value of 'ContainerUpdateIds' state variable ----
--- a/upnpmediaserver/mediaserverengine/src/upnpmediaserver.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpmediaserver/mediaserverengine/src/upnpmediaserver.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -839,7 +839,7 @@
void CUpnpMediaServer::SubscribeEvents(
MUpnpContentDirectoryEventObserver* aObserver )
{
- iObserverList.Append( aObserver );
+ iObserverList.AppendL( aObserver );
}
// -----------------------------------------------------------------------------
--- a/upnpmpxplugins/upnpplaybackplugins/src/upnpsingleton.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpmpxplugins/upnpplaybackplugins/src/upnpsingleton.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -288,7 +288,7 @@
TRAP_IGNORE( dev = CUpnpAVDevice::NewL( aDevice ) );
if( dev )
{
- iMediaRenderers.Append( dev );
+ iMediaRenderers.AppendL( dev );
if ( iRendererselectorObserver != 0 )
{
TRAP_IGNORE( DeliverNamesToObserverL( EFalse ) );
@@ -470,7 +470,7 @@
CUpnpAVDevice* device = (*devices)[ 0 ];
if( device->AudioCapability() )
{
- iMediaRenderers.Append( device );
+ iMediaRenderers.AppendL( device );
}
devices->Remove( 0 );
}
--- a/upnpmpxplugins/upnpplaybackplugins/src/upnptrack.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpmpxplugins/upnpplaybackplugins/src/upnptrack.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -412,7 +412,7 @@
iMetadataObserver = &aObs;
for( TInt i = 0; i < aAttrs.Count(); ++i )
{
- iQueriedAttributes.Append( aAttrs[i] );
+ iQueriedAttributes.AppendL( aAttrs[i] );
}
}
}
--- a/upnpsharing/upnpcontentserver/src/upnpcontainercheckerao.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpsharing/upnpcontentserver/src/upnpcontainercheckerao.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -293,7 +293,7 @@
{
tmpContainer = static_cast< CUpnpContainer* >(
iContainerList->operator[]( i ));
- iSharedContainerIds.Append(
+ iSharedContainerIds.AppendL(
UPnPCommonUtils::DesC8ToInt( tmpContainer->Id() ) );
}
@@ -587,7 +587,7 @@
void CUpnpContainerCheckerAo::ShareContainerL( TInt aPos )
{
__LOG8_1( "%s begin.", __PRETTY_FUNCTION__ );
- iTmpContainer = CUpnpContainer::NewL();
+ /* iTmpContainer = CUpnpContainer::NewL();
iTmpContainer->SetParentIdL( *UPnPCommonUtils::IntToDesC8LC(
KRootContainerId ) );
CleanupStack::PopAndDestroy(); //UPnPCommonUtils::IntToDesC8LC
@@ -623,7 +623,7 @@
CleanupStack::PopAndDestroy(); // UPnPCommonUtils::IntToDesC8LC
iCurrentOperation = EShareContainerResult;
SetActive();
- }
+ }*/
__LOG8_1( "%s end.", __PRETTY_FUNCTION__ );
}
--- a/upnpsharing/upnpcontentserver/src/upnpcontentserver.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpsharing/upnpcontentserver/src/upnpcontentserver.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -249,7 +249,7 @@
void CUpnpContentServer::Stop()
{
__LOG8_1( "%s begin.", __PRETTY_FUNCTION__ );
- if ( iIdle )
+ /* if ( iIdle )
{
iIdle->Cancel();
}
@@ -261,7 +261,7 @@
iIdle->Start( KShutdownTimeout,
KShutdownTimeout,
- TCallBack( Shutdown, this ) );
+ TCallBack( Shutdown, this ) );*/
__LOG8_1( "%s end.", __PRETTY_FUNCTION__ );
}
--- a/upnpsharing/upnpcontentserver/src/upnpcontentserverclient.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpsharing/upnpcontentserver/src/upnpcontentserverclient.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -180,7 +180,7 @@
{
__LOG8_1( "%s begin.", __PRETTY_FUNCTION__ );
- delete iSendBuffer;
+ /* delete iSendBuffer;
iSendBuffer = NULL;
iSendBuffer = CBufFlat::NewL( KTintSize );
@@ -200,7 +200,7 @@
SendReceive( ERequestSelectionContent,
TIpcArgs( &iSendBufferPtr, &iContentBufferPtr ),
aStatus );
- CleanupStack::PopAndDestroy( &sendstream );
+ CleanupStack::PopAndDestroy( &sendstream );*/
__LOG8_1( "%s end.", __PRETTY_FUNCTION__ );
}
@@ -298,7 +298,7 @@
{
__LOG8_1( "%s begin.", __PRETTY_FUNCTION__ );
- delete iSendBuffer;
+ /* delete iSendBuffer;
iSendBuffer = NULL;
iSendBuffer = CBufFlat::NewL( KTintSize );
@@ -312,7 +312,7 @@
SendReceive( ERefreshShareContent,
TIpcArgs( &iSendBufferPtr ),
aStatus );
- CleanupStack::PopAndDestroy( &stream );
+ CleanupStack::PopAndDestroy( &stream );*/
__LOG8_1( "%s end.", __PRETTY_FUNCTION__ );
}
@@ -328,7 +328,7 @@
{
__LOG8_1( "%s begin.", __PRETTY_FUNCTION__ );
- delete iSendBuffer;
+ /* delete iSendBuffer;
iSendBuffer = NULL;
iSendBuffer = CBufFlat::NewL( KTintSize );
@@ -345,7 +345,7 @@
SendReceive( EGetSelectionIndexes,
TIpcArgs( &iSendBufferPtr, &iReceiveBufferPtr ),
aStatus );
- CleanupStack::PopAndDestroy( &sendstream );
+ CleanupStack::PopAndDestroy( &sendstream );*/
__LOG8_1( "%s end.", __PRETTY_FUNCTION__ );
}
@@ -397,7 +397,7 @@
{
__LOG8_1( "%s begin.", __PRETTY_FUNCTION__ );
- delete iSendBuffer;
+ /* delete iSendBuffer;
iSendBuffer = NULL;
iSendBuffer = CBufFlat::NewL( KTintSize );
@@ -411,7 +411,7 @@
SendReceive( EStartConnectionMonitor,
TIpcArgs( &iSendBufferPtr ),
aStatus );
- CleanupStack::PopAndDestroy( &sendstream );
+ CleanupStack::PopAndDestroy( &sendstream );*/
__LOG8_1( "%s end.", __PRETTY_FUNCTION__ );
}
--- a/upnpsharing/upnpcontentserver/src/upnpcontentserverhandler.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpsharing/upnpcontentserver/src/upnpcontentserverhandler.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -83,7 +83,7 @@
void CUpnpContentServerHandler::ConstructL()
{
__LOG8_1( "%s begin.", __PRETTY_FUNCTION__ );
- static _LIT_SECURITY_POLICY_PASS(KAllowAllPolicy);
+ /* static _LIT_SECURITY_POLICY_PASS(KAllowAllPolicy);
static _LIT_SECURITY_POLICY_S0(KThisProcessPolicy,
KUpnpContentServerCat.iUid );
@@ -108,7 +108,7 @@
const TInt KRefreshDelay( 500000 );
iIdle->Start( KRefreshDelay, KRefreshDelay, cb );
iReader = CUpnpSelectionReader::NewL( NULL ); // metadata set later
- SetProgressL( KNoProgress );
+ SetProgressL( KNoProgress );*/
__LOG8_1( "%s end.", __PRETTY_FUNCTION__ );
}
@@ -277,7 +277,7 @@
// There is sharing ongoing, return the buffered selections
for( TInt i(0); i < sharingReq->iSelections.Count(); i++ )
{
- aMarkedItems.Append( sharingReq->iSelections[ i ] );
+ aMarkedItems.AppendL( sharingReq->iSelections[ i ] );
}
}
else
--- a/upnpsharing/upnpcontentserver/src/upnpcontentsharingao.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpsharing/upnpcontentserver/src/upnpcontentsharingao.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -594,7 +594,7 @@
void CUpnpContentSharingAo::ShareContainersL()
{
__LOG8_1( "%s begin.", __PRETTY_FUNCTION__ );
- iMetadataUtility->ClearPostFiltersL();
+ /* iMetadataUtility->ClearPostFiltersL();
TInt ind( 0 );
// Theres is still containers to share
@@ -688,7 +688,7 @@
}
iSharingState = EShareContainersResult;
- __LOG8_1( "%s end.", __PRETTY_FUNCTION__ );
+ __LOG8_1( "%s end.", __PRETTY_FUNCTION__ );*/
}
// --------------------------------------------------------------------------
--- a/upnpsharing/upnpcontentserver/src/upnpselectionreader.cpp Wed Aug 18 10:02:50 2010 +0300
+++ b/upnpsharing/upnpcontentserver/src/upnpselectionreader.cpp Fri Sep 17 08:31:21 2010 +0300
@@ -180,7 +180,7 @@
{
__LOG8_1( "%s begin.", __PRETTY_FUNCTION__ );
- if ( !aSettingsTextArray )
+/* if ( !aSettingsTextArray )
{
User::Leave( KErrGeneral );
}
@@ -255,7 +255,7 @@
iContainerCount = aSettingsTextArray->MdcaCount();
CleanupStack::PopAndDestroy( sharedStuff );
- __LOG8_1( "%s end.", __PRETTY_FUNCTION__ );
+ __LOG8_1( "%s end.", __PRETTY_FUNCTION__ );*/
}
@@ -268,7 +268,7 @@
{
__LOG8_1( "%s begin.", __PRETTY_FUNCTION__ );
- if ( !aSettingsTextArray )
+ /* if ( !aSettingsTextArray )
{
User::Leave( KErrGeneral );
}
@@ -343,7 +343,7 @@
iSelectedMusic->AppendL( KShareNoneIndex );
}
iContainerCount = aSettingsTextArray->MdcaCount();
- CleanupStack::PopAndDestroy( sharedStuff );
+ CleanupStack::PopAndDestroy( sharedStuff );*/
__LOG8_1( "%s end.", __PRETTY_FUNCTION__ );
}