--- a/telephonyserverplugins/simatktsy/src/CSatNotifyTimerMgmt.cpp	Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyTimerMgmt.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 "CSatNotifyTimerMgmtTraces.h"
+#endif
+
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyTimerMgmt.h"    // 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 "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
 #include "MSatTsy_IPCDefs.h"        // Sat Tsy internal request types
@@ -43,13 +48,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::NewL");
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_NEWL_1, "CSAT: CSatNotifyTimerMgmt::NewL");
    	CSatNotifyTimerMgmt* const satNotifyTimerMgmt = 
         new ( ELeave ) CSatNotifyTimerMgmt( aNotificationsTsy );
     CleanupStack::PushL( satNotifyTimerMgmt );
     satNotifyTimerMgmt->ConstructL();
     CleanupStack::Pop( satNotifyTimerMgmt );
-    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::NewL, end of method");
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_NEWL_2, "CSAT: CSatNotifyTimerMgmt::NewL, end of method");
     return satNotifyTimerMgmt;
     }
 
@@ -63,7 +68,7 @@
 		// None
         )
     {
-    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::~CSatNotifyTimerMgmt");
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_DTOR_1, "CSAT: CSatNotifyTimerMgmt::~CSatNotifyTimerMgmt");
     }
     
 // -----------------------------------------------------------------------------
@@ -89,7 +94,7 @@
         // None
         )
     {
-    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::ConstructL, does nothing");
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_CONSTRUCTL_1, "CSAT: CSatNotifyTimerMgmt::ConstructL, does nothing");
     }
 
 // -----------------------------------------------------------------------------
@@ -103,7 +108,7 @@
         TInt aErrorCode                  
         )
     {
-    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::CompleteNotifyL");
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_1, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL");
 
     TInt ret( KErrNone );
     TInt returnValue( KErrNone );
@@ -185,22 +190,19 @@
 
                             if ( KErrNone != ret )
                                 {
-                                TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\
-                                    CompleteNotifyL, Unable to process cmd");
+                                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_2, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Unable to process cmd");
                                 generalResult = RSat::KMeUnableToProcessCmd;
                                 }
                             }
                         else
                             {
-                            TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\
-                                CompleteNotifyL, Data not understood");
+                            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_3, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Data not understood");
                             generalResult = RSat::KCmdDataNotUnderstood;
                             }
                         }
                     else
                         {
-                        TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\
-                            CompleteNotifyL, Timer value missing");
+                        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_4, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Timer value missing");
                         generalResult = RSat::KErrorRequiredValuesMissing;
                         }
                     }
@@ -243,23 +245,20 @@
                         }
                     else
                         {
-                        TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\
-                            CompleteNotifyL, Contradiction with timer state");
+                        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_5, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Contradiction with timer state");
                         generalResult = RSat::KContradictionWithTimerState;
                         }
                     }
                 else
                     {
-                    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\
-                        CompleteNotifyL, Cmd type not understood");
+                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_6, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Cmd type not understood");
                     generalResult = RSat::KCmdTypeNotUnderstood;
                     }
                 }
             }
         else
             {
-            TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\
-                CompleteNotifyL, Required values missing");
+            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_7, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Required values missing");
             generalResult = RSat::KErrorRequiredValuesMissing;
             }
 
@@ -282,7 +281,7 @@
         TUint8 aGeneralResult	
 		)
     {
-    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::CreateTerminalRespL");
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_CREATETERMINALRESPL_1, "CSAT: CSatNotifyTimerMgmt::CreateTerminalRespL");
 
     // Create and append response data
     TTlv tlvSpecificData;
@@ -351,7 +350,7 @@
          TPtrC8 time
          )
     {
-    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::ConvertToSeconds");
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_CONVERTTOSECONDS_1, "CSAT: CSatNotifyTimerMgmt::ConvertToSeconds");
     TUint32 timeValue( 0 );
     // Value of a timer, expressed using 
     // the format hour, minute, second