--- a/telephonyserverplugins/simatktsy/src/csatmessagerouterproxy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csatmessagerouterproxy.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"
@@ -20,12 +20,6 @@
 
 
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csatmessagerouterproxyTraces.h"
-#endif
-
 #include <satcs.h>
 // Tsy module files
 #include "CSatDataPackage.h"
@@ -61,6 +55,7 @@
 #include "CSatEventDownloadTsy.h"
 #include "CSatDataDownloadTsy.h"
 // Utilities
+#include "tflogger.h"
 #include "msattsy_ipcdefs.h"
 #include "ctsydelegates.h"
 
@@ -99,7 +94,7 @@
 //
 CSatMessageRouterProxy* CSatMessageRouterProxy::NewL(CTsyDelegates& aTsyDelegates) 
     { 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_NEWL_1,  "CSAT: CSatMessageRouterProxy::NewL" );
+    TFLOGSTRING( "CSAT: CSatMessageRouterProxy::NewL" );
     
     CSatMessageRouterProxy* satMessageRouterProxy = 
         new ( ELeave ) CSatMessageRouterProxy(aTsyDelegates);
@@ -107,7 +102,7 @@
     satMessageRouterProxy->ConstructL();
     CleanupStack::Pop();
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_NEWL_2, "CSAT: CSatMessageRouterProxy::NewL, end of method");
+	TFLOGSTRING("CSAT: CSatMessageRouterProxy::NewL, end of method");
     return satMessageRouterProxy;
     }
 
@@ -121,7 +116,7 @@
         void
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_DTOR_1,  "CSAT: CSatMessageRouterProxy::~CSatMessageRouterProxy" );
+    TFLOGSTRING( "CSAT: CSatMessageRouterProxy::~CSatMessageRouterProxy" );
     }
 
 // -----------------------------------------------------------------------------
@@ -145,7 +140,7 @@
         void
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_CONSTRUCTL_1,  "CSAT: CSatMessageRouterProxy::ConstructL, noes nothing" );
+    TFLOGSTRING( "CSAT: CSatMessageRouterProxy::ConstructL, noes nothing" );
     }
     
 // -----------------------------------------------------------------------------
@@ -159,7 +154,7 @@
 		)
 	{
 	// Dummy implementation
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_ROUTEREQUEST_1,  "CSAT: CSatMessageRouterProxy::RouteRequest: DUMMY" );
+	TFLOGSTRING( "CSAT: CSatMessageRouterProxy::RouteRequest: DUMMY" );
 	return NULL;
 	}
 	
@@ -181,7 +176,8 @@
     
     if ( KErrNone != trapError )
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_ROUTECOMPLETION_1, "CSatMessageRouterProxy::RouteCompletion, trapError=%d", trapError);
+		TFLOGSTRING2("CSatMessageRouterProxy::RouteCompletion, trapError=%d", 
+			trapError);
 		}
     }
 	
@@ -198,7 +194,7 @@
         CSatDataPackage* /*aDataPackage*/
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_GETOBJECTFORCOMPLETION_1, "CSAT: CMmMessageRouterBase::GetObjectForCompletion");
+    TFLOGSTRING("CSAT: CMmMessageRouterBase::GetObjectForCompletion");
     CBase* satObject = NULL;
 
 	CMmMessageManagerBase::TTsyObjects tsyObject = 
@@ -220,7 +216,7 @@
         ) const
 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_GETTSYOBJECTFROMIPC_1,  "CSAT: CSatMessageRouterProxy::GetTsyObjectFromIpc" );
+    TFLOGSTRING( "CSAT: CSatMessageRouterProxy::GetTsyObjectFromIpc" );
     // A default value must be given as a initialization, however, nothing will
     // be done if the IPC does not mach as well in RouteCompletion
     CMmMessageManagerBase::TTsyObjects retObject = 
@@ -351,7 +347,7 @@
     CMmDataPackage* aData, 
     TInt aResult )
 	{
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_COMPLETE_1, "TSY: CMmMessageRouterProxy::Complete. IPC = %d, result: %d", aIpc, aResult);
+TFLOGSTRING3("TSY: CMmMessageRouterProxy::Complete. IPC = %d, result: %d", aIpc, aResult);
 	RouteCompletion( aIpc, static_cast<CSatDataPackage*>(aData), aResult ); 
 	}
 	
@@ -380,7 +376,8 @@
         TInt aResult
         )
     {
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_ROUTECOMPLETIONL_1, "CSAT: CSatMessageRouterProxy::RouteCompletion ipc=%d, error: %d", aIpc, aResult);
+	TFLOGSTRING3("CSAT: CSatMessageRouterProxy::RouteCompletion ipc=%d, \
+        error: %d", aIpc, aResult);
     CBase* object = GetObjectForCompletion( aIpc, aDataPackage );
 
     if ( NULL != object )
@@ -623,7 +620,7 @@
         }
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_ROUTECOMPLETIONL_2, "CSatMessageRouterProxy::RouteCompletion, IPC NOT HANDLED.!!!");
+		TFLOGSTRING("CSatMessageRouterProxy::RouteCompletion, IPC NOT HANDLED.!!!");
 		}
     }