--- a/telephonyserverplugins/common_tsy/systemstateplugin/src/ctsysystemstateplugin.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/systemstateplugin/src/ctsysystemstateplugin.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -13,13 +13,8 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ctsysystemstatepluginTraces.h"
-#endif
-
 #include "ctsysystemstateplugin.h"
+#include <ctsy/tflogger.h>
 
 CCtsySystemStatePlugin* CCtsySystemStatePlugin::NewL()
 	{
@@ -57,7 +52,7 @@
 // ---------------------------------------------------------------------------
 TInt CCtsySystemStatePlugin::Connect()
 	{	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_CONNECT_1, "CCtsySystemStatePlugin::Connect()");
+	TFLOGSTRING("CCtsySystemStatePlugin::Connect()");		
 
 	TInt error (KErrNone);
 	if (!iConnected)	 
@@ -71,7 +66,7 @@
         error = iSsmEmergencyCallRf.SetAsPriorityClient();
 		if (KErrNone != error)
 			{
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_CONNECT_2, "CCtsySystemStatePlugin::Connect()  - SetAsPriorityClient returned %d", error);
+            TFLOGSTRING2("CCtsySystemStatePlugin::Connect()  - SetAsPriorityClient returned %d", error);
             error = KErrNone;
 			}
 	}	
@@ -87,7 +82,7 @@
 void CCtsySystemStatePlugin::ActivateRfForEmergencyCall(MCtsySsmPluginCallback* aSsmPluginCallback,
                                                         TCtsySsmCallbackData& aCallbackData)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_ACTIVATERFFOREMERGENCYCALL_1, "CCtsySystemStatePlugin::ActivateRfForEmergencyCall()" );
+	TFLOGSTRING("CCtsySystemStatePlugin::ActivateRfForEmergencyCall()" );
 
 	iAoChangeRfForEmergencyCall->ActivateRfForEmergencyCall(aSsmPluginCallback, aCallbackData);	
 	}
@@ -100,12 +95,12 @@
 // ---------------------------------------------------------------------------
 void CCtsySystemStatePlugin::DeactivateRfAfterEmergencyCall()
 	{	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_DEACTIVATERFAFTEREMERGENCYCALL_1, "CCtsySystemStatePlugin::DeactivateRfForEmergencyCall()" );
+	TFLOGSTRING("CCtsySystemStatePlugin::DeactivateRfForEmergencyCall()" );		
 	//try to connect
 	TInt err = Connect();
 	if (err)
 		{
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_DEACTIVATERFAFTEREMERGENCYCALL_2, "CCtsySystemStatePlugin::DeactivateRfAfterEmergencyCall() failed to connect %d", err);
+	    TFLOGSTRING2("CCtsySystemStatePlugin::DeactivateRfAfterEmergencyCall() failed to connect %d", err);
 		//do nothing
 		return;
 		}
@@ -119,7 +114,7 @@
 // ---------------------------------------------------------------------------	
 void CCtsySystemStatePlugin::Close()
 	{			
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_CLOSE_1, "CCtsySystemStatePlugin::Close()" );
+	TFLOGSTRING("CCtsySystemStatePlugin::Close()" );				
 	if (iConnected)	
 		{	
 		// if there is some request...
@@ -164,7 +159,7 @@
 void CChangeRfForEmergencyCall::ActivateRfForEmergencyCall(MCtsySsmPluginCallback* aSsmPluginCallback,
 														   TCtsySsmCallbackData& aCallbackData)
    {	
-   OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCHANGERFFOREMERGENCYCALL_ACTIVATERFFOREMERGENCYCALL_1, "CChangeRfForEmergencyCall::ActivateRfForEmergencyCall()" );
+   TFLOGSTRING("CChangeRfForEmergencyCall::ActivateRfForEmergencyCall()" );     
 
    if (EDeactivateBusy == iBusy)
       {
@@ -201,7 +196,7 @@
 // --------------------------------------------------------------------------- 
 void CChangeRfForEmergencyCall::DeactivateRfAfterEmergencyCall()
    {	
-   OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCHANGERFFOREMERGENCYCALL_DEACTIVATERFAFTEREMERGENCYCALL_1, "CChangeRfForEmergencyCall::DeactivateRfAfterEmergencyCall()" );
+   TFLOGSTRING("CChangeRfForEmergencyCall::DeactivateRfAfterEmergencyCall()" );     
 
 		// if we've already sent request  
 		if (EActivateBusy == iBusy)