diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmmessagemanagerbase.cpp
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmmessagemanagerbase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmmessagemanagerbase.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,13 +16,8 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmmessagemanagerbaseTraces.h"
-#endif
-
 #include "cmmmessagemanagerbase.h"
+#include <ctsy/tflogger.h>
 #include "ctsydelegates.h"
 
 // ======== MEMBER FUNCTIONS ========
@@ -71,7 +66,7 @@
 // ---------------------------------------------------------------------------    
 EXPORT_C void CMmMessageManagerBase::SetPhoneTsy( CMmPhoneTsy* aMmPhone )    
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CMMMESSAGEMANAGERBASE_SETPHONETSY_1, "TSY: CMmMessageManagerBase::SetPhoneTsy : Phone=0x%x", aMmPhone );
+TFLOGSTRING2("TSY: CMmMessageManagerBase::SetPhoneTsy : Phone=0x%x", aMmPhone );   
     iMmPhone = aMmPhone;
     
     if( iMessageRouterProxy )
@@ -88,7 +83,7 @@
 TInt CMmMessageManagerBase::HandleRequestL(    
     const TInt aIpc )        
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEMANAGERBASE_HANDLEREQUESTL_1, "TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
+TFLOGSTRING2("TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
     return HandleRequestL( 
         aIpc, REINTERPRET_CAST( const CMmDataPackage*, NULL ) );
     }
@@ -103,7 +98,7 @@
     const TInt aIpc,      
     const CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEMANAGERBASE_HANDLEREQUESTL1_1, "TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
+TFLOGSTRING2("TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
    
     return iMessageRouter->ExtFuncL( aIpc, aDataPackage );
     }
@@ -118,7 +113,7 @@
     const TInt aIpc,        
     const TDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEMANAGERBASE_HANDLEREQUESTL2_1, "TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
+TFLOGSTRING2("TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
 
     // map the TDataPackage into a CMmDataPackage
     // Non-core Methods from the SOS layer using the DOS layer will perforn
@@ -181,7 +176,7 @@
 EXPORT_C void CMmMessageManagerBase::SetMessageRouter(
     MMessageRouter* aMessageRouter )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CMMMESSAGEMANAGERBASE_SETMESSAGEROUTER_1, "TSY: CMmMessageManagerBase::SetMessageRouter : MessageRouter=0x%08x", aMessageRouter );
+TFLOGSTRING2("TSY: CMmMessageManagerBase::SetMessageRouter : MessageRouter=0x%x", aMessageRouter );
     iMessageRouter = aMessageRouter;
     }