diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmCommonStaticUtility.cpp
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmCommonStaticUtility.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmCommonStaticUtility.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,18 +16,13 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CMmCommonStaticUtilityTraces.h"
-#endif
-
 #include <etelmm.h>
 #include <etelmmerr.h>
 #include <exterror.h>
 #include <ctsy/serviceapi/gsmerror.h>
 #include "CMmCommonStaticUtility.h"
 
+#include <ctsy/tflogger.h>
 #include <in_sock.h>
 
 // ======== MEMBER FUNCTIONS ========
@@ -44,12 +39,14 @@
     TInt aCoreErrorCode, // core error
     TInt aExtendedErrorCode ) // extended error
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCOMMONSTATICUTILITY_EPOCERRORCODE_1, "TSY: CMmStaticUtility::EpocErrorCode, Error mapping done, \Core error: %d, Extended error: %d", aCoreErrorCode, aExtendedErrorCode );
+TFLOGSTRING3("TSY: CMmStaticUtility::EpocErrorCode, Error mapping done, \
+Core error: %d, Extended error: %d", aCoreErrorCode, aExtendedErrorCode );
 
     TInt errorCode = ( aCoreErrorCode & 0x0000FFFF ) |
                      ( aExtendedErrorCode << 16 );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCOMMONSTATICUTILITY_EPOCERRORCODE_2, "TSY: CMmStaticUtility::EpocErrorCode. It was mapped \to the following Symbian OS error: %d", errorCode );
+TFLOGSTRING2("TSY: CMmStaticUtility::EpocErrorCode. It was mapped \
+to the following Symbian OS error: %d", errorCode );
 
     return errorCode;
     }