--- a/telephonyserverplugins/simatktsy/src/CSatNotifyLanguageNotification.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyLanguageNotification.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 "CSatNotifyLanguageNotificationTraces.h"
-#endif
-
 #include <satcs.h>                  		// Etel SAT IPC definitions
 #include "CSatTsy.h"                		// Tsy class header
 #include "CSatNotifyLanguageNotification.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 
@@ -48,13 +43,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_NEWL_1, "CSAT: CSatNotifyLanguageNotification::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::NewL");
    	CSatNotifyLanguageNotification* const satNotifyLanguageNotification = 
         new ( ELeave ) CSatNotifyLanguageNotification( aNotificationsTsy );
     CleanupStack::PushL( satNotifyLanguageNotification );
     satNotifyLanguageNotification->ConstructL();
     CleanupStack::Pop( satNotifyLanguageNotification );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_NEWL_2, "CSAT: CSatNotifyLanguageNotification::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::NewL, end of method");
     return satNotifyLanguageNotification;
     }
 
@@ -68,7 +63,8 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_DTOR_1, "CSAT: CSatNotifyLanguageNotification::~CSatNotifyLanguageNotification");
+    TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::\
+        ~CSatNotifyLanguageNotification");
     }
     
 // -----------------------------------------------------------------------------
@@ -94,7 +90,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_CONSTRUCTL_1, "CSAT: CSatNotifyLanguageNotification::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::ConstructL");
     }
 
 // -----------------------------------------------------------------------------
@@ -108,7 +104,7 @@
         const TDataPackage& aPackage   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_NOTIFY_1, "CSAT: CSatNotifyLanguageNotification::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::Notify");
     // Save data pointer to client side for completion
     iLanguageNotificationV2Pckg = reinterpret_cast<RSat::
     	TLanguageNotificationV2Pckg*>( aPackage.Des1n() );
@@ -134,7 +130,7 @@
         const TTsyReqHandle aTsyReqHandle 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_CANCELNOTIFICATION_1, "CSAT: CSatNotifyLanguageNotification::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::CancelNotification"); 
     // Reset the request handle
     iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( 
         CSatTsy::ESatNotifyLanguageNotificationPCmdReqType );
@@ -158,7 +154,7 @@
         TInt aErrorCode  
         ) 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_COMPLETENOTIFYL_1, "CSAT: CSatNotifyLanguageNotification::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::CompleteNotifyL");
 
     TInt returnValue( KErrNone );
     TInt ret( KErrNone );
@@ -205,7 +201,8 @@
 
             if ( !cmdQualifier )
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_COMPLETENOTIFYL_2, "CSAT: CSatNotifyLanguageNotification::CompleteNotifyL, No specific language used");
+                TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::\
+                    CompleteNotifyL, No specific language used");
                 // No specific language used
                 languageNotificationV2.iNotificationType = 
                     RSat::ENonSpecificLangNotification;
@@ -240,7 +237,8 @@
         }// End of if( CSatTsy::ESatReqHandleUnknown != reqHandle )
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_COMPLETENOTIFYL_3, "CSAT: CSatNotifyLanguageNotification::CompleteNotifyL, Request not ongoing");
+        TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::CompleteNotifyL,\
+            Request not ongoing");
         additionalInfo.Zero();
         additionalInfo.Append( KNoCause );
         CreateTerminalRespL( pCmdNumber, RSat::KMeUnableToProcessCmd,
@@ -259,7 +257,7 @@
         TDes8* aRsp
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_TERMINALRESPONSEL_1, "CSAT:CSatNotifyLanguageNotification::TerminalResponseL");
+    TFLOGSTRING("CSAT:CSatNotifyLanguageNotification::TerminalResponseL");
     TInt ret( KErrNone );
     TBuf<1> additionalInfo;
     additionalInfo.FillZ(1);
@@ -288,7 +286,7 @@
         TDesC16& aAdditionalInfo    
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_CREATETERMINALRESPL_1, "CSAT:CSatNotifyLanguageNotification::CreateTerminalRespL");
+    TFLOGSTRING("CSAT:CSatNotifyLanguageNotification::CreateTerminalRespL");	    
     TTlv tlvSpecificData;
     // Create General Result TLV here
     tlvSpecificData.AddTag( KTlvResultTag );