FCL/sf/app/conversations: comparison uiservicetab/vimpststorage/src/cvimpststoragecontactlist.cpp

equal deleted inserted replaced

-:796276a1bdcc
+:9fdee5e1da30
 #include "vimpststorageutils.h"
 #include "cvimpststoragecontactsorter.h"
 #include "mvimpststoragecontact.h"
 #include "mvimpststoragecontactsobserver.h"
 #include "tvimpststoragepanics.h"
-#include "vimpstdebugtrace.h"
+#include "uiservicetabtracer.h"
 #include "vimpstdebugassert.h"
 #include "cvimpststoragecontact.h"
 #include <MVPbkContactLink.h> //vpbk
 // -----------------------------------------------------------------------------
 //
 void CVIMPSTStorageContactList::ConstructL( const TDesC& aContactListId,
 const TDesC& aDisplayName )
 {
+	TRACER_AUTO;
 iListId = aContactListId.AllocL();
 iDisplayName = aDisplayName.AllocL();
 }
 // -----------------------------------------------------------------------------
 //
 CVIMPSTStorageContactList* CVIMPSTStorageContactList::NewL(CVIMPSTStorageContactSorter& aSorter,
 					                                      const TDesC& aContactListId,
 					                                      const TDesC& aDisplayName )
 {
+	TRACER_AUTO;
 CVIMPSTStorageContactList* self = NewLC(  aSorter,
 			                                  aContactListId,
 			                                  aDisplayName );
 CleanupStack::Pop( self );
 return self;
 //
 CVIMPSTStorageContactList* CVIMPSTStorageContactList::NewLC(CVIMPSTStorageContactSorter& aSorter,
 					                                       const TDesC& aContactListId,
 					                                       const TDesC& aDisplayName )
 {
+	TRACER_AUTO;
 CVIMPSTStorageContactList* self = new( ELeave ) CVIMPSTStorageContactList(aSorter );
 CleanupStack::PushL( self );
 self->ConstructL( aContactListId, aDisplayName );
 return self;
 }
 // CVIMPSTStorageContactList::AddStorageContactToCacheL
 // -----------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageContactList::AddStorageContactToCacheL( MVIMPSTStorageContact* aContact, TInt& aIndex )
 {
-TRACE( T_LIT("CVIMPSTStorageContactList::AddStorageContactToCacheL begin") );
+	TRACER_AUTO;
 if( !aContact )
 	    {
 	    return KErrArgument;
 	    }
 TPtrC userID = aContact->UserId();
-TRACE( T_LIT("CVIMPSTStorageContactList::AddStorageContactToCacheL userId = %S"), &userID );
+TRACE( " userId = %S", &userID );
 // optimize insert for inserting of reverse alphabetical order
 TInt idIndex( 0 );
 TInt count( iOrderedContacts.Count() );
-TRACE( T_LIT("CVIMPSTStorageContactList::AddStorageContactToCacheL count = %d"),count );
+TRACE("count = %d",count );
 if( count && aContact->UserId().Length() &&
 	 ( 0 <= VIMPSTStorageUtils::NeutralCompare( aContact->UserId(),
 								  iOrderedContacts[ 0 ]->UserId() ) ) )
 	{
-	TRACE( T_LIT("CVIMPSTStorageContactList::AddStorageContactToCacheL inside if") );
+TRACE( "inside if" );
 	// there are items and the contact should not be inserted to beginning
 	// => find the correct place
 	    TLinearOrder< MVIMPSTStorageContact > userIdOrder( *CompareUserIdAlphabetically );
 	    if( KErrNone == iOrderedContacts.FindInOrder( aContact, idIndex, userIdOrder ) )
 	    {
-	    TRACE( T_LIT("CVIMPSTStorageContactList::AddStorageContactToCacheL contact already exists.") );
+	    TRACE( "contact already exists." );
 // this contact already exists, return it
 return KErrAlreadyExists;
 }
 	}
-TRACE( T_LIT("CVIMPSTStorageContactList::AddStorageContactToCacheL inserting the contact") );
+TRACE( "inserting the contact" );
 // the position is now correct, insert the contact
 iOrderedContacts.InsertL( aContact, idIndex );
 // insert also to list sorted by contact "identification"
 TInt err( KErrNone );
 count = iContactArray.Count();
-TRACE( T_LIT("CVIMPSTStorageContactList::AddStorageContactToCacheL iContactsArray count %d"),count );
+TRACE( "iContactsArray count %d",count );
 TLinearOrder< MVIMPSTStorageContact >& order = iSorter.InsertOrder();
 if( count &&  0 > (*order)( aContact, iContactArray[ 0 ] ) )
 	{
 	// the item should be inserted in the beginning of the array
 		err = iContactArray.Insert( aContact, 0 );
 else
 	{
 	// insert in correct position
 	err = iContactArray.InsertInOrderAllowRepeats( aContact, order );
 	}
-TRACE( T_LIT("CVIMPSTStorageContactList::AddStorageContactToCacheL iContactsArray inserting error %d"),err );
+TRACE( "iContactsArray inserting error %d",err );
 if( err != KErrNone )
 {
 // appending to second array did not succeed, so remove from first and leave
 iOrderedContacts.Remove( idIndex );
 User::Leave( err );
 }
 aIndex = idIndex;
-TRACE( T_LIT("CVIMPSTStorageContactList::AddStorageContactToCacheL End") );
 return err;
 }
 // -----------------------------------------------------------------------------
 // CVIMPSTStorageContactList::RemoveContactFromCacheL
 // -----------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageContactList::RemoveContactFromCacheL( const TDesC& aContactId, TInt& aIndex )
 {
+	TRACER_AUTO;
 TInt orderedIndex(0);
 TInt contactIndex = FindContactIndex( aContactId, orderedIndex );
 	aIndex = contactIndex;
 if( KErrNotFound != contactIndex )
 {
 // CVIMPSTStorageContactList::RemoveContactFromCacheL
 // -----------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageContactList::RemoveContactFromCacheL( const MVPbkContactLink& aContactLink, TInt& index )
 {
+	TRACER_AUTO;
 TInt error = KErrNotFound;
 TInt orderedIndex(0);
 TInt contactIndex = FindContactByLinkL( aContactLink, orderedIndex );
 	index = contactIndex;
 if( KErrNotFound != contactIndex )
 // -----------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageContactList::ContactCount( TBool aSkipOfflineContacts,
 						   TBool aSkipBlocekedContacts ) const
 {
+	TRACER_AUTO;
 if( !aSkipOfflineContacts && !aSkipBlocekedContacts )
 {
 return iContactArray.Count();
 }
 TInt countOfContacts( 0 );
 // -----------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageContactList::FindContactIndex( const TDesC& aUserId,
 TInt& aOrderedIndex ) const
 {
+	TRACER_AUTO;
 TInt low( 0 );
 TInt high( iOrderedContacts.Count() );
 while( high > low )
 {
 TInt m( ( low + high ) / 2 );
 // CVIMPSTStorageContactList::ResortContact
 // -----------------------------------------------------------------------------
 //
 void CVIMPSTStorageContactList::ResortContact( MVIMPSTStorageContact* aContact )
 {
+	TRACER_AUTO;
 // let it panic, if index is not found, which would be bad
 TInt index( iContactArray.Find( aContact ) );
 __ASSERT_DEBUG( index != KErrNotFound , Panic( ESortingCorupted ));
 // Check if resort is even needed for the contact
 TLinearOrder< MVIMPSTStorageContact >& order = iSorter.InsertOrder();
 // -----------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageContactList::FindIndexOfContact( const MVIMPSTStorageContact* aContact,
 TVIMPSTEnums::TFilterType aFilter  ) const
 {
+	TRACER_AUTO;
 TInt count( iContactArray.Count() );
 if ( aFilter == TVIMPSTEnums::EFilterAll )
 		{
 for( TInt a( 0 ); a < count; ++a )
 {
 // From MVIMPSTStorageContactList
 // -----------------------------------------------------------------------------
 //
 MVIMPSTStorageContact& CVIMPSTStorageContactList::operator[]( TInt aIndex ) const
 {
+	TRACER_AUTO;
 __CHAT_ASSERT_DEBUG( aIndex < iContactArray.Count() )
 return *iContactArray[ aIndex ];
 }
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 //
 MVIMPSTStorageContact& CVIMPSTStorageContactList::FilteredContact(
 TInt aIndex, TVIMPSTEnums::TFilterType aFilter ) const
 	{
+	TRACER_AUTO;
 if ( aFilter == TVIMPSTEnums::EFilterAll )
 		{
 		return (*this)[aIndex];
 		}
 	else
 // -----------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageContactList::FilteredCount(
 TVIMPSTEnums::TFilterType aFilter ) const
 	{
+	TRACER_AUTO;
 if ( aFilter == TVIMPSTEnums::EFilterAll )
 		{
 		return Count();
 		}
 	TInt filtered( 0 );
 // -----------------------------------------------------------------------------
 //
 TBool CVIMPSTStorageContactList::FilterAllowsContact( const MVIMPSTStorageContact* aContact,
 TVIMPSTEnums::TFilterType aFilter ) const
 {
+	TRACER_AUTO;
 TBool showContact( EFalse );
 TInt myStatus( KErrNone );
 TVIMPSTEnums::TOnlineStatus status(
 aContact->OnlineStatus() );
 // CVIMPSTStorageContactList::FindContact
 // -----------------------------------------------------------------------------
 //
 MVIMPSTStorageContact* CVIMPSTStorageContactList::FindContact( const TDesC& aContactId )
 {
+	TRACER_AUTO;
 TInt orderedIndex(0);
 TInt contactIndex = FindContactIndex( aContactId, orderedIndex );
 return ( contactIndex >= 0 ? iContactArray[ contactIndex ] : NULL );
 }
 // -----------------------------------------------------------------------------
 // CVIMPSTStorageContactList::FindContactByContactLinkL
 // -----------------------------------------------------------------------------
 //
 MVIMPSTStorageContact* CVIMPSTStorageContactList::FindContactByContactLink( const MVPbkContactLink& aContactLink )
 {
+	TRACER_AUTO;
 TInt orderedIndex(0);
 TInt contactIndex = -1;
 TRAP_IGNORE( contactIndex = FindContactByLinkL( aContactLink, orderedIndex );)
 return ( contactIndex >= 0 ? iContactArray[ contactIndex ] : NULL );
 }
 // -----------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageContactList::FindContactByLinkL( const MVPbkContactLink& aContactLink,
 TInt& aIndexOrderedArray ) const
 {
+	TRACER_AUTO;
 TInt count( iOrderedContacts.Count() );
 TInt contactIndex = KErrNotFound;
 //Does a Linear Search
 for (TInt index = 0; index<count; index++)
 		{

branch	RCL_3
changeset 14	9fdee5e1da30
parent 0	5e5d6b214f4f