--- a/telephonyserverplugins/simatktsy/src/CSatNotifyPlayTone.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyPlayTone.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyPlayToneTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyPlayTone.h"     // Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_NEWL_1, "CSAT: CSatNotifyPlayTone::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyPlayTone::NewL");
    	CSatNotifyPlayTone* const satNotifyPlayTone = 
         new ( ELeave ) CSatNotifyPlayTone( aNotificationsTsy );
     CleanupStack::PushL( satNotifyPlayTone );
     satNotifyPlayTone->ConstructL();
     CleanupStack::Pop( satNotifyPlayTone );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_NEWL_2, "CSAT: CSatNotifyPlayTone::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyPlayTone::NewL, end of method");
     return satNotifyPlayTone;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_DTOR_1, "CSAT: CSatNotifyPlayTone::~CSatNotifyPlayTone");
+    TFLOGSTRING("CSAT: CSatNotifyPlayTone::~CSatNotifyPlayTone");
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +88,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_CONSTRUCTL_1, "CSAT: CSatNotifyPlayTone::ConstructL, does nothing");
+    TFLOGSTRING("CSAT: CSatNotifyPlayTone::ConstructL, does nothing");
     }
 
 // -----------------------------------------------------------------------------
@@ -107,7 +102,7 @@
         const TDataPackage& aPackage
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_NOTIFY_1, "CSAT: CSatNotifyPlayTone::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyPlayTone::Notify");
     // Save data pointer to client side for completion
     iPlayToneV2Pckg = reinterpret_cast<RSat::TPlayToneV2Pckg*>( 
         aPackage.Des1n() );
@@ -132,7 +127,7 @@
         const TTsyReqHandle aTsyReqHandle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_CANCELNOTIFICATION_1, "CSAT: CSatNotifyPlayTone::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifyPlayTone::CancelNotification");    
     // Reset the request handle
     iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( CSatTsy::ESatNotifyPlayTonePCmdReqType );
@@ -155,7 +150,7 @@
 		TInt aErrorCode  
         ) 
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_1, "CSAT: CSatNotifyPlayTone::CompleteNotifyL");
+	TFLOGSTRING("CSAT: CSatNotifyPlayTone::CompleteNotifyL");
 	TInt returnValue( KErrNone );
     TInt ret( KErrNone );
     
@@ -196,7 +191,8 @@
             
 			if ( KErrNotFound != returnValue )
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_2, "CSAT: CSatNotifyPlayTone::CompleteNotifyL, Alpha ID present");
+				TFLOGSTRING("CSAT: CSatNotifyPlayTone::CompleteNotifyL,\
+				    Alpha ID present");
 				TUint16 alphaIdLength = alphaIdentifier.GetLength();
 				if ( alphaIdLength )
 					{
@@ -216,7 +212,8 @@
 					}
 				else
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_3, "CSAT: CSatNotifyPlayTone::CompleteNotifyL, Alpha ID is NULL");
+					TFLOGSTRING("CSAT: CSatNotifyPlayTone::CompleteNotifyL,\
+					    Alpha ID is NULL");
 					playToneV2.iAlphaId.iStatus = RSat::EAlphaIdNull;
 					}
 				}
@@ -229,7 +226,8 @@
 				{
 				playToneV2.iTone = ( RSat::TTone ) tone.GetShortInfo( 
 				    ETLV_Tone );
-			    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_4, "CSAT: CSatNotifyPlayTone::CompleteNotifyL, Tone Selection: %d", playToneV2.iTone);
+			    TFLOGSTRING2("CSAT: CSatNotifyPlayTone::CompleteNotifyL,\
+				    Tone Selection: %d", playToneV2.iTone);
 				}
         
 			// Duration of the tone (optional)
@@ -250,7 +248,8 @@
 		}// End of if ( CSatTsy::ESatReqHandleUnknown != reqHandle )			
 	else 
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_5, "CSAT: CSatNotifyPlayTone::CompleteNotifyL, Request not ongoing");
+		TFLOGSTRING("CSAT: CSatNotifyPlayTone::CompleteNotifyL,\
+		    Request not ongoing");
 		// Request not on, returning response immediately
 		additionalInfo.Zero();
 		additionalInfo.Append( KNoCause );
@@ -273,7 +272,7 @@
         TDes8* aRsp
         )
 	{    
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_1,  "CSAT: CSatNotifyPlayTone::TerminalResponseL" );
+	TFLOGSTRING( "CSAT: CSatNotifyPlayTone::TerminalResponseL" );
 
     TInt ret( KErrNone );
     TBuf<1>additionalInfo;
@@ -294,7 +293,8 @@
 		 ( RSat::KCmdBeyondMeCapabilities != rspV1.iGeneralResult ) && 
 		 ( RSat::KCmdDataNotUnderstood != rspV1.iGeneralResult ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_2,  "CSAT: CSatNotifyPlayTone::TerminalResponseL, Invalid General Result" );
+        TFLOGSTRING( "CSAT: CSatNotifyPlayTone::TerminalResponseL,\
+            Invalid General Result" );
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -310,12 +310,14 @@
 			}
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_3,  "CSAT: CSatNotifyPlayTone::TerminalResponseL, Invalid Additional Info" );
+            TFLOGSTRING( "CSAT: CSatNotifyPlayTone::TerminalResponseL,\
+                Invalid Additional Info" );
             // Invalid additional info field
             ret = KErrCorrupt;
             }
         }
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_4,  "CSAT: CSatNotifyPlayTone::TerminalResponseL: AdditionalInfo: %S", additionalInfo );
+	TFLOGSTRING2( "CSAT: CSatNotifyPlayTone::TerminalResponseL: \
+		AdditionalInfo: %s", &additionalInfo );
 
     CreateTerminalRespL( pCmdNumber, static_cast< TUint8 >( 
     	rspV1.iGeneralResult ), additionalInfo );                            
@@ -336,7 +338,7 @@
         TDesC16&  aAdditionalInfo            
 	    )    	
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_CREATETERMINALRESPL_1, "CSAT: CSatNotifyPlayTone::CreateTerminalRespL");
+	TFLOGSTRING("CSAT: CSatNotifyPlayTone::CreateTerminalRespL");
     TTlv tlvSpecificData;
     tlvSpecificData.AddTag( KTlvResultTag );
 	//General result