diff -r 8ab6687fb94c -r 3adadc800673 telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxCompletion.cpp
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxCompletion.cpp	Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxCompletion.cpp	Fri Jun 11 14:49:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 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,7 +16,6 @@
 
 
 // INCLUDE FILES
-#include <ctsy/tflogger.h>
 #include "cmmfaxcompletion.h"
 #include "cmmcalltsy.h"
 
@@ -25,15 +24,15 @@
 CMmFaxCompletion::CMmFaxCompletion() : CBase(), iTsyReqHandle ( 0 ),
 	iTelObject( NULL )
     {
-TFLOGSTRING("TSY: CMmFaxCompletion::CMmFaxCompletion" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_CTOR_1, "TSY: CMmFaxCompletion::CMmFaxCompletion" );
     }
 
 CMmFaxCompletion::~CMmFaxCompletion()
     {
-TFLOGSTRING("TSY: CMmFaxCompletion::~CMmFaxCompletion");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_DTOR_1, "TSY: CMmFaxCompletion::~CMmFaxCompletion");
     if ( iTsyReqHandle )
         {
-TFLOGSTRING2("TSY: CMmFaxCompletion::~CMmFaxCompletion: request %d not completed!", iTsyReqHandle);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_DTOR_2, "TSY: CMmFaxCompletion::~CMmFaxCompletion: request %d not completed!", iTsyReqHandle);
         // Completion should not be done here, because in some cases
         // operations are completed automatically by ETel!
         // CompleteOperation(KErrCancel);
@@ -50,7 +49,7 @@
 void CMmFaxCompletion::CompleteOperation(
         TInt aError )     // error Value         
     {
-TFLOGSTRING2("TSY: CMmFaxCompletion::CompleteOperation iTsyReqHandle: %d", iTsyReqHandle );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_COMPLETEOPERATION_1, "TSY: CMmFaxCompletion::CompleteOperation iTsyReqHandle: %d", iTsyReqHandle );
     if ( 0 < iTsyReqHandle )
         {
         iTelObject->ReqCompleted( iTsyReqHandle, aError );
@@ -70,8 +69,7 @@
     {
     if ( 0 < iTsyReqHandle )
         {
-TFLOGSTRING3("TSY: CMmFaxCompletion::Configure overwriting previous request %d with %d",
-            iTsyReqHandle, aTsyReqHandle);
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_CONFIGURE_1, "TSY: CMmFaxCompletion::Configure overwriting previous request %d with %d",iTsyReqHandle, aTsyReqHandle);
         }
     
     iTsyReqHandle = aTsyReqHandle; 
@@ -88,7 +86,7 @@
         TTimeIntervalMicroSeconds& /*aCadence*/,    // cadence time
         TTime& /*aTime*/ )                          // time     
     {
-TFLOGSTRING("TSY: CMmFaxCompletion::GetCadenceAndTimeOfLastRing");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_GETCADENCEANDTIMEOFLASTRING_1, "TSY: CMmFaxCompletion::GetCadenceAndTimeOfLastRing");
     // Checking the usage of aCadence and aTime in the calling function
     // (fax server) shows that we don't need to change the values.
     // REINTERPRET_CAST(CTsyPhone*,iMmCall->Owner()->Owner())->
@@ -104,7 +102,7 @@
 void CMmFaxCompletion::RxConnectComplete(
         TInt aError )
     {
-TFLOGSTRING2("TSY: CMmFaxCompletion::RXConnectComplete ErrorValue: %d", aError);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_RXCONNECTCOMPLETE_1, "TSY: CMmFaxCompletion::RXConnectComplete ErrorValue: %d", aError);
     CMmCallTsy* mmCall = REINTERPRET_CAST(CMmCallTsy*, iTelObject);
 
     // This is a good place to fill missing remote party phone number.
@@ -140,7 +138,7 @@
 void CMmFaxCompletion::RxFaxDataComplete(
         TInt aError ) // in: an error value
     {
-TFLOGSTRING2("TSY: CMmFaxCompletion::RxFaxDataComplete ErrorValue: %d", aError);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_RXFAXDATACOMPLETE_1, "TSY: CMmFaxCompletion::RxFaxDataComplete ErrorValue: %d", aError);
     if ( 0 < iTsyReqHandle )
         {
         iTelObject->ReqCompleted( iTsyReqHandle, aError );
@@ -158,7 +156,7 @@
         TInt aError )
     {
 
-TFLOGSTRING2("TSY: CMmFaxCompletion::RxPostPageComplete ErrorValue: %d", aError );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_RXPOSTPAGECOMPLETE_1, "TSY: CMmFaxCompletion::RxPostPageComplete ErrorValue: %d", aError );
     if ( 0 < iTsyReqHandle)
         {
         iTelObject->ReqCompleted( iTsyReqHandle, aError );
@@ -175,7 +173,7 @@
 void CMmFaxCompletion::TxConnectComplete(
         TInt aError )	
     {
-TFLOGSTRING2("TSY: CMmFaxCompletion::TXConnectComplete ErrorValue: %d", aError);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_TXCONNECTCOMPLETE_1, "TSY: CMmFaxCompletion::TXConnectComplete ErrorValue: %d", aError);
 
     CMmCallTsy* mmCall = REINTERPRET_CAST(CMmCallTsy*,iTelObject);
 
@@ -201,7 +199,7 @@
 void CMmFaxCompletion::TxFaxDataComplete(
         TInt aError )
     {
-TFLOGSTRING2("TSY: CMmFaxCompletion::TxFaxDataComplete ErrorValue: %d", aError);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_TXFAXDATACOMPLETE_1, "TSY: CMmFaxCompletion::TxFaxDataComplete ErrorValue: %d", aError);
 
     if ( 0 < iTsyReqHandle )
         {
@@ -219,7 +217,7 @@
 void CMmFaxCompletion::TxPostPageComplete(
         TInt aError )
     {
-TFLOGSTRING2("TSY: CMmFaxCompletion::TxPostPageComplete ErrorValue: %d", aError );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_TXPOSTPAGECOMPLETE_1, "TSY: CMmFaxCompletion::TxPostPageComplete ErrorValue: %d", aError );
 
     if ( 0 < iTsyReqHandle )
         {
@@ -237,7 +235,7 @@
 void CMmFaxCompletion::FillAnswerback(
         CMmCallTsy* aMmCall ) 
     {
-TFLOGSTRING("TSY: CMmFaxCompletion::FillAnswerback");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_FILLANSWERBACK_1, "TSY: CMmFaxCompletion::FillAnswerback");
 
     if ( aMmCall )
         {
@@ -248,7 +246,7 @@
 
             if ( 0 == faxProgress->iAnswerback.Length() )
                 { 
-TFLOGSTRING("TSY: CMmFaxCompletion::FillAnswerback Getting missing remote number from call info");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_FILLANSWERBACK_2, "TSY: CMmFaxCompletion::FillAnswerback Getting missing remote number from call info");
                 // Copy remote party phone number to Progress chunk's 
                 // answerback field. Answerback will hold only leftmost 20 
                 // numbers if the number is longer than that.