diff -r 630d2f34d719 -r 07a122eea281 smsprotocols/smsstack/smsprot/Src/smspdel.cpp
--- a/smsprotocols/smsstack/smsprot/Src/smspdel.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspdel.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 "smspdelTraces.h"
-#endif
-
 #include "smspdel.h"
 #include "smspmain.h"
 
@@ -40,7 +34,7 @@
 								   RMobileSmsMessaging& aSmsMessaging
 								   )
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_NEWL_1, "CSmsPDUDelete::NewL()");
+	LOGSMSPROT1("CSmsPDUDelete::NewL()");
 
 	CSmsPDUDelete* smsPduDelete =
 		new(ELeave) CSmsPDUDelete(aSmsSettings,aSmsMessaging);
@@ -74,7 +68,7 @@
  */
 void CSmsPDUDelete::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_CONSTRUCTL_1, "CSmsPDUDelete::ConstructL()");
+	LOGSMSPROT1("CSmsPDUDelete::ConstructL()");
 
 	ConstructTimeoutL();
 	} // CSmsPDUDelete::ConstructL
@@ -89,7 +83,7 @@
  */
 void CSmsPDUDelete::Start(CArrayFix<TGsmSmsSlotEntry>& aLocationArray, TRequestStatus& aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_START_1, "CSmsPDUDelete::Start()");
+	LOGSMSPROT1("CSmsPDUDelete::Start()");
 
 	__ASSERT_DEBUG(iState==ESmsPDUDeleteIdle,SmspPanic(KSmspPanicUnexpectedState));
 
@@ -108,7 +102,7 @@
  */
 void CSmsPDUDelete::DoRunL()
 	{
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_DORUNL_1, "CSmsPDUDelete::RunL [iStatus=%d]", iStatus.Int());
+    LOGSMSPROT2("CSmsPDUDelete::RunL [iStatus=%d]", iStatus.Int());
 
 	switch (iState)
 		{
@@ -179,7 +173,7 @@
  */
 void CSmsPDUDelete::OpenStore()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_OPENSTORE_1, "CSmsPDUDelete::OpenStore()");
+	LOGSMSPROT1("CSmsPDUDelete::OpenStore()");
 
 	//
 	// Open the SMS Store for the first PDU...
@@ -218,7 +212,7 @@
  */
 void CSmsPDUDelete::DeletePDU()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_DELETEPDU_1, "CSmsPDUDelete::DeletePDU()");
+	LOGSMSPROT1("CSmsPDUDelete::DeletePDU()");
 
 	//
 	// Delete the first entry in the list...
@@ -239,7 +233,7 @@
  */
 void CSmsPDUDelete::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_DOCANCEL_1, "CSmsPDUDelete::DoCancel()");
+	LOGSMSPROT1("CSmsPDUDelete::DoCancel()");
 
 	TimedSetActiveCancel();
 
@@ -285,7 +279,7 @@
  */
 void CSmsPDUDelete::Complete(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_COMPLETE_1, "CSmsPDUDelete::Complete()");
+	LOGSMSPROT1("CSmsPDUDelete::Complete()");
 
 	//
 	// Only close the SMS Storage if the object is not active (and it may be