--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsy.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,14 +16,9 @@
 
 
 //INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmdtmftsyTraces.h"
-#endif
-
 #include "cmmdtmftsy.h"
 #include <etelmmcs.h> 
+#include <ctsy/tflogger.h> 
 
 // include internal Tsy classes
 #include "cmmphonetsy.h"
@@ -64,7 +59,7 @@
     
 CMmDtmfTsy::~CMmDtmfTsy()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_DTOR_1, "TSY: CMmDtmfTsy::~CMmDtmfTsy");
+    TFLOGSTRING("TSY: CMmDtmfTsy::~CMmDtmfTsy");
     if (iMmPhone )
         {
         // deregister tsy object from message manager
@@ -150,7 +145,7 @@
 // ---------------------------------------------------------------------------
 TInt CMmDtmfTsy::NotifyDTMFEvent( TInt* aInfo )
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_NOTIFYDTMFEVENT_1, "TSY: CMmDtmfTsy::NotifyDTMFEvent");
+TFLOGSTRING("TSY: CMmDtmfTsy::NotifyDTMFEvent");
 
 	iDtmfInfo = aInfo; // save pointer to client data
 
@@ -167,7 +162,7 @@
 //
 void CMmDtmfTsy::CompleteNotifyDTMFEvent( TInt aInfo )
      {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_COMPLETENOTIFYDTMFEVENT_1, "TSY: CMmCustomTsy::CompleteNotifyDtmfEvent");
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyDtmfEvent");
     // reset request handle. Returns the deleted req handle.
 	TTsyReqHandle reqHandle =	
 		iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -188,7 +183,7 @@
 // ---------------------------------------------------------------------------
 TInt CMmDtmfTsy::NotifyDTMFEventCancel( const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_NOTIFYDTMFEVENTCANCEL_1, "TSY: CMmDtmfTsy::NotifyDtmfEventCancel");
+TFLOGSTRING("TSY: CMmDtmfTsy::NotifyDtmfEventCancel");
 
 	iDtmfInfo = NULL;
 	TTsyReqHandle reqHandle =	
@@ -457,7 +452,7 @@
 //
 TInt CMmDtmfTsy::SendDTMFTonesCancelL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_SENDDTMFTONESCANCELL_1, "TSY: CMmDtmfTsy::SendDTMFTonesCancel");
+TFLOGSTRING("TSY: CMmDtmfTsy::SendDTMFTonesCancel");
 
     TTsyReqHandle sendDTMFTonesHandle =
         iMmPhone->iTsyReqHandleStore->GetTsyReqHandle( 
@@ -491,7 +486,7 @@
 void CMmDtmfTsy::CompleteSendDTMFTonesCancel( 
     TInt aResult ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_COMPLETESENDDTMFTONESCANCEL_1, "TSY: CMmDtmfTsy::CompleteSendDTMFTonesCancel");
+TFLOGSTRING("TSY: CMmDtmfTsy::CompleteSendDTMFTonesCancel");
 
     // Get req handle. 
     TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->GetTsyReqHandle( 
@@ -613,7 +608,7 @@
 //
 TInt CMmDtmfTsy::NotifyStopInDTMFString()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_NOTIFYSTOPINDTMFSTRING_1, "TSY: CMmDtmfTsy::NotifyStopInDTMFString");
+TFLOGSTRING("TSY: CMmDtmfTsy::NotifyStopInDTMFString");
     //Set TSY request handle type
     iMmPhone->iReqHandleType = 
         CMmPhoneTsy::EMultimodePhoneNotifyStopInDTMFString;
@@ -648,7 +643,7 @@
 void CMmDtmfTsy::CompleteNotifyStopInDTMFString( 
 	CMmDataPackage* aDataPackage )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_COMPLETENOTIFYSTOPINDTMFSTRING_1, "TSY: CMmDtmfTsy::CompleteNotifyStopInDTMFString");
+TFLOGSTRING("TSY: CMmDtmfTsy::CompleteNotifyStopInDTMFString");
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle(
         CMmPhoneTsy::EMultimodePhoneNotifyStopInDTMFString );
@@ -675,7 +670,7 @@
      TBool aContinue )                  
                                            
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_CONTINUEDTMFSTRINGSENDINGL_1, "TSY: CMmDtmfTsy::ContinueDTMFStringSendingL aContinue:%d",aContinue);
+TFLOGSTRING2("TSY: CMmDtmfTsy::ContinueDTMFStringSendingL aContinue:%d",aContinue);
     TInt ret( KErrNone );
 
     TTsyReqHandle sendDTMFTonesHandle =