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

equal deleted inserted replaced

-:796276a1bdcc
+:9fdee5e1da30
 #include "cvimpststoragevpbkstorehandler.h"
 #include <MVPbkContactView.h>
 #include <CVPbkContactIdConverter.h>
 #include "mvimpststorageserviceview.h"
-#include "vimpstdebugtrace.h"
+#include "uiservicetabtracer.h"
 #include "tvimpstconsts.h"
 #include <CVPbkContactLinkArray.h>
 #include <MVPbkContactLink.h>
 #include "cvimpststoragecontact.h"
 #include "vimpststorageutils.h"
 CVIMPSTStorageVPbkLocalStore:: CVIMPSTStorageVPbkLocalStore( MVIMPSTStorageServiceCacheWriter& aServiceCacheWriter ):
 	CActive( CActive::EPriorityIdle ),
 iServiceCacheWriter( aServiceCacheWriter ),
 iFetchStep( EFetchingUnknown )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CVIMPSTStorageVPbkLocalStore()") );
+	TRACER_AUTO;
 CActiveScheduler::Add( this );
 }
 // ---------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::NewL
 //
 CVIMPSTStorageVPbkLocalStore* CVIMPSTStorageVPbkLocalStore::NewL( const TDesC& aContactDb,
 															 const TDesC& aServiceName,
 															 MVIMPSTStorageServiceCacheWriter& aServiceCacheWriter )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::NewL() begin") );
+	TRACER_AUTO;
 CVIMPSTStorageVPbkLocalStore* self = NewLC( aContactDb,
 										   aServiceName,
 											  aServiceCacheWriter);
 CleanupStack::Pop( self );
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::NewL() end") );
 return self;
 }
 // ---------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::NewLC
 CVIMPSTStorageVPbkLocalStore*
 CVIMPSTStorageVPbkLocalStore::NewLC( const TDesC& aContactDb,
 									const TDesC& aServiceName,
 									MVIMPSTStorageServiceCacheWriter& aServiceCacheWriter  )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::NewLC() begin") );
+	TRACER_AUTO;
 CVIMPSTStorageVPbkLocalStore* self =
 new (ELeave) CVIMPSTStorageVPbkLocalStore(aServiceCacheWriter);
 CleanupStack::PushL( self );
 self->ConstructL( aContactDb, aServiceName );
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::NewLC() end") );
 return self;
 }
 // ---------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::ConstructL
 // ---------------------------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::ConstructL( const TDesC& aContactDb, const TDesC& aServiceName )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ConstructL() begin") );
+	TRACER_AUTO;
 iVPbkStoreHandler = CVIMPSTStorageVPbkStoreHandler::NewL( aContactDb ,aServiceName, *this,ETrue );
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ConstructL() iVPbkStoreHandler created") );
+TRACE( "iVPbkStoreHandler created" );
 //construct the persistent store name
 iLocalDBName = HBufC::NewL( aServiceName.Length()+ KStorageExtn().Length());
 TPtr iLocalDBNamePtr = iLocalDBName->Des();
 iLocalDBNamePtr.Append(aServiceName);
 _LIT(KSpecialChar ,"/\\:*?<>\"");
 AknTextUtils :: StripCharacters(iLocalDBNamePtr,KSpecialChar);
 iLocalDBNamePtr.Append(KStorageExtn());
-TRACE( T_LIT("iLocalDBNamePtr: %S"), &iLocalDBNamePtr );
+TRACE( "iLocalDBNamePtr: %S", &iLocalDBNamePtr );
 MVPbkContactStore* defaultStore = iVPbkStoreHandler->GetDefaultStoreL( aContactDb );
 User::LeaveIfNull(defaultStore);
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ConstructL() defaultStore retrived") );
+TRACE("defaultStore retrived" );
 iIdConverter = CVPbkContactIdConverter::NewL(*defaultStore);
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ConstructL() iIdConverter created") );
+TRACE( "iIdConverter created" );
 User::LeaveIfError( iFs.Connect() );
 // Open existing or create new database.
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ConstructL() connected to file server") );
+TRACE( "connected to file server" );
 	if ( DbExists() )
 		{
-		TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ConstructL() local db exist") );
+		TRACE( "local db exist" );
 OpenDbL();
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ConstructL() open success") );
+TRACE( "open success" );
 		}
 	else
 		{
-		TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ConstructL() local db not exist") );
+		TRACE("local db not exist" );
 DoFreespaceLevelCheckL( KEmptyDbSize );
 CreateDbL();
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ConstructL() local db created") );
+TRACE("local db created");
 		}
 OpenTableL();
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ConstructL() OpenTableL success ") );
+TRACE("OpenTableL success " );
 iColset = iDb.ColSetL( KContactTable );
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ConstructL() iColset is set") );
+	TRACE( " iColset is set" );
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ConstructL() end") );
 }
 // ---------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::
 //      ~CVIMPSTStorageVPbkLocalStore
 // ---------------------------------------------------------------------------
 //
 CVIMPSTStorageVPbkLocalStore::~CVIMPSTStorageVPbkLocalStore()
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::~CVIMPSTStorageVPbkLocalStore() begin") );
+	TRACER_AUTO;
 iRetrivedContactArray.ResetAndDestroy();
 TRAP_IGNORE( ResetAndDestroyLocalArrayL() );
 CloseTable();
 delete iColset;
 delete iLocalDBName;
 delete iIdConverter;
 delete iInviteId;
 delete iVPbkStoreHandler;
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::~CVIMPSTStorageVPbkLocalStore() end") );
 }
 // ---------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::
 //      ResetAndDestroyLocalArrayL
 // ---------------------------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::ResetAndDestroyLocalArrayL()
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ResetAndDestroyLocalArrayL() begin") );
+	TRACER_AUTO;
 TInt count = iFetchContactsToBeAdded.Count();
 	while( count )
 	   	{
 	   	TVIMPSTContactInfo contactInf = iFetchContactsToBeAdded[ count-1 ];
 	   	iFetchContactsToBeAdded.Remove( count-1 );
 // not exist need to add
 iFetchContactsToBeAdded.Compress();
 count = iFetchContactsToBeAdded.Count();
 	   	}
 	iFetchContactsToBeAdded.Reset();
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ResetAndDestroyLocalArrayL() end") );
 }
 // ----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::LocalStore
 // ----------------------------------------------------------
 //
 TBool CVIMPSTStorageVPbkLocalStore::LocalStore() const
 	{
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::LocalStore() local store") );
+	TRACER_AUTO;
 	return ETrue;
 	}
 // ---------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL
 // ---------------------------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL(TVIMPSTVPbkStoreEvent aVPbkStoreEvent)
 	{
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() begin") );
+	TRACER_AUTO;
 	switch( aVPbkStoreEvent.iEventType )
 	    {
 	    case EVPbkContactReadCompleted:
 	    	{
-	    	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactReadCompleted started") );
+	    	TRACE( " EVPbkContactReadCompleted started" );
 	    	iServiceCacheWriter.NotifyServiceViewL(TVIMPSTEnums::EStorageContactReadComplete);
 	    	if( iFetchStep == EFetchingCalled )
 		    	{
-		    	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactReadCompleted EFetchingCalled ") );
+		    	TRACE( " EVPbkContactReadCompleted EFetchingCalled " );
 		    	IssueRequest();
 		    	}
 	    	iFetchStep = EContactReadComplete;
-	    	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EContactReadComplete completed ") );
+	    	TRACE( "EContactReadComplete completed " );
 		  	break;
 	    	}
 	    case EVPbkContactReading:
 		    {
 		    // a contact entry has been created in virtual database store
 			// create the cache contact
 			TInt32 linkId = iIdConverter->LinkToIdentifier(*aVPbkStoreEvent.iContactLink );
 			TDbColNo colNo = iColset->ColNo( KContactId );
 		    if ( SeekRowL( colNo, linkId ) )
 				{
-				TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactReading contact") );
+				TRACE( "EVPbkContactReading contact" );
 				/*
 					*	This is local store, that is phone book and service tab shares only one cdb file.
 					* 	in that case, if somebody edits the cdb file from contacts tab, then also we get the
 					* 	callback, then checking for entry in db table makes sens..
 				*/
 			// create the cache contact
 			TInt32 linkId = iIdConverter->LinkToIdentifier(*aVPbkStoreEvent.iContactLink );
 			TDbColNo colNo = iColset->ColNo( KContactId );
 			if( iFetchStep  == EFetchingOn )
 		         {
-		         TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactFetching contact") );
+		         TRACE( "EVPbkContactFetching contact" );
 		         WriteToStoreDbL( linkId );
 		         iServiceCacheWriter.AddContactToCacheL (*aVPbkStoreEvent.iContactLink ,
 		                 aVPbkStoreEvent.iUserId ,
 		                 aVPbkStoreEvent.iDisplayName ,
 		                 aVPbkStoreEvent.iAvatarContent,
 		                 TVIMPSTEnums::EStorageContactFetching );
 		      	IssueRequest();
 				}
 			else if ( SeekRowL( colNo, linkId ) )
 				{
-				TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactAdded start") );
+				TRACE( " EVPbkContactAdded start" );
 				/*
 					*	This is local store, that is phone book and service tab shares only one cdb file.
 					* 	in that case, if somebody edits the cdb file from contacts tab, then also we get the
 					* 	callback, then checking for entry in db table makes sens..
 				*/
 				iServiceCacheWriter.AddContactToCacheL (*aVPbkStoreEvent.iContactLink ,
 										 aVPbkStoreEvent.iUserId ,
 										 aVPbkStoreEvent.iDisplayName,
 										 aVPbkStoreEvent.iAvatarContent,
 										 TVIMPSTEnums::EStorageEventContactAddition  );
-				TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactAdded completed") );
+				TRACE( "EVPbkContactAdded completed" );
 				}
 			else if(  iInviteId )
 			    {
-			    TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() iInviteId accepted") );
+			    TRACE( "iInviteId accepted" );
 			    if( IsSameContactIdL( *iInviteId, aVPbkStoreEvent.iUserId ) )
 			        {
 			        WriteToStoreDbL( linkId );
 			        iServiceCacheWriter.AddContactToCacheL (*aVPbkStoreEvent.iContactLink ,
 			                aVPbkStoreEvent.iUserId ,
 			                aVPbkStoreEvent.iAvatarContent,
 			                TVIMPSTEnums::EStorageEventContactAddition );
 			        delete iInviteId;
 			        iInviteId = NULL;
 			        }
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() iInviteId accepted sucess") );
+TRACE( "iInviteId accepted sucess" );
 			    }
 			break;
 			}
 	   	case EVPbkContactSynchronizing:
 	   	    {
-	   	    TRACE( T_LIT("CVIMPSTStorageVPbkServerStore::HandleVPbkStoreEventL EVPbkContactSynchronizing " ) );
+	   	    TRACE( "EVPbkContactSynchronizing "  );
 	   	    // a contact entry has been created in virtual database store
 	   	    // create the cache contact
 	   	    TInt32 linkId = iIdConverter->LinkToIdentifier(*aVPbkStoreEvent.iContactLink );
 	   	    TDbColNo colNo = iColset->ColNo( KContactId );
 	   	    if ( SeekRowL( colNo, linkId ) )
 	   	                aVPbkStoreEvent.iAvatarContent,
 	   	                TVIMPSTEnums::EStorageContactFetching  );
 	   	        }
 	   	   if(iFetchStep == EFetchingOn)
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkServerStore::HandleVPbkStoreEventL  EVPbkContactSynchronizing fetchin on" ) );
+TRACE( "EVPbkContactSynchronizing fetchin on" );
 IssueRequest();
 }
-	   	    TRACE( T_LIT("CVIMPSTStorageVPbkServerStore::HandleVPbkStoreEventL EVPbkContactSynchronizing completed" ) );
+	   	    TRACE(" EVPbkContactSynchronizing completed"  );
 	   	    break;
 	   	    }
 		case EVPbkContactDeleted:
 		    {
-		    TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactDeleted") );
+		    TRACE( "EVPbkContactDeleted" );
 		    TInt32 linkId = iIdConverter->LinkToIdentifier(*aVPbkStoreEvent.iContactLink );
 		    // a contact entry has been deleted from virtual database store
 		    TDbColNo colNo = iColset->ColNo( KContactId );
 		    if ( SeekRowL( colNo, linkId ) )
 		        {
-		        TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactDeleted found in db") );
+		        TRACE( "EVPbkContactDeleted found in db" );
 		        // contatc found in local database ,delete from local database
 		        DeleteContactFromInternalStoreL( linkId );
-		        TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactDeleted deleted from db") );
+		        TRACE( "EVPbkContactDeleted deleted from db" );
 		         // delete from cache contact
 		    	iServiceCacheWriter.RemoveContactFromCacheL(*aVPbkStoreEvent.iContactLink,
 		    												TVIMPSTEnums::EStorageEventDeleteFromPbk );
-		    	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactDeleted deleted from cache") );
+		    	TRACE( "EVPbkContactDeleted deleted from cache" );
 		        }
 		    break;
 		    }
 		case EVPbkContactChanged:
 		    {
-		    TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactChanged ") );
+		    TRACE( "EVPbkContactChanged ");
 		    TInt32 linkId = iIdConverter->LinkToIdentifier(*aVPbkStoreEvent.iContactLink );
 		    TDbColNo colNo = iColset->ColNo( KContactId );
 		    if ( SeekRowL( colNo, linkId ) )
 		       {
-		       TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactChanged found in local db") );
+		       TRACE( "EVPbkContactChanged found in local db" );
 		       // found in the list update it
 		       iServiceCacheWriter.UpdateCacheContactL(*aVPbkStoreEvent.iContactLink ,
 					    						 	 aVPbkStoreEvent.iUserId ,
 					    							 aVPbkStoreEvent.iDisplayName,
 					    							 aVPbkStoreEvent.iAvatarContent );
-			   TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactChanged changed in cache") );
+			   TRACE( "EVPbkContactChanged changed in cache");
 		       }
 		    break;
 		    }
 	    case EVPbkContactRetriving:
 		    {
-		    TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactRetriving") );
+		    TRACE( "EVPbkContactRetriving");
 		    // in case of local we allow all
-		    TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactRetriving valid Id") );
+		    TRACE( "EVPbkContactRetriving valid Id");
 			CVIMPSTStorageContact* retrivedContact = CVIMPSTStorageContact::NewL( aVPbkStoreEvent.iUserId ,
 											    								  aVPbkStoreEvent.iDisplayName,
 											    								  *aVPbkStoreEvent.iContactLink,
 											    								  aVPbkStoreEvent.iAvatarContent);
 			iRetrivedContactArray.Append( retrivedContact ); // takes the ownership of retrivedContact
-			TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkContactRetriving valid Id added") );
+			TRACE( "EVPbkContactRetriving valid Id added" );
 			// keep the backup of retrieved contacts
 			// user can add later once it sent to server
 			break;
 		    }
 		case EVPbkUnknownChanges:
 		    {
-		    TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkUnknownChanges start") );
+		    TRACE("EVPbkUnknownChanges start" );
 		    DeleteAllContactFromInternalStoreL();
-		    TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkUnknownChanges all delete from db") );
+		    TRACE( " EVPbkUnknownChanges all delete from db" );
 		     // unknow mean all contact deleted from store
 		    iServiceCacheWriter.RemoveAllCacheContactsL();
-		    TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() EVPbkUnknownChanges all delete from cache") );
+		    TRACE( " EVPbkUnknownChanges all delete from cache" );
 		    break;
 		    }
 	    default:
 		 	break;
 	    }
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::HandleVPbkStoreEventL() end") );
 	}
 // --------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::IssueRequest
 // --------------------------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::IssueRequest()
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::IssueRequest() begin") );
+	TRACER_AUTO;
 if( !IsActive() )
 	    {
-	    TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::IssueRequest() SetActive") );
+	    TRACE( "SetActive" );
 	    TRequestStatus* status = &iStatus;
 	    User::RequestComplete( status, KErrNone );
 	    SetActive();
 	    }
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::IssueRequest() begin") );
 }
 // --------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::RunL
 // --------------------------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::RunL()
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RunL() begin") );
+	TRACER_AUTO;
 TInt count = iFetchContactsToBeAdded.Count();
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RunL() count to be added = %d "),count );
+TRACE( "count to be added = %d ",count );
 if( !count )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RunL() fetch completed " ) );
+TRACE(" fetch completed "  );
 iFetchStep = EContactReadComplete;
 iServiceCacheWriter.NotifyServiceViewL( TVIMPSTEnums::EStorageContactFetchComplete );
-		TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RunL() fetch completed notification sent" ) );
+		TRACE( "fetch completed notification sent"  );
 	    }
 else
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RunL() fetch in progress" ) );
+TRACE( "fetch in progress"  );
 iFetchStep  = EFetchingOn;
 TVIMPSTContactInfo contactInfoToAdd = iFetchContactsToBeAdded[0];
 MVIMPSTStorageContact* exist = iServiceCacheWriter.FindCacheContactByUserId( *contactInfoToAdd.iUserId );
 if( exist )
 	        {
 	        // contact is already exist ,send the notification about this
 	        iServiceCacheWriter.NotifyServiceViewL(TVIMPSTEnums::EStorageContactFetchExistInStore, exist );
-	        TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RunL() fetch in progress id exist" ) );
+	        TRACE( " fetch in progress id exist" );
 	        // process next
 	        IssueRequest();
 	        }
 	    else
 		    {
-		    TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RunL() fetch in progress create id in store called" ) );
+		    TRACE( "fetch in progress create id in store called"  );
 		     // pass the display NAme in place of NULL
 	iVPbkStoreHandler->CreateVPbkContactL( *contactInfoToAdd.iUserId, *contactInfoToAdd.iDisplayName ); // process always 0th item
 }
 iFetchContactsToBeAdded.Remove( 0 );
 delete contactInfoToAdd.iUserId;
 contactInfoToAdd.iUserId = NULL;
 delete contactInfoToAdd.iDisplayName;
 contactInfoToAdd.iDisplayName = NULL ;
 iFetchContactsToBeAdded.Compress();
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RunL() fetch in progress iFetchContactsToBeAdded ,one entry removed" ) );
+TRACE( "fetch in progress iFetchContactsToBeAdded ,one entry removed"  );
 }
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RunL() end") );
 }
 // --------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::DoCancel
 // --------------------------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::DoCancel()
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::DoCancel()") );
+	TRACER_AUTO;
 }
 // --------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::RunError
 // --------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageVPbkLocalStore::RunError( TInt aError )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RunError()") );
+	TRACER_AUTO;
 return aError;
 }
 //////////////////////////////////////////////////////////
 // ---------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageVPbkLocalStore::CreateVPbkContactL(const TDesC& aUserId,
 										   	  const TDesC& aDisplayName ,
 										   	  TBool aInvitationAutoAccept /* = EFalse */ )
 	{
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateVPbkContactL() begin") );
+	TRACER_AUTO;
 	TInt error = KErrGeneral;
 	if( aInvitationAutoAccept)
 	    {
-	    TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateVPbkContactL() autoaccept add contact") );
+	    TRACE("autoaccept add contact" );
 	    delete iInviteId;
 	    iInviteId = NULL;
 	    iInviteId = aUserId.AllocL();
 	    error = iVPbkStoreHandler->CreateVPbkContactL( *iInviteId,aDisplayName );
 	    }
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateVPbkContactL() error = %d"),error );
+	TRACE( "error = %d",error );
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateVPbkContactL() begin") );
 	return error;
 	}
 // ---------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::RemoveVPbkContactL
 // ---------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageVPbkLocalStore::RemoveVPbkContactL(const MVPbkContactLink& aContactLink)
 	{
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RemoveVPbkContactL() begin") );
+	TRACER_AUTO;;
 	TInt error = KErrNotFound;
 	// text now holds the name (or first field of the contact)
 	TInt32 linkId = iIdConverter->LinkToIdentifier(aContactLink);
 	// a contact entry has been deleted from virtual database store
 	TDbColNo colNo = iColset->ColNo( KContactId );
 	if ( SeekRowL( colNo, linkId ) )
 		{
-		TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RemoveVPbkContactL() link exist in db") );
+		TRACE( "link exist in db" );
 		// contatc found in local database ,delete from local database
 		DeleteContactFromInternalStoreL( linkId );
-		TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RemoveVPbkContactL() link deleted from db") );
+		TRACE( "link deleted from db" );
 		// delete from cache contact
 		error = iServiceCacheWriter.RemoveContactFromCacheL(aContactLink,
 															TVIMPSTEnums::EStorageEventContactDelete );
-		TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RemoveVPbkContactL() link deleted from cache") );
+		TRACE( "link deleted from cache" );
 		}
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RemoveVPbkContactL() error %d"),error );
+	TRACE("error %d",error );
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RemoveVPbkContactL() end") );
 return error;
 	}
 // ---------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::RemoveAllVPbkContactsL
 // ---------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageVPbkLocalStore::RemoveAllVPbkContactsL()
 	{
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RemoveAllVPbkContactsL() begin" ) );
+	TRACER_AUTO;
 	iRetrivedContactArray.ResetAndDestroy();
 	DeleteAllContactFromInternalStoreL();
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RemoveAllVPbkContactsL() all contacts deleted from db") );
+	TRACE( "all contacts deleted from db" );
 	iServiceCacheWriter.RemoveAllCacheContactsL();
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RemoveAllVPbkContactsL() all contacts deleted from cache") );
+	TRACE( "all contacts deleted from cache" );
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RemoveAllVPbkContactsL() end" ) );
 	return KErrNone;// local store : delete from local store ,own user has changed
 	}
 // ---------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::RetrieveVPbkXSPIdL
 // ---------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageVPbkLocalStore::RetrieveVPbkXSPIdL(const TDesC8& aPackedLinks )
 	{
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RetrieveVPbkXSPIdL() begin" ) );
+	TRACER_AUTO;
 	iRetrivedContactArray.ResetAndDestroy();
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RetrieveVPbkXSPIdL() iRetrivedContactArray Reset" ) );
+	TRACE( " iRetrivedContactArray Reset"  );
 iVPbkStoreHandler->RetrieveVPbkContactL( aPackedLinks );
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RetrieveVPbkXSPIdL() iRetrivedContactArray count= %d " ),iRetrivedContactArray.Count() );
+TRACE( "iRetrivedContactArray count= %d " ,iRetrivedContactArray.Count() );
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RetrieveVPbkXSPIdL() end " ) );
 return iRetrivedContactArray.Count();
 }
 // ---------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::GetRetrieveVPbkXSPIdL
 // ---------------------------------------------------------------------------
 //
 const TDesC& CVIMPSTStorageVPbkLocalStore::GetRetrieveVPbkXSPIdL(TInt aIndex )
 	{
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::GetRetrieveVPbkXSPIdL() begin" ) );
+	TRACER_AUTO;
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::GetRetrieveVPbkXSPIdL() aIndex = %d" ),aIndex );
+	TRACE( "aIndex = %d" ,aIndex );
 	MVIMPSTStorageContact* contact = NULL;
 	if( aIndex >= 0 && aIndex < iRetrivedContactArray.Count() )
 {
 contact = iRetrivedContactArray[ aIndex ];
 }
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::GetRetrieveVPbkXSPIdL() end" ) );
 return contact ? contact->UserId() : KNullDesC ;
 	}
 // ---------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::CreateRetriveVPbkContactL
 // ---------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageVPbkLocalStore::CreateRetriveVPbkContactL( TInt aIndexToUse  )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateRetriveVPbkContactL() begin" ) );
+	TRACER_AUTO;
 if( aIndexToUse < 0 && aIndexToUse >= iRetrivedContactArray.Count() )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateRetriveVPbkContactL() argument error" ) );
+TRACE( " argument error"  );
 return KErrArgument;
 }
 TInt error = KErrAlreadyExists;
 MVIMPSTStorageContact* retrivedContact = iRetrivedContactArray[ aIndexToUse ];
 	    {
 	    exist = iServiceCacheWriter.FindCacheContactByLink( *contactLink  );
 	    }
 if( !exist )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateRetriveVPbkContactL() adding to  cache" ) );
+TRACE( "adding to  cache" );
 MVPbkContactLink* link = retrivedContact->ContactLink();
 if( link )
 			{
 			CVIMPSTStorageContact* contactToAdd = CVIMPSTStorageContact::NewL( retrivedContact->UserId() ,
 												    					 	  retrivedContact->Name(),
 																	    	 retrivedContact->AvatarContent()
 																	    	 );
 			CleanupStack::PushL( contactToAdd );
 			TInt32 linkId = iIdConverter->LinkToIdentifier( *link );
 			error = iServiceCacheWriter.AddStorageContactToCacheL( contactToAdd ); // contactToAdd ownership is transfered
-			TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateRetriveVPbkContactL() adding to  cache done" ) );
+			TRACE( " adding to  cache done"  );
 			if( error == KErrNone )
 				{
 				CleanupStack::Pop(); // contactToAdd , Ownership is transfered to AddStorageContactToCacheL
 				WriteToStoreDbL( linkId );
 				}
 			else
 				{
 				CleanupStack::PopAndDestroy(); // contactToAdd
 				}
-			TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateRetriveVPbkContactL() adding to  db done" ) );
+			TRACE( " adding to  db done"  );
 			}
 }
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateRetriveVPbkContactL() error =%d" ),error );
+TRACE( "error =%d" ,error );
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateRetriveVPbkContactL() end" ) );
 return error;
 }
 // ---------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::deleteRetriveVPbkContactL
 // ---------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageVPbkLocalStore::deleteRetriveVPbkContactL( TInt aIndexToUse  )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::deleteRetriveVPbkContactL() begin" ) );
+	TRACER_AUTO;
 if( aIndexToUse < 0 && aIndexToUse >= iRetrivedContactArray.Count() )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::deleteRetriveVPbkContactL() argument error" ) );
+TRACE( "argument error" );
 return KErrArgument;
 }
 MVIMPSTStorageContact* retrivedContact = iRetrivedContactArray[ aIndexToUse ];
 MVPbkContactLink* contactLink = retrivedContact->ContactLink();
 // delete from cache contact
 MVPbkContactLink* link = contactLink->CloneLC();
 contactsToDelete->AppendL( link ); // takes ownership
 CleanupStack::Pop(); // link
 TInt error = iVPbkStoreHandler->RemoveVPbkContactL( *contactsToDelete );
 CleanupStack::PopAndDestroy(); // contactsToDelete
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::deleteRetriveVPbkContactL() begin" ) );
 return error;
 }
 // CVIMPSTStorageVPbkLocalStore::UpdateAvatarFieldDataL()
 // ---------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageVPbkLocalStore::UpdateAvatarFieldDataL(const MVPbkContactLink& aContactLink,
 														  const TDesC8& aAvatartData )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::UpdateAvatarFieldDataL()" ) );
+	TRACER_AUTO;
 return iVPbkStoreHandler->UpdateAvatarFieldDataL( aContactLink, aAvatartData );
 }
 // ---------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::RemoveAvatarFieldL()
 // ---------------------------------------------------------------------------
 //
 TInt CVIMPSTStorageVPbkLocalStore::RemoveAvatarFieldL(MVPbkStoreContact& aStoreContact)
 	{
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::RemoveAvatarFieldL()" ) );
+	TRACER_AUTO;
 	return iVPbkStoreHandler->RemoveAvatarFieldL( aStoreContact );
 	}
 // ---------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::AddVPbkFetchContactsL()
 // ---------------------------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::AddVPbkFetchContactsL( RArray <TPtrC>& aFirstNameList,
 RArray <TPtrC> &aServiceField )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::AddVPbkFetchContactsL() begin" ) );
+	TRACER_AUTO;
 // in case of server contacts delete all contacts
 ResetAndDestroyLocalArrayL();
 TInt count = aServiceField.Count();
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::AddVPbkFetchContactsL() count=%d" ),count );
+TRACE( " count=%d" ,count );
 for( TInt i = 0; i<count; i++ )
 {
 TVIMPSTContactInfo contactInf =
 							         {
 							         aServiceField[i].AllocL() ,
 // not exist need to add
 iFetchContactsToBeAdded.Append( contactInf );
 }
 if( iFetchStep == EContactReadComplete )
 	     {
-	     TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::AddVPbkFetchContactsL() start fetcing" ) );
+	     TRACE( "start fetcing"  );
 	     IssueRequest();
 	     }
 	 else
 		 {
-		 TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::AddVPbkFetchContactsL() EFetchingCalled" ) );
+		 TRACE( " EFetchingCalled"  );
 		 iFetchStep = EFetchingCalled;
 		 }
-	 TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::AddVPbkFetchContactsL() end" ) );
 }
 //******************* Database Operations *********************************//
 // -----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::DbExists
 // -----------------------------------------------------------
 //
 TBool CVIMPSTStorageVPbkLocalStore::DbExists()
 	{
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::DbExists() begin" ) );
+	TRACER_AUTO;
 	RFile temp;
 	TBuf< KMaxPath > storagePath;
 	storagePath.Append( KDbPath );
 	temp.Close();
 	if ( (size == 0) || ( err != KErrNone ) )
 		{
 		ret = EFalse;
 		}
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::DbExists() end" ) );
 	return ret;
 	}
 // -----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::CreateDbL
 // -----------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::CreateDbL()
 	{
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateDbL() begin" ) );
+	TRACER_AUTO;
 	TBuf< KMaxPath > storagePath;
 	storagePath.Append( KDbPath );
 	iFs.MkDirAll( storagePath );    // make sure the directory exists
 storagePath.Append( *iLocalDBName );
 iFs.SetAtt( *iLocalDBName ,KEntryAttHidden|KEntryAttSystem , KEntryAttNormal);
 TStreamId streamId( 0 );
 	TRAPD( err, streamId = iDb.CreateL( iFileStore ) );
 if( err )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateDbL() err = %d" ),err );
+TRACE( " err = %d" ,err );
 delete iFileStore;
 iFileStore = NULL;
 // remember to keep this updated
 iFs.Delete( storagePath );
 iFileStore = NULL;
 iDb.Close();
 iFs.Delete( storagePath );
 User::Leave( err3 );
 }
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateDbL() end" ) );
 }
 // -----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::OpenDbL
 // -----------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::OpenDbL()
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::OpenDbL() begin" ) );
+	TRACER_AUTO;
 TBuf< KMaxPath > storagePath;
 storagePath.Append( KDbPath );
 storagePath.Append( *iLocalDBName );
 iFileStore = CPermanentFileStore::OpenL( iFs, storagePath, EFileShareReadersOrWriters|EFileWrite );
 iFileStore->SetTypeL( iFileStore->Layout() );
 iDb.OpenL( iFileStore, iFileStore->Root() );
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::OpenDbL() begin" ) );
 }
 // -----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::CloseDb
 // -----------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::CloseDb()
 	{
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CloseDb() begin" ) );
+	TRACER_AUTO;
 delete iFileStore;
 iFileStore = NULL;
 iDb.Close();
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CloseDb() end" ) );
 }
 // -----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::CreateTablesL
 // -----------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::CreateTablesL()
 	{
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateTablesL() begin" ) );
+	TRACER_AUTO;
 	CDbColSet* contactId = CDbColSet::NewLC();
 	AddColumnL( KContactId, EDbColInt32, contactId );
 	TInt err = iDb.CreateTable( KContactTable, *contactId );
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateTablesL() err = %d" ),err );
+	TRACE( "err = %d" ,err );
 	User::LeaveIfError( err );
 	CleanupStack::PopAndDestroy( contactId );
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CreateTablesL() end" ) );
 	}
 // -----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::AddColumnL
 // -----------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::AddColumnL( const TDesC& aName, TDbColType aType, CDbColSet* aColset  )
 	{
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::AddColumnL() begin" ) );
+	TRACER_AUTO;
 	TDbCol column( aName, aType );
 	aColset->AddL( column );
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::AddColumnL() end" ) );
 	}
 // -----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::DoFreespaceLevelCheckL
 // -----------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::DoFreespaceLevelCheckL( TInt aSize )
 	{
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::DoFreespaceLevelCheckL() begin" ) );
+	TRACER_AUTO;
 if ( SysUtil::FFSSpaceBelowCriticalLevelL( &iFs, aSize ) )
 {
 		User::Leave( KErrDiskFull );
 }
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::DoFreespaceLevelCheckL() end" ) );
 	}
 // -----------------------------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::DeleteAllContactFromInternalStoreL
 // -----------------------------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::DeleteAllContactFromInternalStoreL()
 	{
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::DeleteAllContactFromInternalStoreL() begin" ) );
+	TRACER_AUTO;
 	iColset->ColNo( KContactId );
 	iTable.LastL();
 	while( !iTable.IsEmptyL() )
 		{
 		iTable.GetL();
 		iTable.DeleteL();
 		iDb.Compact();
 		// delete alwasy first item untill table is empty
 		iTable.LastL();
 		}
-	TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::DeleteAllContactFromInternalStoreL() end" ) );
 	}
 // ----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::DeleteContactFromInternalStoreL
 // ----------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::DeleteContactFromInternalStoreL( TInt32& aIdentifier )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::DeleteContactFromInternalStoreL() begin" ) );
+	TRACER_AUTO;
 TDbColNo colNo = iColset->ColNo( KContactId );
 if ( SeekRowL( colNo, aIdentifier ) )
 {
 iTable.DeleteL();
 iDb.Compact();
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::DeleteContactFromInternalStoreL() found deleted" ) );
+TRACE( "found deleted"  );
 }
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::DeleteContactFromInternalStoreL() end" ) );
 }
 // ----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::WriteToStoreDbL
 // ----------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::WriteToStoreDbL( TInt32& aIdentifier )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::WriteToStoreDbL() begin" ) );
+	TRACER_AUTO;
 TDbColNo colNo = iColset->ColNo( KContactId );
 if (!SeekRowL( colNo, aIdentifier ) )
 {
 iTable.InsertL();
 // recover
 iTable.Cancel();
 iTable.Reset();
 }
 }
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::WriteToStoreDbL() end" ) );
 }
 // ----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::OpenTableL
 // ----------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::OpenTableL()
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::OpenTableL() begin" ) );
+	TRACER_AUTO;
 TInt err( iTable.Open( iDb, KContactTable ) );
 if ( err != KErrNone )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::OpenTableL() err =%d" ),err );
+TRACE( " err =%d" ,err );
 iTable.Close();
 User::Leave( err );
 }
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::OpenTableL() end" ) );
 }
 // ----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::CloseTable
 // ----------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::CloseTable()
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CloseTable() begin" ) );
+	TRACER_AUTO;
 iTable.Close();
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::CloseTable() end" ) );
 }
 // ----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::ReadFirstL
 // ----------------------------------------------------------
 //
 TInt CVIMPSTStorageVPbkLocalStore::ReadFirstL(  TInt32& aIdentifier )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ReadFirstL() begin" ) );
+	TRACER_AUTO;
 iTable.BeginningL();
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ReadFirstL() end" ) );
 return ReadNextL( aIdentifier );
 }
 // ----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::ReadNextL
 // ----------------------------------------------------------
 //
 TInt CVIMPSTStorageVPbkLocalStore::ReadNextL( TInt32& aIdentifier )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ReadNextL() begin" ) );
+	TRACER_AUTO;
 TInt err = KErrNotFound;
 if ( iTable.NextL() )
 {
 TRAP( err, ReadCurrentL( aIdentifier ) );
 		// For some reason ReadCurrentL leaves with KErrEof,
 // even if the contact was read succesfully.
 }
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ReadNextL() err = %d" ),err );
+TRACE( " err = %d" ,err );
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ReadNextL() end" ) );
 return err;
 }
 // ----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::ReadCurrentL
 // ----------------------------------------------------------
 //
 void CVIMPSTStorageVPbkLocalStore::ReadCurrentL( TInt32& aIdentifier )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ReadCurrentL() begin" ) );
+	TRACER_AUTO;
 iTable.GetL();
 	 // Get Column number for contact data size
 TDbColNo colNo = iColset->ColNo( KContactId );
 aIdentifier = iTable.ColInt32(colNo);
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::ReadCurrentL() end" ) );
 }
 // ----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::SeekRowL
 // ----------------------------------------------------------
 //
 TBool CVIMPSTStorageVPbkLocalStore::SeekRowL( TDbColNo aColNo, TInt32& aIdentifier )
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::SeekRowL() begin" ) );
+	TRACER_AUTO;
 TBool ret = EFalse;
 iTable.BeginningL();
 while ( iTable.NextL() )
 {
 iTable.GetL();
 {
 ret = ETrue;
 break;
 }
 }
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::SeekRowL() end" ) );
 return ret;
 }
 // ----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::DeleteDatabaseL
 // ----------------------------------------------------------
 void CVIMPSTStorageVPbkLocalStore::DeleteDatabaseL()
 {
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::DeleteDatabaseL() begin" ) );
+	TRACER_AUTO;
 TBuf< KMaxPath > storagePath;
 storagePath.Append( KDbPath );
 iFs.MkDirAll( storagePath );
 storagePath.Append( *iLocalDBName );
 //close db before deleting it.
 CloseDb();
 iFs.Delete( storagePath );
-TRACE( T_LIT("CVIMPSTStorageVPbkLocalStore::DeleteDatabaseL() end" ) );
 }
 // ----------------------------------------------------------
 // CVIMPSTStorageVPbkLocalStore::IsSameContactIdL
 // ----------------------------------------------------------
 TBool CVIMPSTStorageVPbkLocalStore::IsSameContactIdL(const TDesC& aFirstId, const TDesC& aSecondId )
 {
+	TRACER_AUTO;
 TInt colIndex = aFirstId.Find(_L(":"));
 TPtrC firstId = aFirstId.Right( aFirstId.Length() - colIndex -1);
 colIndex = aSecondId.Find(_L(":"));
 TPtrC secondId = aSecondId.Right( aSecondId.Length() - colIndex -1);
 //if( Compare( firstId,secondId  ) == 0 )

branch	RCL_3
changeset 14	9fdee5e1da30
parent 0	5e5d6b214f4f