diff -r 8ab6687fb94c -r 3adadc800673 telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CTsyDelegates.cpp
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CTsyDelegates.cpp	Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CTsyDelegates.cpp	Fri Jun 11 14:49:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,9 +16,14 @@
 
 
 //  INCLUDE FILES
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CTsyDelegatesTraces.h"
+#endif
+
 #include "ctsydelegates.h"
 #include "cmmmessagemanagerbase.h"
-#include <ctsy/tflogger.h> 
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -44,7 +49,7 @@
 CBase* CTsyDelegates::GetTsyObject( 
     CMmMessageManagerBase::TTsyObjects aObject )
 	{
-TFLOGSTRING2("TSY: CTsyDelegates::GetTsyObject object=%d", aObject );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYDELEGATES_GETTSYOBJECT_1, "TSY: CTsyDelegates::GetTsyObject object=%d", aObject );
 	
 	CBase* object = NULL;	
  	object = iTsyObjectArray.At( aObject );	
@@ -61,7 +66,7 @@
     CMmMessageManagerBase::TTsyObjects aTsyObjectType,
     CBase* aTsyObject )
     {
-TFLOGSTRING3("TSY: CTsyDelegates::RegisterTsyObject type=%d address=0x%x", TInt( aTsyObjectType ), aTsyObject );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYDELEGATES_REGISTERTSYOBJECT_1, "TSY: CTsyDelegates::RegisterTsyObject type=%d address=0x%08x", TInt( aTsyObjectType ), (TUint)aTsyObject );
 
     iTsyObjectArray[ aTsyObjectType ] = aTsyObject;
     }
@@ -74,7 +79,7 @@
 //
 void CTsyDelegates::DeregisterTsyObject( CBase* aTsyObject )
     {
-TFLOGSTRING2("TSY: CTsyDelegates::DeregisterTsyObject address=0x%x", aTsyObject );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYDELEGATES_DEREGISTERTSYOBJECT_1, "TSY: CTsyDelegates::DeregisterTsyObject address=0x%08x", (TUint)aTsyObject );
 
     for( TInt i = 0; i < TInt( 
         CMmMessageManagerBase::EMaxNumOfTsyObjects ); i++ )