--- a/telephonyserverplugins/simatktsy/src/cmmmessagemanagerbase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/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 "tflogger.h"
 #include "ctsydelegates.h"
 #include "csatmessagerouterproxy.h"
 #include <ctsy/pluginapi/mmessagerouter.h>
@@ -76,7 +71,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 ) );
     }
@@ -91,7 +86,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 );
     }
@@ -106,7 +101,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