diff -r 28839de615b4 -r 26645d81f48d persistentstorage/sql/SRC/Security/SqlSecurity.cpp
--- a/persistentstorage/sql/SRC/Security/SqlSecurity.cpp	Thu Aug 19 11:36:21 2010 +0300
+++ b/persistentstorage/sql/SRC/Security/SqlSecurity.cpp	Tue Aug 31 16:57:14 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -14,8 +14,12 @@
 //
 
 #include "SqlSecurityImpl.h"
-#include "SqlPanic.h"
-#include "UTraceSql.h"
+#include "SqlAssert.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "SqlSecurityTraces.h"
+#endif
+#include "SqlTraceDef.h"
 
 const TInt32 KEndOfSPStream = -1;//If found in the stream, given as an argument to RSqlSecurityPolicy::InternalizeL(),
 							     //then there are no more policies in the stream.
@@ -46,8 +50,9 @@
 */
 EXPORT_C TInt RSqlSecurityPolicy::Create(const TSecurityPolicy& aDefaultPolicy)
 	{
-	SQLUTRACE_PROFILER(this);
+	SQL_TRACE_BORDER(OstTraceExt2(TRACE_BORDER, RSQLSECURITYPOLICY_CREATE_ENTRY , "Entry;0x%X;RSqlSecurityPolicy::Create;aDefaultPolicy=0x%X", (TUint)this, (TUint)&aDefaultPolicy));
 	TRAPD(err, CreateL(aDefaultPolicy));
+    SQL_TRACE_BORDER(OstTraceExt3(TRACE_BORDER, RSQLSECURITYPOLICY_CREATE_EXIT, "Exit;0x%X;RSqlSecurityPolicy::Create;iImpl=0x%X;err=%d", (TUint)this, (TUint)iImpl, err));
 	return err;
 	}
 
@@ -66,8 +71,9 @@
 */
 EXPORT_C void RSqlSecurityPolicy::CreateL(const TSecurityPolicy& aDefaultPolicy)
 	{
-	SQLUTRACE_PROFILER(this);
+    SQL_TRACE_BORDER(OstTraceExt2(TRACE_BORDER, RSQLSECURITYPOLICY_CREATEL_ENTRY , "Entry;0x%X;RSqlSecurityPolicy::CreateL;aDefaultPolicy=0x%X", (TUint)this, (TUint)&aDefaultPolicy));
 	iImpl = CSqlSecurityPolicy::NewL(aDefaultPolicy);
+    SQL_TRACE_BORDER(OstTraceExt2(TRACE_BORDER, RSQLSECURITYPOLICY_CREATEL_EXIT, "Exit;0x%X;RSqlSecurityPolicy::CreateL;iImpl=0x%X", (TUint)this, (TUint)iImpl));
 	}
 
 /**
@@ -77,8 +83,9 @@
 */
 EXPORT_C void RSqlSecurityPolicy::Close()
 	{
-	SQLUTRACE_PROFILER(this);
+    SQL_TRACE_BORDER(OstTrace1(TRACE_BORDER, RSQLSECURITYPOLICY_CLOSE_ENTRY , "Entry;0x%X;RSqlSecurityPolicy::Close", (TUint)this));
 	delete iImpl;
+    SQL_TRACE_BORDER(OstTraceExt2(TRACE_BORDER, RSQLSECURITYPOLICY_CLOSE_EXIT, "Exit;0x%X;RSqlSecurityPolicy::Close;iImpl=0x%X", (TUint)this, (TUint)iImpl));
 	iImpl = NULL;
 	}
 
@@ -103,8 +110,7 @@
 */
 EXPORT_C TInt RSqlSecurityPolicy::SetDbPolicy(TPolicyType aPolicyType, const TSecurityPolicy& aPolicy)
 	{
-	SQLUTRACE_PROFILER(this);
-	__SQLASSERT_ALWAYS(aPolicyType >= ESchemaPolicy && aPolicyType <= EWritePolicy, ESqlPanicBadArgument);
+	__ASSERT_ALWAYS(aPolicyType >= ESchemaPolicy && aPolicyType <= EWritePolicy, __SQLPANIC(ESqlPanicBadArgument));
 	Impl().SetDbPolicy(aPolicyType, aPolicy);
 	return KErrNone;
 	}
@@ -140,10 +146,9 @@
 EXPORT_C TInt RSqlSecurityPolicy::SetPolicy(TObjectType aObjectType, const TDesC& aObjectName, 
 									  TPolicyType aPolicyType, const TSecurityPolicy& aPolicy)
 	{
-	SQLUTRACE_PROFILER(this);
-	__SQLASSERT_ALWAYS(aObjectType == ETable, ESqlPanicBadArgument);
-	__SQLASSERT_ALWAYS(aObjectName.Length() > 0, ESqlPanicBadArgument);
-	__SQLASSERT_ALWAYS(aPolicyType >= EReadPolicy && aPolicyType <= EWritePolicy, ESqlPanicBadArgument);
+	__ASSERT_ALWAYS(aObjectType == ETable, __SQLPANIC(ESqlPanicBadArgument));
+	__ASSERT_ALWAYS(aObjectName.Length() > 0, __SQLPANIC(ESqlPanicBadArgument));
+	__ASSERT_ALWAYS(aPolicyType >= EReadPolicy && aPolicyType <= EWritePolicy, __SQLPANIC(ESqlPanicBadArgument));
 	return Impl().SetPolicy(aObjectType, aObjectName, aPolicyType, aPolicy);
 	}
 
@@ -158,7 +163,6 @@
 */	
 EXPORT_C TSecurityPolicy RSqlSecurityPolicy::DefaultPolicy() const
 	{
-	SQLUTRACE_PROFILER(this);
 	return Impl().DefaultPolicy();
 	}
 
@@ -179,8 +183,7 @@
 */	
 EXPORT_C TSecurityPolicy RSqlSecurityPolicy::DbPolicy(TPolicyType aPolicyType) const
 	{
-	SQLUTRACE_PROFILER(this);
-	__SQLASSERT_ALWAYS(aPolicyType >= ESchemaPolicy && aPolicyType <= EWritePolicy, ESqlPanicBadArgument);
+	__ASSERT_ALWAYS(aPolicyType >= ESchemaPolicy && aPolicyType <= EWritePolicy, __SQLPANIC(ESqlPanicBadArgument));
 	return Impl().DbPolicy(aPolicyType);
 	}
 	
@@ -209,10 +212,9 @@
 EXPORT_C TSecurityPolicy RSqlSecurityPolicy::Policy(TObjectType aObjectType, const TDesC& aObjectName, 
 												 TPolicyType aPolicyType) const
 	{
-	SQLUTRACE_PROFILER(this);
-	__SQLASSERT_ALWAYS(aObjectType == ETable, ESqlPanicBadArgument);
-	__SQLASSERT_ALWAYS(aObjectName.Length() > 0, ESqlPanicBadArgument);
-	__SQLASSERT_ALWAYS(aPolicyType >= EReadPolicy && aPolicyType <= EWritePolicy, ESqlPanicBadArgument);
+	__ASSERT_ALWAYS(aObjectType == ETable, __SQLPANIC(ESqlPanicBadArgument));
+	__ASSERT_ALWAYS(aObjectName.Length() > 0, __SQLPANIC(ESqlPanicBadArgument));
+	__ASSERT_ALWAYS(aPolicyType >= EReadPolicy && aPolicyType <= EWritePolicy, __SQLPANIC(ESqlPanicBadArgument));
 	return Impl().Policy(aObjectType, aObjectName, aPolicyType);
 	}
 
@@ -227,7 +229,7 @@
 */
 EXPORT_C void RSqlSecurityPolicy::ExternalizeL(RWriteStream& aStream) const
 	{
-	SQLUTRACE_PROFILER(this);
+    SQL_TRACE_BORDER(OstTraceExt3(TRACE_BORDER, RSQLSECURITYPOLICY_EXTERNALIZEL_ENTRY , "Entry;0x%X;RSqlSecurityPolicy::ExternalizeL;aStream=0x%X;aStream.Sink()=0x%X", (TUint)this, (TUint)&aStream, (TUint)aStream.Sink()));
 	RSqlSecurityPolicy::TObjectType objectType;
 	TPtrC objectName;
 	RSqlSecurityPolicy::TPolicyType policyType;
@@ -253,6 +255,7 @@
 		}
 	//Object policy stream - end
 	aStream << KEndOfSPStream;
+    SQL_TRACE_BORDER(OstTrace1(TRACE_BORDER, RSQLSECURITYPOLICY_EXTERNALIZEL_EXIT, "Exit;0x%X;RSqlSecurityPolicy::ExternalizeL", (TUint)this));
 	}
 	
 /**
@@ -268,7 +271,7 @@
 */
 EXPORT_C void RSqlSecurityPolicy::InternalizeL(RReadStream& aStream)
 	{
-	SQLUTRACE_PROFILER(this);
+    SQL_TRACE_BORDER(OstTraceExt3(TRACE_BORDER, RSQLSECURITYPOLICY_INTERNALIZEL_ENTRY , "Entry;0x%X;RSqlSecurityPolicy::InternalizeL;aStream=0x%X;aStream.Source()=0x%X", (TUint)this, (TUint)&aStream, (TUint)aStream.Source()));
 	TSecurityPolicy policy;
 	TBuf8<sizeof(TSecurityPolicy)> policyBuf;
 	//Default policy
@@ -311,6 +314,7 @@
 	iImpl = temp;
 	//Destroy the old policy (which was swapped)
 	CleanupStack::PopAndDestroy(&newPolicy);
+    SQL_TRACE_BORDER(OstTrace1(TRACE_BORDER, RSQLSECURITYPOLICY_INTERNALIZEL_EXIT, "Exit;0x%X;RSqlSecurityPolicy::InternalizeL", (TUint)this));
 	}
 
 /**
@@ -333,6 +337,6 @@
 */
 CSqlSecurityPolicy& RSqlSecurityPolicy::Impl() const
 	{
-	__SQLASSERT_ALWAYS(iImpl != NULL, ESqlPanicInvalidObj);
+	__ASSERT_ALWAYS(iImpl != NULL, __SQLPANIC(ESqlPanicInvalidObj));
 	return *iImpl;	
 	}