--- a/uiservicetab/vimpstengine/src/cvimpstenginefactory.cpp	Wed Mar 31 21:14:49 2010 +0300
+++ b/uiservicetab/vimpstengine/src/cvimpstenginefactory.cpp	Wed Apr 14 15:46:18 2010 +0300
@@ -30,7 +30,7 @@
 #include <spnotifychange.h>
 #include <spsettings.h>
 
-#include "vimpstdebugtrace.h"
+#include "uiservicetabtracer.h"
 #include "cvimpstenginecvlistener.h"
 
 // ================= MEMBER FUNCTIONS =======================
@@ -43,6 +43,7 @@
 //
 EXPORT_C MVIMPSTEngineFactory* CVIMPSTEngineFactory::InstanceL()
     {
+	TRACER_AUTO;
     CVIMPSTEngineFactory* singleton;
     singleton = static_cast<CVIMPSTEngineFactory*> (Dll::Tls());
     if( !singleton )
@@ -63,6 +64,7 @@
 //
 EXPORT_C void CVIMPSTEngineFactory::Release()
     {
+	TRACER_AUTO;
     CVIMPSTEngineFactory* singleton;
     singleton = static_cast<CVIMPSTEngineFactory*>(Dll::Tls());
     if( singleton && !singleton->DecreamentRefereneCount())
@@ -92,7 +94,7 @@
 //
 void CVIMPSTEngineFactory::ConstructL()
     {
-    
+	TRACER_AUTO;
     CVIMPSTStorageManagerFactory::InitialiseLibraryL();
     
     //only 1 instance of iServiceTableFetcher shared between services
@@ -179,7 +181,7 @@
 void CVIMPSTEngineFactory::GetServiceEnginePtr
 					(RPointerArray<MVIMPSTEngine>& serviceIdArray) const
 	{
-	
+	TRACER_AUTO;
 	TInt count = iServiceItems.Count() ;
 	
     // iterate the service array
@@ -198,6 +200,7 @@
 TInt CVIMPSTEngineFactory::FindService(
 				TUint aServiceId ) const
 	{
+	TRACER_AUTO;
 	TInt count = iServiceItems.Count() ;
 	TInt ret = KErrNotFound;
     // iterate the service array
@@ -222,8 +225,8 @@
 void CVIMPSTEngineFactory::HandleNotifyChange(
     TServiceId aServiceId )
     {
-    TRACE( T_LIT("CVIMPSTEngineFactory::HandleNotifyChange start"));        
-    TRACE( T_LIT("HandleNotifyChange() serviceid: %d"), aServiceId );	
+	TRACER_AUTO;
+	TRACE( "serviceid: %d", aServiceId );	
 	
 	TBool newService = EFalse;
 	          
@@ -234,7 +237,6 @@
 	        
     TRAP_IGNORE( iServiceTableFetcher->DoHandleNotifyChangeL( aServiceId, newService, GetEngine(aServiceId) ) );
     
-    TRACE( T_LIT("CVIMPSTEngineFactory::HandleNotifyChange end"));        
     }
 
 // ---------------------------------------------------------------------------
@@ -243,9 +245,7 @@
 //
 void CVIMPSTEngineFactory::HandleError( TInt /*aError*/ )
     {
-    TRACE( T_LIT("CVIMPSTEngineFactory::HandleError() start"));
-
-    TRACE( T_LIT("CVIMPSTEngineFactory::HandleError() end"));
+	TRACER_AUTO;
         
     }			
     
@@ -255,6 +255,7 @@
 //
 MVIMPSTEngine* CVIMPSTEngineFactory::GetEngine( TServiceId aServiceId )
     {
+	TRACER_AUTO;
     TInt count = iServiceItems.Count();
     MVIMPSTEngine* engine = NULL;
     for(int i=0 ; i<count ; i++)