--- a/telephonyserverplugins/simatktsy/src/CSatNotifyPollInterval.cpp	Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyPollInterval.cpp	Tue Aug 31 16:23:08 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -20,6 +20,12 @@
 
 
 //INCLUDES
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CSatNotifyPollIntervalTraces.h"
+#endif
+
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyPollInterval.h" // Tsy class header
@@ -27,7 +33,6 @@
 #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.
@@ -44,13 +49,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    TFLOGSTRING("CSAT: CSatNotifyPollInterval::NewL");
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_NEWL_1, "CSAT: CSatNotifyPollInterval::NewL");
    	CSatNotifyPollInterval* const satNotifyPollInterval = 
         new ( ELeave ) CSatNotifyPollInterval( aNotificationsTsy );
     CleanupStack::PushL( satNotifyPollInterval );
     satNotifyPollInterval->ConstructL();
     CleanupStack::Pop( satNotifyPollInterval );
-    TFLOGSTRING("CSAT: CSatNotifyPollInterval::NewL, end of method");
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_NEWL_2, "CSAT: CSatNotifyPollInterval::NewL, end of method");
     return satNotifyPollInterval;
     }
 
@@ -64,7 +69,7 @@
 		// None
         )
     {
-    TFLOGSTRING("CSAT: CSatNotifyPollInterval::~CSatNotifyPollInterval");
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_DTOR_1, "CSAT: CSatNotifyPollInterval::~CSatNotifyPollInterval");
     }
     
 // -----------------------------------------------------------------------------
@@ -90,7 +95,7 @@
         // None
         )
     {
-    TFLOGSTRING("CSAT: CSatNotifyPollInterval::ConstructL");
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_CONSTRUCTL_1, "CSAT: CSatNotifyPollInterval::ConstructL");
     }
     
 // -----------------------------------------------------------------------------
@@ -105,7 +110,7 @@
         TInt /*aErrorCode*/  
         ) 
     {
-    TFLOGSTRING("CSAT: CSatNotifyPollInterval::CompleteNotifyL");
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_COMPLETENOTIFYL_1, "CSAT: CSatNotifyPollInterval::CompleteNotifyL");
     TInt returnValue( KErrNone );
     TPtrC8* data;
     aDataPackage->UnPackData( &data );
@@ -167,8 +172,7 @@
                     }
                 default:
                 	{
-                 	TFLOGSTRING("CSAT: CSatNotifyPollInterval::\
-                 	    CompleteNotifyL, Time unit unknown.");
+                 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_COMPLETENOTIFYL_2, "CSAT: CSatNotifyPollInterval::CompleteNotifyL, Time unit unknown.");
 	        		returnValue = KErrNotFound;
                  	// Command data not understood
                  	CreateTerminalRespL( pCmdNumber, 
@@ -222,7 +226,7 @@
         TUint8 aDcs               	
 		)
     {
-    TFLOGSTRING("CSAT: CSatNotifyPollInterval::CreateTerminalRespL");   
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_CREATETERMINALRESPL_1, "CSAT: CSatNotifyPollInterval::CreateTerminalRespL");
     TTlv tlvSpecificData;
     tlvSpecificData.AddTag( KTlvResultTag );     
     tlvSpecificData.AddByte( aGeneralResult );
@@ -243,9 +247,7 @@
                 }
             default:
                 {
-                TFLOGSTRING2("CSAT: CSatNotifyPollInterval::\
-                    CreateTerminalRespL, Additional Info: %d", 
-                    aAdditionalInfo);  
+                OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_CREATETERMINALRESPL_2, "CSAT: CSatNotifyPollInterval::CreateTerminalRespL, Additional Info: %d", aAdditionalInfo);
                 tlvSpecificData.AddByte( aAdditionalInfo );
                 break;
                 }