diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicelinetsy.cpp
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicelinetsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicelinetsy.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,12 +16,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmvoicelinetsyTraces.h"
-#endif
-
 #include "cmmvoicelinetsy.h"
 #include "cmmphonetsy.h"
 #include "cmmvoicecalltsy.h"
@@ -40,7 +34,7 @@
 
 void CMmVoiceLineTsy::ConstructL()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_CONSTRUCTL_1, "TSY: CMmVoiceLineTsy::ConstructL");
+    TFLOGSTRING("TSY: CMmVoiceLineTsy::ConstructL");
     CMmLineTsy::ConstructL();
     }
 
@@ -51,7 +45,7 @@
     CMmMessageManagerBase* aMessageManager,
     MTelephonyAudioControl* aTelephonyAudioControl )
     {
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_NEWL_1, "TSY: CMmVoiceLineTsy::NewL, Voice line %S created", aName);
+    TFLOGSTRING2("TSY: CMmVoiceLineTsy::NewL, Voice line %S created", &aName);
     CMmVoiceLineTsy* mmLineTsy = NULL;
 
     if ( aMmPhone != NULL && ( aMode == RMobilePhone::EVoiceService 
@@ -72,7 +66,8 @@
 
 CMmVoiceLineTsy::~CMmVoiceLineTsy()
     {
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_DTOR_1, "TSY: CMmVoiceLineTsy::~CMmVoiceLineTsy. Line name: %S", iLineName);
+    TFLOGSTRING2("TSY: CMmVoiceLineTsy::~CMmVoiceLineTsy. Line name: %S", \
+        &iLineName);
     }
 
 // ---------------------------------------------------------------------------
@@ -262,7 +257,8 @@
 
     callDataPackage->GetCallIdAndMode( callId, callMode ); 
 
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYINCOMINGCALL_1, "TSY: CMmVoiceLineTsy::CompleteNotifyIncomingCall - Line \name: %S, Call id: %d", iLineName, callId );
+    TFLOGSTRING3("TSY: CMmVoiceLineTsy::CompleteNotifyIncomingCall - Line \
+        name: %S, Call id: %d", &iLineName, callId );
 
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -340,7 +336,7 @@
 void CMmVoiceLineTsy::CompleteNotifyDiallingStatus(
     CMmDataPackage* aDataPackage )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_1, "TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus");
+    TFLOGSTRING("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus");
     TInt callId( -1 );
     TBool ghostCall( EFalse );
     RMobilePhone::TMobileService callMode( RMobilePhone::EVoiceService );
@@ -355,7 +351,8 @@
 
     if ( NULL == mmCall )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_2, "TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - \GhostCall");
+        TFLOGSTRING("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - \
+            GhostCall");
         ghostCall = ETrue;
         }
     else
@@ -383,7 +380,7 @@
 
         if ( result || resultNoFdnCheck || resultISV )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_3, "TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - Not Emergency call");
+TFLOGSTRING("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - Not Emergency call");
             for ( TInt i = 0; i < iMmPhone->CallList()->GetNumberOfObjects(); 
                       i++ )
                 {    
@@ -400,7 +397,7 @@
                         CMmCallTsy::EMultimodeCallDialNoFdnCheck ) ) ) )
                     {
                     mmCall->SetCallId( callId );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_4, "TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - mmCall SetCallId: %d", callId);
+TFLOGSTRING2("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - mmCall SetCallId: %d", callId);                      
                     mmCall->CompleteNotifyMobileCallInfoChange( 
                                 aDataPackage );
                     break;   
@@ -409,7 +406,8 @@
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_5, "TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - \Dial not found");
+            TFLOGSTRING("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - \
+                Dial not found");
             ghostCall = ETrue;
             }
         }