--- a/smsprotocols/smsstack/wapprot/Src/wappstor.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/wappstor.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "wappstorTraces.h"
-#endif
-
 #include "wappstor.h"
 #include "ws_main.h"
 #include "smsstackutils.h"
@@ -32,7 +26,7 @@
 
 CWapReassemblyStore* CWapReassemblyStore::NewL(RFs& aFs)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_NEWL_1, "CWapReassemblyStore::NewL()");
+    LOGWAPPROT1("CWapReassemblyStore::NewL()");
 
     CWapReassemblyStore* reassembly=new (ELeave)CWapReassemblyStore(aFs);
    	CleanupStack::PushL(reassembly);
@@ -50,7 +44,7 @@
 
 TBool CWapReassemblyStore::AddMessageL( TInt& aIndex, const CWapDatagram& aDatagram)                                                
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_ADDMESSAGEL_1, "CWapReassemblyStore::AddMessageL()");
+    LOGWAPPROT1("CWapReassemblyStore::AddMessageL()");
 
     CArrayPtrFlat<CWapDatagram::TSegmentData>* segmentArray = new
         (ELeave) CArrayPtrFlat<CWapDatagram::TSegmentData> (8);
@@ -204,7 +198,7 @@
 void CWapReassemblyStore::GetDatagramL( TInt            aIndex,
                                                 CWapDatagram&   aDatagram)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_GETDATAGRAML_1, "CWapReassemblyStore::GetDatagramL()");
+    LOGWAPPROT1("CWapReassemblyStore::GetDatagramL()");
 
     CArrayPtrFlat<CWapDatagram::TSegmentData>* segmentArray = new
         (ELeave) CArrayPtrFlat<CWapDatagram::TSegmentData> (8);
@@ -237,7 +231,7 @@
 
 TBool CWapReassemblyStore::FindAndDeleteDatagramL( CWapDatagram& aDatagram)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1, "CWapReassemblyStore::FindAndDeleteDatagramL()");
+	LOGWAPPROT1("CWapReassemblyStore::FindAndDeleteDatagramL()");
 
 	TInt index;
 	TBool isFound = EFalse;
@@ -269,7 +263,7 @@
 
 void CWapReassemblyStore::ConstructL()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_CONSTRUCTL_1, "CWapReassemblyStore::ConstructL()");
+    LOGWAPPROT1("CWapReassemblyStore::ConstructL()");
 
     //get full path of reassembly store
     PrivatePath(iFullPathBuf);
@@ -292,7 +286,7 @@
                             CWapDatagram&               aDatagram,
                             CArrayPtr<CWapDatagram::TSegmentData>&  aSegmentArray)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1, "CWapReassemblyStore::InternalizeEntryL Start");
+    LOGWAPPROT1("CWapReassemblyStore::InternalizeEntryL Start");
 
 	BeginTransactionLC();
     RStoreReadStream ReadStream;
@@ -324,7 +318,7 @@
     // Closes the ReadStream
     CleanupStack::PopAndDestroy();
 	CommitTransactionL();
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2, "CWapReassemblyStore::InternalizeEntryL End");
+    LOGWAPPROT1("CWapReassemblyStore::InternalizeEntryL End");
     } // CWapReassemblyStore::InternalizeEntryL
 
 
@@ -341,7 +335,7 @@
                             const CWapDatagram& aDatagram,
                             const CArrayPtr<CWapDatagram::TSegmentData>& aSegmentArray)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1, "CWapReassemblyStore::ExternalizeEntryL Start");
+    LOGWAPPROT1("CWapReassemblyStore::ExternalizeEntryL Start");
     
     TInt32 Count = aSegmentArray.Count();
     RStoreWriteStream WriteStream;
@@ -376,7 +370,7 @@
                                         const CWapDatagram& aDatagram,
                                         TInt                aNumDatagrams)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_POPULATEENTRY_1, "CWapReassemblyStore::PopulateEntry()");
+    LOGWAPPROT1("CWapReassemblyStore::PopulateEntry()");
 
     TInt ToPort = 0;
     TInt FromPort = 0;
@@ -408,7 +402,7 @@
 void CWapReassemblyStore::CreateEntryL(const CWapDatagram&                 aDatagram,
                                        const CArrayPtr<CWapDatagram::TSegmentData>& aSegmentArray)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_CREATEENTRYL_1, "CWapReassemblyStore::CreateEntryL");
+	LOGWAPPROT1("CWapReassemblyStore::CreateEntryL");
 
     TWapReassemblyEntry Entry;
     TStreamId WriteStream = KNullStreamId;
@@ -433,7 +427,7 @@
  */
 void CWapReassemblyStore::OpenStoreL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_OPENSTOREL_1, "CWapReassemblyStore::OpenStoreL()");
+	LOGWAPPROT1("CWapReassemblyStore::OpenStoreL()");
 
 	OpenL(iFullPathBuf,KWapReassemblyStoreUid);
 	} // CWapReassemblyStore::OpenStoreL