--- a/persistentstorage/sql/SRC/Server/SqlSrvDriveSpace.cpp	Tue Aug 31 16:57:14 2010 +0300
+++ b/persistentstorage/sql/SRC/Server/SqlSrvDriveSpace.cpp	Wed Sep 01 12:39:58 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -16,12 +16,7 @@
 //
 
 #include "SqlSrvDriveSpace.h"
-#include "SqlAssert.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "SqlSrvDriveSpaceTraces.h"
-#endif
-#include "SqlTraceDef.h"
+#include "SqlPanic.h"
 
 /**
 The amount of the disk space, which will be reserved at the moment of creation of
@@ -57,12 +52,10 @@
 */
 CSqlDriveSpace* CSqlDriveSpace::NewLC(RFs& aFs, TDriveNumber aDrive)
     {
-	SQL_TRACE_INTERNALS(OstTraceExt2(TRACE_INTERNALS, CSQLDRIVESPACE_NEWLC_ENTRY, "Entry;0;CSqlDriveSpace::NewLC;aFs.Handle()=0x%X;aDrive=%d", (TUint)aFs.Handle(), (TInt)aDrive));
-	__ASSERT_DEBUG(aDrive >= EDriveA && aDrive <= EDriveZ, __SQLPANIC2(ESqlPanicBadArgument));
+	__SQLASSERT(aDrive >= EDriveA && aDrive <= EDriveZ, ESqlPanicBadArgument);
     CSqlDriveSpace* self = new (ELeave) CSqlDriveSpace(aFs, aDrive);
     CleanupStack::PushL(self);
     self->ConstructL();
-	SQL_TRACE_INTERNALS(OstTrace1(TRACE_INTERNALS, CSQLDRIVESPACE_NEWLC_EXIT, "Exit;0x%X;CSqlDriveSpace::NewLC", (TUint)self));
     return self;
     }
 
@@ -71,7 +64,6 @@
 */
 CSqlDriveSpace::~CSqlDriveSpace()
     {
-	SQL_TRACE_INTERNALS(OstTraceExt3(TRACE_INTERNALS, CSQLDRIVESPACE_CSQLDRIVESPACE2, "0x%X;CSqlDriveSpace::~CSqlDriveSpace;iDrive=%d;iGetAccessRefCnt=%d", (TUint)this, (TInt)iDrive, iGetAccessRefCnt));
 	SQLDRIVESPACE_INVARIANT();
 	(void)iFs.ReleaseReserveAccess(static_cast <TInt> (iDrive));
 	(void)iFs.ReserveDriveSpace(static_cast <TInt> (iDrive), 0);
@@ -90,7 +82,6 @@
 */
 void CSqlDriveSpace::GetAccessL()
 	{
-	SQL_TRACE_INTERNALS(OstTraceExt3(TRACE_INTERNALS, CSQLDRIVESPACE_GETACCESSL_ENTRY, "Entry;0x%X;CSqlDriveSpace::GetAccessL;iDrive=%d;iGetAccessRefCnt=%d", (TUint)this, (TInt)iDrive, iGetAccessRefCnt));
 	SQLDRIVESPACE_INVARIANT();
 	//Gets an access only once, there is only one RFs session instance.
 	if(iGetAccessRefCnt == 0)
@@ -98,7 +89,6 @@
 		__SQLLEAVE_IF_ERROR(iFs.GetReserveAccess(static_cast <TInt> (iDrive)));
 		}
 	++iGetAccessRefCnt;
-	SQL_TRACE_INTERNALS(OstTraceExt3(TRACE_INTERNALS, CSQLDRIVESPACE_GETACCESSL_EXIT, "Exit;0x%X;CSqlDriveSpace::GetAccessL;iDrive=%d;iGetAccessRefCnt=%d", (TUint)this, (TInt)iDrive, iGetAccessRefCnt));
 	SQLDRIVESPACE_INVARIANT();
 	}
 
@@ -113,7 +103,6 @@
 */
 void CSqlDriveSpace::ReleaseAccess()
 	{
-	SQL_TRACE_INTERNALS(OstTraceExt3(TRACE_INTERNALS, CSQLDRIVESPACE_RELEASEACCESS, "0x%X;CSqlDriveSpace::ReleaseAccess;iDrive=%d;iGetAccessRefCnt=%d", (TUint)this, (TInt)iDrive, iGetAccessRefCnt));
 	SQLDRIVESPACE_INVARIANT();
     if(iGetAccessRefCnt == 0)
         {
@@ -138,7 +127,7 @@
 	iFs(aFs),
 	iDrive(aDrive)
 	{
-	__ASSERT_DEBUG(aDrive >= EDriveA && aDrive <= EDriveZ, __SQLPANIC(ESqlPanicBadArgument));
+	__SQLASSERT(aDrive >= EDriveA && aDrive <= EDriveZ, ESqlPanicBadArgument);
 	}
 
 /**
@@ -163,8 +152,8 @@
 */
 void CSqlDriveSpace::Invariant() const
 	{
-	__ASSERT_DEBUG(iDrive >= EDriveA && iDrive <= EDriveZ, __SQLPANIC(ESqlPanicInternalError));
-	__ASSERT_DEBUG(iGetAccessRefCnt >= 0, __SQLPANIC(ESqlPanicMisuse));
+	__SQLASSERT(iDrive >= EDriveA && iDrive <= EDriveZ, ESqlPanicInternalError);
+	__SQLASSERT(iGetAccessRefCnt >= 0, ESqlPanicMisuse);
 	}
 #endif//_DEBUG
 
@@ -213,7 +202,7 @@
 */
 CSqlDriveSpace* RSqlDriveSpaceCol::Find(TDriveNumber aDrive)
     {
-	__ASSERT_DEBUG(aDrive >= EDriveA && aDrive <= EDriveZ, __SQLPANIC(ESqlPanicBadArgument));
+	__SQLASSERT(aDrive >= EDriveA && aDrive <= EDriveZ, ESqlPanicBadArgument);
 	SQLDRIVESPACECOL_INVARIANT();
     for(TInt index=iDriveSpaceCol.Count()-1;index>=0;--index)
         {
@@ -241,8 +230,8 @@
 */
 CSqlDriveSpace* RSqlDriveSpaceCol::AddL(TDriveNumber aDrive)
 	{
-	__ASSERT_DEBUG(aDrive >= EDriveA && aDrive <= EDriveZ, __SQLPANIC(ESqlPanicBadArgument));
-    __ASSERT_DEBUG(!Find(aDrive), __SQLPANIC(ESqlPanicMisuse));
+	__SQLASSERT(aDrive >= EDriveA && aDrive <= EDriveZ, ESqlPanicBadArgument);
+    __SQLASSERT(!Find(aDrive), ESqlPanicMisuse);
 	SQLDRIVESPACECOL_INVARIANT();
     CSqlDriveSpace* drvSpace = CSqlDriveSpace::NewLC(*iFs, aDrive);
     __SQLLEAVE_IF_ERROR(iDriveSpaceCol.Append(drvSpace));
@@ -257,7 +246,7 @@
 */
 void RSqlDriveSpaceCol::Invariant() const
 	{
-	__ASSERT_DEBUG(iFs != NULL, __SQLPANIC(ESqlPanicInternalError));
+	__SQLASSERT(iFs != NULL, ESqlPanicInternalError);
     for(TInt index=iDriveSpaceCol.Count()-1;index>=0;--index)
     	{
 		iDriveSpaceCol[index]->Invariant();