--- a/telephonyserverplugins/simtsy/src/CSimCallBarring.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimCallBarring.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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,16 +20,10 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimCallBarringTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 #include "CSimCallBarring.h"
 #include "CSimPhone.h"
+#include "Simlog.h"
 
 // The Mobile Basic Service Groups used - originally were magic numbers from 1 to 6 incl;
 const TInt KMobServiceIndxStart = 1;
@@ -65,13 +59,13 @@
   	Retrieves all the Call Barring related tags from the config file
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_CONSTRUCTL_1, "Starting to parse Call Barring config parameters...");
+	LOGCALL1("Starting to parse Call Barring config parameters...");
 
 	iPassword.Copy(CfgFile()->ItemValue(KCBPassword,KCBDefaultPassword));
 
 	iGetCBStatus = new(ELeave) CArrayPtrFlat<CListReadAllAttempt>(1);
 	FindAndCreateCBListL();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_CONSTRUCTL_2, "...Finished parsing Call Barring config parameters...");
+	LOGCALL1("...Finished parsing Call Barring config parameters...");
 	}
 	
 void CSimCallBarring::FindAndCreateCBListL()
@@ -80,7 +74,7 @@
   	Retrieves all the Call barring tags that define the 
   	original status of Call barring from the config file
 */
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_FINDANDCREATECBLISTL_1, "CSimPhone::FindAndCreateCBListL");
+	LOGCALL1("CSimPhone::FindAndCreateCBListL");
 	RMobilePhone::TMobilePhoneCBInfoEntryV1 entry;
 
 	iCBList = CMobilePhoneCBList::NewL();
@@ -88,7 +82,7 @@
 	const CTestConfigItem* item=NULL;
 	TInt ret=KErrNone;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_FINDANDCREATECBLISTL_2, "Starting to Load and Parse CBList Config parameters");
+	LOGCALL1("Starting to Load and Parse CBList Config parameters");
 	TInt i;
 	for(i=0;i<count;i++)
 		{
@@ -100,20 +94,20 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,condition);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_FINDANDCREATECBLISTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CONDITION returned %d (element no. %d) from tag %s.",ret,0,KCBList);
+			LOGPARSERR("condition",ret,0,&KCBList);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,serviceGroup);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_FINDANDCREATECBLISTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SERVICEGROUP returned %d (element no. %d) from tag %s.",ret,1,KCBList);
+			LOGPARSERR("serviceGroup",ret,1,&KCBList);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,status);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_FINDANDCREATECBLISTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,2,KCBList);
+			LOGPARSERR("status",ret,2,&KCBList);
 			continue;
 			}
 		
@@ -200,7 +194,7 @@
 	iCBNotification.iCBChangeInfoNotificationPending=ETrue;
 	iCBNotification.iCBChangeInfoReqHandle=aReqHandle;
 	iCBNotification.iCurrentCBCondition=aCB;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_NOTIFYCALLBARRINGSTATUSCHANGE_1, "Finished CSimCallBarring::NotifyCallBarringStatusChange");
+	LOGCALL1("Finished CSimCallBarring::NotifyCallBarringStatusChange");
 	return KErrNone;
 	}
 
@@ -316,7 +310,7 @@
 	@param aReqData information about the request
 	@param aBufSize Size of the buffer the client has to allocate for the 2nd pahase
   	*/
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE1_1, "CSimPhone::GetCallBarringStatusPhase1");
+	LOGCALL1("CSimPhone::GetCallBarringStatusPhase1");
 	
 	TInt ret=KErrNone;
 	TInt leaveCode=KErrNone;
@@ -324,7 +318,7 @@
 	if (leaveCode != KErrNone)
 			iPhone->ReqCompleted(aTsyReqHandle,leaveCode);
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE1_2, "CSimPhone::GetCallBarringStatusPhase1");
+	LOGCALL1("CSimPhone::GetCallBarringStatusPhase1");
 	return ret;
 	}
 	
@@ -339,7 +333,7 @@
 	@param aReqData information about the request
 	@param aBufSize Size of the buffer the client has to allocate for the 2nd pahase
 	*/
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_PROCESSGETCALLBARRINGSTATUSPHASE1L_1, "CSimCallBarring::ProcessGetCallBarringStatusPhase1L");
+	LOGCALL1("CSimCallBarring::ProcessGetCallBarringStatusPhase1L");
 
 	CMobilePhoneCBList* list=CMobilePhoneCBList::NewL();
 	CleanupStack::PushL(list);
@@ -401,7 +395,7 @@
 	// Complete first phase of list retrieval
 	iPhone->ReqCompleted(aTsyReqHandle,KErrNone);
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_PROCESSGETCALLBARRINGSTATUSPHASE1L_2, "CSimCallBarring::ProcessGetCallBarringStatusPhase1L");
+	LOGCALL1("CSimCallBarring::ProcessGetCallBarringStatusPhase1L");
 	return KErrNone;
 	}
 
@@ -414,7 +408,7 @@
 	@param aClient Ponter to the client
 	@param aBuf Buffer containiong the call barring status list
 	*/
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE2_1, "CSimCallBarring::GetCallBarringStatusPhase2");
+	LOGCALL1("CSimCallBarring::GetCallBarringStatusPhase2");
 	CListReadAllAttempt* read=NULL;
 	// Find the get detected network attempt from this client
 	for (TInt i=0; i<iGetCBStatus->Count(); ++i)
@@ -433,7 +427,7 @@
 			}
 		}
 	// Should handle error case of not finding the matching client from read all phase 1
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE2_2, "CSimCallBarring::GetCallBarringStatusPhase2");
+	LOGCALL1("CSimCallBarring::GetCallBarringStatusPhase2");
 	return KErrNotFound;
 	}
 
@@ -443,7 +437,7 @@
 	Cancels a Request to retrieve the call barring status list
 	@param aReqHandle Handle to the request
 	*/
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSCANCEL_1, "CSimCallBarring::GetCallBarringStatusCancel");
+	LOGCALL1("CSimCallBarring::GetCallBarringStatusCancel");
 	iPhone->ReqCompleted(aTsyReqHandle,KErrNone);
 	// Remove the read all attempt from iGetCBStatus
 	CListReadAllAttempt* read=NULL;
@@ -458,7 +452,7 @@
 			}
 		}
 	iPhone->ReqCompleted(aTsyReqHandle,KErrCancel);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSCANCEL_2, "CSimCallBarring::GetCallBarringStatusCancel");
+	LOGCALL1("CSimCallBarring::GetCallBarringStatusCancel");
 	return KErrNone;
 	}