diff -r 50de4d668bb6 -r 82c0024438c8 clfwrapper/ClientSrc/CCLFServerProxy.cpp --- a/clfwrapper/ClientSrc/CCLFServerProxy.cpp Wed Mar 31 22:19:07 2010 +0300 +++ b/clfwrapper/ClientSrc/CCLFServerProxy.cpp Wed Apr 14 16:24:03 2010 +0300 @@ -187,7 +187,7 @@ { iWasNotificationHandled = EFalse; - const TInt index = iIdsPendingUpdate.Find( aId ); + const TInt index = iIdsPendingUpdate.FindInOrder( aId ); if ( index != KErrNotFound ) { iWasNotificationHandled = ETrue; @@ -213,9 +213,9 @@ const TInt idCount( aItemIDArray.Count() ); for ( TInt i = 0; i < idCount; ++i ) { - if ( iIdsPendingUpdate.Find( aItemIDArray[ i ] ) == KErrNotFound ) + if ( iIdsPendingUpdate.FindInOrder( aItemIDArray[ i ] ) == KErrNotFound ) { - iIdsPendingUpdate.Append( aItemIDArray[ i ] ); + iIdsPendingUpdate.InsertInOrder( aItemIDArray[ i ] ); } } } @@ -271,7 +271,7 @@ if ( id != KNoId ) { - iIdsPendingRemoval.Append( id ); + iIdsPendingRemoval.InsertInOrder( id ); } } iObjectsPendingRemoval.ResetAndDestroy(); @@ -287,7 +287,7 @@ if ( aType == ENotifyRemove ) { - const TInt index = iIdsPendingRemoval.Find( aId ); + const TInt index = iIdsPendingRemoval.FindInOrder( aId ); if ( index != KErrNotFound ) { iWasNotificationHandled = ETrue; @@ -420,7 +420,7 @@ if ( aType == ENotifyRemove ) { - const TInt index = iIdsPendingRemoval.Find( aId ); + const TInt index = iIdsPendingRemoval.FindInOrder( aId ); if ( index != KErrNotFound ) { @@ -430,12 +430,12 @@ } else if ( aType == ENotifyAdd || aType == ENotifyModify ) { - const TInt index = iIdsPendingUpdate.Find( aId ); + const TInt index = iIdsPendingUpdate.FindInOrder( aId ); if ( index != KErrNotFound ) { iIdsPendingUpdate.Remove( index ); - const TInt handledIndex = iIdsHandled.Find( aId ); + const TInt handledIndex = iIdsHandled.FindInOrder( aId ); if( handledIndex != KErrNotFound ) { iIdsHandled.Remove( handledIndex ); @@ -444,7 +444,7 @@ } else if( iHarvestingOngoing ) { - iIdsHandled.Append( aId ); + iIdsHandled.InsertInOrder( aId ); iWasNotificationHandled = ETrue; } } @@ -596,7 +596,7 @@ id = iMdESession.RemoveObjectL( object.Id() ); if ( id != KNoId ) { - iIdsPendingRemoval.Append( id ); + iIdsPendingRemoval.InsertInOrder( id ); } } } @@ -687,14 +687,14 @@ object = iMdESession.GetObjectL( aUri ); if( object ) { - const TInt index = iIdsHandled.Find( object->Id() ); + const TInt index = iIdsHandled.FindInOrder( object->Id() ); if( index != KErrNotFound ) { iIdsHandled.Remove( index ); } else { - iIdsPendingUpdate.Append( object->Id() ); + iIdsPendingUpdate.InsertInOrder( object->Id() ); } } }