--- a/telephonyserverplugins/simtsy/src/CSimONStore.cpp	Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimONStore.cpp	Tue Aug 31 16:23:08 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -19,9 +19,15 @@
  @file
 */
 
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CSimONStoreTraces.h"
+#endif
+
 #include "CSimONStore.h"
 #include "CSimPhone.h"
-#include "Simlog.h"
 #include <testconfigfileparser.h>
 
 //
@@ -70,7 +76,7 @@
  * @param aMaxTextLen	The maximum length of an alpha tag.
  */
 	{
-	LOGPHBK1("Starting to parse Own Number store additional config parameters...");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_CONSTRUCTL_1, "Starting to parse Own Number store additional config parameters...");
 	__ASSERT_ALWAYS(aMaxNumLen<=KONMaxTelNumSize,SimPanic(EOwnNumberNameOrNumberTooLarge));
 	__ASSERT_ALWAYS(aMaxTextLen<=KONMaxTextSize,SimPanic(EOwnNumberNameOrNumberTooLarge));
 
@@ -91,7 +97,7 @@
 		if(ret!=KErrNone)
 			{
 			iONStoreCaps=KDefaultONPhoneStoreCaps;
-			LOGPARSERR("value",ret,0,&KONPhoneStoreCaps);
+			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element VALUE returned %d (element no. %d) from tag %s.",ret,0,KONPhoneStoreCaps);
 			}	
 		else
 			{
@@ -107,7 +113,7 @@
 		iONStoreCaps=KDefaultONPhoneStoreCaps;
 
 
-	LOGPHBK1("...Finished parsing Own Number store additional config parameters...");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_CONSTRUCTL_3, "...Finished parsing Own Number store additional config parameters...");
 	}
 
 void CSimONStore::PopulateStoreFromConfigFileL()
@@ -120,7 +126,7 @@
  * "PhBkStoreEntry = <store name>, <slot number>, <telephone number>, <alphatag>"
  */
 	{
-	LOGPHBK1("Starting to read Own Number store entries...");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_POPULATESTOREFROMCONFIGFILEL_1, "Starting to read Own Number store entries...");
 	iONIndividualPause=CfgFile()->ItemValue(KONStoreIndividualReqPause,KDefaultONStoreIndividualReqPause);
 
 	TInt count=CfgFile()->ItemCount(KONStoreEntry);
@@ -143,7 +149,7 @@
 		ret=GetONEntry(item,0,index,telNum,name,typeOfNumber,service,mode,numberPlan);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("Own Number Entry",ret,index,&KONStoreEntry);
+			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_POPULATESTOREFROMCONFIGFILEL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element OWN NUMBER ENTRY returned %d (element no. %d) from tag %s.",ret,index,KONStoreEntry);
 			continue;
 			}
 
@@ -155,7 +161,7 @@
 		iONStoreEntries[index].iNumberPlan=numberPlan;
 		}
 
-	LOGPHBK1("...Finished reading Own Number store entries...");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_POPULATESTOREFROMCONFIGFILEL_3, "...Finished reading Own Number store entries...");
 
 	}
 
@@ -544,6 +550,6 @@
 * @return CTestConfigSection a pointer to the configuration file data section
 */
 	{
-	LOGPHBK1(">>CSimONStore::CfgFile");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_CFGFILE_1, ">>CSimONStore::CfgFile");
 	return iPhone->CfgFile();
 	}