--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsywithdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsywithdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -15,11 +15,6 @@
 
 #ifdef USING_CTSY_DISPATCHER
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmphonetsywithdispatcherTraces.h"
-#endif
-
 /**
  * This file contains additional function definitions for the CMmPhoneTsy class
  * in CTSY for use when the CTSY is used with the CTSY Dispatcher.
@@ -57,11 +52,11 @@
 			iPhoneIdentity.iSerialNumber.Copy(aPhoneId.iSerialNumber);
 			}
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID1_1, "TSY: CMmPhoneTsy::CompleteGetPhoneId :");
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID1_2, "Manufacturer: %S,", iPhoneIdentity.iManufacturer);
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID1_3, "Model: %S,", iPhoneIdentity.iModel);
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID1_4, "Revision: %S,", iPhoneIdentity.iRevision);
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID1_5, "SerialNumber: %S", iPhoneIdentity.iSerialNumber);
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetPhoneId :");
+TFLOGSTRING2("				Manufacturer: %S,", &iPhoneIdentity.iManufacturer);
+TFLOGSTRING2("				Model: %S,", &iPhoneIdentity.iModel);
+TFLOGSTRING2("				Revision: %S,", &iPhoneIdentity.iRevision);
+TFLOGSTRING2("				SerialNumber: %S", &iPhoneIdentity.iSerialNumber);
         }
 
     //reset req handle. Returns the deleted req handle