--- a/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmTsyFax.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmTsyFax.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,6 +16,7 @@
 
 
 //  INCLUDE FILES
+#include <ctsy/tflogger.h>
 #include "cmmtsyfax.h"
 #include "cmmfaxext.h"
 
@@ -27,12 +28,12 @@
     :  iFaxExt( aFaxExt )
     
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_CTOR_1 "TSY: CMmTsyFax::CMmTsyFax" );
+TFLOGSTRING("TSY: CMmTsyFax::CMmTsyFax" );
     }
 
 void CMmTsyFax::ConstructL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_CONSTRUCTL_1, "TSY: CMmTsyFax::ConstructL");
+TFLOGSTRING("TSY: CMmTsyFax::ConstructL");
     
     iTerminate     = EFalse;
     iDataDirection = EUnknown;
@@ -57,7 +58,7 @@
 CMmTsyFax* CMmTsyFax::NewL(
         CMmFaxExt* aFaxExt )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_NEWL_1, "TSY: CMmTsyFax::NewL");
+TFLOGSTRING("TSY: CMmTsyFax::NewL");
     //  Completes successfully if fax call has already been dialled creating
     //  a CFaxSession instance, and is not called if that is not true.
     CMmTsyFax* fax = new ( ELeave ) CMmTsyFax( aFaxExt );
@@ -71,7 +72,7 @@
 
 CMmTsyFax::~CMmTsyFax()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_DTOR_1, "TSY: CMmTsyFax::~CMmTsyFax" );
+TFLOGSTRING("TSY: CMmTsyFax::~CMmTsyFax" );
 
 	if( iFaxExt )
 		{
@@ -89,7 +90,7 @@
 void CMmTsyFax::CloseFax(
         TAny* aObj )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_CLOSEFAX_1, "TSY: CMmTsyFax::CloseFax");
+TFLOGSTRING("TSY: CMmTsyFax::CloseFax");
     
     ( ( CObject* )aObj )->Close();
     }
@@ -103,7 +104,7 @@
 TInt CMmTsyFax:: DeregisterNotification(
         const TInt /*aIpc*/ )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, DEREGISTERNOTIFICATION_1, "TSY: CMmTsyFax::DeregisterNotification");
+TFLOGSTRING("TSY: CMmTsyFax::DeregisterNotification");
     return KErrNone;
     }
 
@@ -115,7 +116,7 @@
 //
 void CMmTsyFax::Init()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_INIT_1, "TSY: CMmTsyFax::Init");
+TFLOGSTRING("TSY: CMmTsyFax::Init");
     }
 
 // ---------------------------------------------------------------------------
@@ -128,7 +129,7 @@
         const TTsyReqHandle aTsyReqHandle, 
         TDes8* aDes )                      
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_READ_1, "TSY: CMmTsyFax::Read : %d" , aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmTsyFax::Read : %d" , aTsyReqHandle);
 
     TInt errorCode( KErrNone );
 
@@ -172,7 +173,7 @@
         const TInt /*aIpc*/ 
         )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_REGISTERNOTIFICATION_1, "TSY: CMmTsyFax::RegisterNotification");
+TFLOGSTRING("TSY: CMmTsyFax::RegisterNotification");
     return KErrNone;
     }
 // ---------------------------------------------------------------------------
@@ -193,7 +194,7 @@
 //
 void CMmTsyFax::Terminate()
 	{    
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_TERMINATE_1, "TSY: CMmTsyFax::Terminate");
+TFLOGSTRING("TSY: CMmTsyFax::Terminate");
 	iTerminate = ETrue;
 	}
 
@@ -206,7 +207,7 @@
 TInt CMmTsyFax::TerminateFaxSession(
         const TTsyReqHandle aTsyReqHandle ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_TERMINATEFAXSESSION_1, "TSY: CMmTsyFax::TerminateFaxSession Handle: %d", aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmTsyFax::TerminateFaxSession Handle: %d", aTsyReqHandle);
     
     CFaxSession* session = iFaxExt->GetFaxSession();
 
@@ -235,7 +236,7 @@
 TInt CMmTsyFax::WaitForEndOfPage(
         const TTsyReqHandle aTsyReqHandle ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_WAITFORENDOFPAGE_1, "TSY: CMmTsyFax::WaitForEndOfPage  Handle:%d", aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmTsyFax::WaitForEndOfPage  Handle:%d", aTsyReqHandle);
 
     if ( !iFaxExt->GetFaxSession() 
          || iFaxExt->GetCallStatus() != RCall::EStatusConnected )
@@ -273,7 +274,7 @@
         const TTsyReqHandle aTsyReqHandle, 
         TDesC8* aDes )                     
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_WRITE_1, "TSY: CMmTsyFax::Write : %d" , aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmTsyFax::Write : %d" , aTsyReqHandle);
 
     TInt errorCode( KErrNone );