diff -r 2b4ea9893b66 -r 6b6920c56e2f locationtriggering/ltserver/ltserverlogic/src/lbtserverlogic.cpp --- a/locationtriggering/ltserver/ltserverlogic/src/lbtserverlogic.cpp Tue Aug 31 15:37:04 2010 +0300 +++ b/locationtriggering/ltserver/ltserverlogic/src/lbtserverlogic.cpp Wed Sep 01 12:24:21 2010 +0100 @@ -228,9 +228,7 @@ *iContainer, aType, *iSettingsManager); - CleanupStack::PushL( operation ); - iAOOArray.AppendL(operation); - CleanupStack::Pop( operation ); + iAOOArray.Append(operation); operation->StartOperationL(); break; } @@ -280,9 +278,7 @@ } CLbtListAOOperation* operation = CLbtListAOOperation::NewL(*this, aMessage, *iContainer, aType); - CleanupStack::PushL( operation ); - iAOOArray.AppendL(operation); - CleanupStack::Pop( operation ); + iAOOArray.Append(operation); operation->StartOperationL(); break; } @@ -303,9 +299,7 @@ CLbtTriggerModifyAOOperation* operation = CLbtTriggerModifyAOOperation::NewL(*this, aMessage, *iContainer, aType,*iSettingsManager); - CleanupStack::PushL( operation ); - iAOOArray.AppendL(operation); - CleanupStack::Pop( operation ); + iAOOArray.Append(operation); operation->StartOperationL(); break; } @@ -684,9 +678,7 @@ CLbtDeleteSessionTriggers* deleteSessionTriggers= CLbtDeleteSessionTriggers::NewL(*this,*iContainer,*iNotificationMap); - CleanupStack::PushL( deleteSessionTriggers ); - iDeleteSessionTriggersArray.AppendL(deleteSessionTriggers); - CleanupStack::Pop( deleteSessionTriggers ); + iDeleteSessionTriggersArray.Append(deleteSessionTriggers); deleteSessionTriggers->DeleteSessionTriggers(containerFilter); iNotificationMap->RemoveAllClientMessages(aSecureId); @@ -1116,7 +1108,7 @@ // Retrieve all client session notification messages. while(!iNotificationMap->Retreive(message, secureId, aServiceId) ) { - array.AppendL(message); + array.Append(message); } } @@ -1125,7 +1117,7 @@ aServiceId, CLbtServerLogicBase::TLbtManagementLibrary)) { - array.AppendL(message); + array.Append(message); } if(array.Count() == 0) @@ -1244,7 +1236,7 @@ while( !iNotificationMap->Retreive(message, sid, aServiceId) ) { - array.AppendL(message); + array.Append(message); } SetNotificationEventType(aOperation, event); @@ -1509,12 +1501,7 @@ while( !iNotificationMap->Retreive(message,ELbtNotifyTriggeringSysSettingChange, CLbtServerLogicBase::TLbtClientLibrary)) { - TInt error = messageArray.Append( message ); - if( error != KErrNone ) - { - LOG1("Failed to append message to the array:%d",error); - break; - } + messageArray.Append( message ); } if(messageArray.Count()) { @@ -1584,12 +1571,7 @@ while( !iNotificationMap->Retreive(message,ELbtNotifyTriggeringSysStatusChange, CLbtServerLogicBase::TLbtClientLibrary)) { - TInt error = messageArray.Append( message ); - if( error != KErrNone ) - { - LOG1("Failed to append to the array:%d",error); - break; - } + messageArray.Append( message ); } if( messageArray.Count() ) { @@ -1603,12 +1585,7 @@ while( !iNotificationMap->Retreive(message,ELbtNotifyTriggeringSysStatusChange, CLbtServerLogicBase::TLbtManagementLibrary)) { - TInt error = messageArray.Append( message ); - if( error != KErrNone ) - { - LOG1("Failed to append to the array:%d",error); - break; - } + messageArray.Append( message ); } if( messageArray.Count() ) {