--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinelist.cpp	Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinelist.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,6 +16,12 @@
 
 
 //INCLUDE FILES
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cmmlinelistTraces.h"
+#endif
+
 #include "cmmlinelist.h"
 #include "cmmphonetsy.h"
 #include "cmmlinetsy.h"
@@ -81,7 +87,7 @@
         iIsLineInUse[ i ] = EFalse;                
         }    
        
-TFLOGSTRING2("TSY: CMmLineList::ConstructL:iObjectContainer->Count()=%d", iObjectContainer->Count());        
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_CONSTRUCTL_1, "TSY: CMmLineList::ConstructL:iObjectContainer->Count()=%d", iObjectContainer->Count());
        
     }
 
@@ -103,10 +109,10 @@
     {    
     CMmLineTsy* mmLine = NULL;
 
-TFLOGSTRING("TSY: CMmLineList::GetMmLineByMode");       
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETMMLINEBYMODE_1, "TSY: CMmLineList::GetMmLineByMode");
     if ( iObjectContainer  && iInitialised)
         {
-TFLOGSTRING2("TSY: CMmLineList::GetMmLineByMode::iObjectContainer->Count()=%d", iObjectContainer->Count());        
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETMMLINEBYMODE_2, "TSY: CMmLineList::GetMmLineByMode::iObjectContainer->Count()=%d", iObjectContainer->Count());
        
         for ( TInt i = 0; i < iObjectContainer->Count(); i++ )
             {
@@ -137,14 +143,14 @@
     TInt aIndex )
     {
     CMmLineTsy* mmLine = NULL;
-TFLOGSTRING("TSY: CMmLineList::GetMmLineByIndex");        
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETMMLINEBYINDEX_1, "TSY: CMmLineList::GetMmLineByIndex");
 	//This is for checking that return objects is right
    	CTelObject* tempObject = 
                     reinterpret_cast< CTelObject* >( this );
                     
     if ( iObjectContainer && iInitialised )
         {
-TFLOGSTRING2("TSY: CMmLineList::GetMmLineByIndex:iObjectContainer->Count()=%d", iObjectContainer->Count());        
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETMMLINEBYINDEX_2, "TSY: CMmLineList::GetMmLineByIndex:iObjectContainer->Count()=%d", iObjectContainer->Count());
 
         if ( aIndex >= 0 && aIndex < iObjectContainer->Count() )
             {
@@ -174,10 +180,10 @@
     {
     TInt ret ( KErrGeneral );
     
-TFLOGSTRING("TSY: CMmLineList::AddLineObject");            
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_ADDLINEOBJECT_1, "TSY: CMmLineList::AddLineObject");
     if ( iObjectContainer )
         {
-TFLOGSTRING2("TSY: CMmLineList::AddLineObject:iObjectContainer->Count()=%d", iObjectContainer->Count());            
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_ADDLINEOBJECT_2, "TSY: CMmLineList::AddLineObject:iObjectContainer->Count()=%d", iObjectContainer->Count());
 
         
         TInt trapError( KErrNone );    
@@ -295,10 +301,10 @@
     {
     CBase* mmObject = NULL;
 
-TFLOGSTRING2("TSY: CMmLineList::GetObjectByIndex. aIndex=%d", aIndex ); 
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETOBJECTBYINDEX_1, "TSY: CMmLineList::GetObjectByIndex. aIndex=%d", aIndex );
     if ( iObjectContainer )
         {
-TFLOGSTRING2("TSY: CMmLineList::GetObjectByIndex. iObjectContainer->Count()=%d", iObjectContainer->Count()); 
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETOBJECTBYINDEX_2, "TSY: CMmLineList::GetObjectByIndex. iObjectContainer->Count()=%d", iObjectContainer->Count());
 
         if ( iIsLineInUse[ aIndex ] )
             {