diff -r 630d2f34d719 -r 07a122eea281 smsprotocols/smsstack/smsprot/Src/smspqueue.cpp
--- a/smsprotocols/smsstack/smsprot/Src/smspqueue.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspqueue.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspqueueTraces.h"
-#endif
-
 #include "smspqueue.h"
 #include "smspcomm.h"
 #include "Gsmumsg.h"
@@ -85,7 +79,7 @@
 
 void CSmspMessageQueue::DoRunL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_DORUNL_1, "CSmspMessageQueue::DoRunL()");
+	LOGSMSPROT1("CSmspMessageQueue::DoRunL()");
 
 	CompleteFirst(iStatus.Int());
 	Start();
@@ -96,7 +90,7 @@
 	{
 	TRAPD(err, DoQueueL(aMessage, aObserver, aOptions));
 
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_QUEUE_1, "*** CSmspMessageQueue::Queue [err=%d aObserver=0x%08x IsActive=%d]", err, (TUint) &aObserver, IsActive());
+	LOGSMSPROT4("*** CSmspMessageQueue::Queue [err=%d aObserver=0x%08x IsActive=%d]", err, &aObserver, IsActive());
 
 	if (err != KErrNone)
 		{
@@ -111,7 +105,7 @@
 
 void CSmspMessageQueue::DoQueueL(CSmsMessage* aMessage, MSmsMessageObserver& aObserver, TUint aOptions)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_DOQUEUEL_1, "CSmspMessageQueue::DoQueueL()");
+	LOGSMSPROT1("CSmspMessageQueue::DoQueueL()");
 
 	CleanupStack::PushL(aMessage);
 
@@ -138,7 +132,7 @@
  */
 void CSmspMessageQueue::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_DOCANCEL_1, "*** CSmspMessageQueue::DoCancel");
+	LOGSMSPROT1("*** CSmspMessageQueue::DoCancel");
 
 	TSglQueIter<CQueuedSmsMessage> iter(iMessageQueue);
 	CQueuedSmsMessage* queuedsmsmessage = iter;
@@ -152,7 +146,7 @@
 
 void CSmspMessageQueue::CompleteFirst(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_COMPLETEFIRST_1, "CSmspMessageQueue::CompleteFirst()");
+	LOGSMSPROT1("CSmspMessageQueue::CompleteFirst()");
 
 	CompleteRequest(iMessageQueue.First(), aStatus);
 	} // CSmspMessageQueue::CompleteFirst
@@ -160,7 +154,7 @@
 
 void CSmspMessageQueue::CompleteRequest(CQueuedSmsMessage* aQueuedMessage, TInt aStatus)
 	{
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_COMPLETEREQUEST_1, "*** CSmspMessageQueue::CompleteRequest [aStatus=%d aObserver=0x%X IsFirst=%d]", aStatus,(TUint) &aQueuedMessage->iObserver, iMessageQueue.IsFirst(aQueuedMessage));
+	LOGSMSPROT4("*** CSmspMessageQueue::CompleteRequest [aStatus=%d aObserver=0x%X IsFirst=%d]", aStatus, &aQueuedMessage->iObserver, iMessageQueue.IsFirst(aQueuedMessage));
 
 	// From defect HOE-563KLY, need to cancel request if active and remove from queue
 	// before observer has chance to manipulate queue
@@ -173,7 +167,7 @@
 
 void CSmspMessageQueue::CancelObserver(MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_CANCELOBSERVER_1, "*** CSmspMessageQueue::CancelObserver [aObserver=0x%X]", &aObserver);
+	LOGSMSPROT2("*** CSmspMessageQueue::CancelObserver [aObserver=0x%X]", &aObserver);
 
 	TSglQueIter<CQueuedSmsMessage> iter(iMessageQueue);
 	CQueuedSmsMessage* queuedsmsmessage = iter;
@@ -226,7 +220,7 @@
  */
 CQueuedPDUDelete* CQueuedPDUDelete::NewL(const CArrayFix<TGsmSmsSlotEntry>& aSlotArray,MSmsMessageObserver* aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQUEUEDPDUDELETE_NEWL_1, "CQueuedPDUDelete::NewL()");
+	LOGSMSPROT1("CQueuedPDUDelete::NewL()");
 
 	CQueuedPDUDelete* queuedpdudelete=new(ELeave) CQueuedPDUDelete(aObserver);
 	CleanupStack::PushL(queuedpdudelete);
@@ -255,7 +249,7 @@
  */
 void CQueuedPDUDelete::ConstructL(const CArrayFix<TGsmSmsSlotEntry>& aSlotArray)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQUEUEDPDUDELETE_CONSTRUCTL_1, "CQueuedPDUDelete::ConstructL()");
+	LOGSMSPROT1("CQueuedPDUDelete::ConstructL()");
 
 	TInt count=aSlotArray.Count();
 	for (TInt i=0; i<count; i++)
@@ -284,7 +278,7 @@
  */
 void CSmspDeleteQueue::RunL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_RUNL_1, "CSmspDeleteQueue::RunL()");
+	LOGSMSPROT1("CSmspDeleteQueue::RunL()");
 
 	CompleteFirst(iStatus.Int());
 
@@ -305,7 +299,7 @@
     {
     // Ignore in code coverage - the delete queue implements its own RunL.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_DORUNL_1, "CSmspDeleteQueue::DoRunL()");
+    LOGSMSPROT1("CSmspDeleteQueue::DoRunL()");
 
 // This CSmspDeleteQueue::DoRunL() function would be called by
 // CSmsuActiveBase::RunL().  However, CSmspDeleteQueue::RunL() now
@@ -319,7 +313,7 @@
 	{
 	TRAPD(err, DoQueueL(aSlotArray, aObserver));
 
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_QUEUE_1, "*** CSmspDeleteQueue::Queue [err=%d aObserver=0x%X IsActive=%d]", err, (TUint)aObserver, IsActive());
+	LOGSMSPROT4("*** CSmspDeleteQueue::Queue [err=%d aObserver=0x%X IsActive=%d]", err, aObserver, IsActive());
 
 	if (err != KErrNone)
 		{
@@ -335,7 +329,7 @@
 
 void CSmspDeleteQueue::DoQueueL(const CArrayFix<TGsmSmsSlotEntry>& aSlotArray, MSmsMessageObserver* aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_DOQUEUEL_1, "CSmspDeleteQueue::DoQueueL()");
+	LOGSMSPROT1("CSmspDeleteQueue::DoQueueL()");
 
 	CQueuedPDUDelete* queuedDelete= CQueuedPDUDelete::NewL(aSlotArray, aObserver);
 	iDeleteQueue.AddLast(*queuedDelete);
@@ -345,7 +339,7 @@
 CSmspDeleteQueue::CSmspDeleteQueue(MSmsComm& aSmsComm, TInt aPriority)
 : CSmspProtocolQueue(aSmsComm, aPriority)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_CTOR_1, "CSmspDeleteQueue::CSmspDeleteQueue()");
+	LOGSMSPROT1("CSmspDeleteQueue::CSmspDeleteQueue()");
 
 	iDeleteQueue.SetOffset(_FOFF(CQueuedPDUDelete,iLink));
 	} // CSmspDeleteQueue::CSmspDeleteQueue
@@ -356,7 +350,7 @@
  */
 void CSmspDeleteQueue::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_DOCANCEL_1, "*** CSmspDeleteQueue::DoCancel");
+	LOGSMSPROT1("*** CSmspDeleteQueue::DoCancel");
 
 	iSmsPDUDelete->Cancel();
 
@@ -370,7 +364,7 @@
 
 void CSmspDeleteQueue::CompleteFirst(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_COMPLETEFIRST_1, "CSmspDeleteQueue::CompleteFirst()");
+	LOGSMSPROT1("CSmspDeleteQueue::CompleteFirst()");
 
 	CompleteRequest(iDeleteQueue.First(), aStatus);
 	} // CSmspDeleteQueue::CompleteFirst
@@ -378,7 +372,7 @@
 
 void CSmspDeleteQueue::CompleteRequest(CQueuedPDUDelete* aQueuedDelete, TInt aStatus)
 	{
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_COMPLETEREQUEST_1, "*** CSmspDeleteQueue::CompleteRequest [aStatus=%d aObserver=0x%X IsFirst=%d]", aStatus, (TUint)aQueuedDelete->iObserver, iDeleteQueue.IsFirst(aQueuedDelete));
+	LOGSMSPROT4("*** CSmspDeleteQueue::CompleteRequest [aStatus=%d aObserver=0x%X IsFirst=%d]", aStatus, aQueuedDelete->iObserver, iDeleteQueue.IsFirst(aQueuedDelete));
 
 	if (aQueuedDelete->iObserver != NULL)
 		CompleteObserver(*aQueuedDelete->iObserver, aStatus);
@@ -390,7 +384,7 @@
 
 void CSmspDeleteQueue::CancelObserver(MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_CANCELOBSERVER_1, "*** CSmspDeleteQueue::CancelObserver [aObserver=0x%X]", &aObserver);
+	LOGSMSPROT2("*** CSmspDeleteQueue::CancelObserver [aObserver=0x%X]", &aObserver);
 
 	TSglQueIter<CQueuedPDUDelete> iter(iDeleteQueue);
 	CQueuedPDUDelete* queuedDelete = iter;
@@ -415,7 +409,7 @@
 
 CSmspDeleteQueue* CSmspDeleteQueue::NewL(MSmsComm& aSmsComm, const TSmsSettings& aSmsSettings, RMobileSmsMessaging& aSmsMessaging, TInt aPriority)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_NEWL_1, "CSmspDeleteQueue::NewL()");
+	LOGSMSPROT1("CSmspDeleteQueue::NewL()");
 
 	CSmspDeleteQueue* self = new (ELeave) CSmspDeleteQueue(aSmsComm, aPriority);
 	CleanupStack::PushL(self);
@@ -427,7 +421,7 @@
 
 void CSmspDeleteQueue::Start()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_START_1, "*** CSmspDeleteQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iDeleteQueue.IsEmpty());
+	LOGSMSPROT3("*** CSmspDeleteQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iDeleteQueue.IsEmpty());
 
 	if (!IsActive() && !iDeleteQueue.IsEmpty())
 		{
@@ -455,7 +449,7 @@
 
 void CSmspDeleteQueue::ConstructL(const TSmsSettings& aSmsSettings, RMobileSmsMessaging& aSmsMessaging)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_CONSTRUCTL_1, "CSmspDeleteQueue::ConstructL()");
+	LOGSMSPROT1("CSmspDeleteQueue::ConstructL()");
 
 	iSmsPDUDelete = CSmsPDUDelete::NewL(aSmsSettings, aSmsMessaging);
 	} // CSmspDeleteQueue::ConstructL
@@ -463,7 +457,7 @@
 
 void CSmspDeleteQueue::CompleteObserver(MSmsMessageObserver& aObserver, TInt aError, const CSmsMessage*)
 	{
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_COMPLETEOBSERVER_1, "*** CSmspDeleteQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", (TUint)&aObserver, aError, IsActive());
+	LOGSMSPROT4("*** CSmspDeleteQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", &aObserver, aError, IsActive());
 
 	if (iSmsComm.ObserverIsPresent(aObserver))
 		{
@@ -479,7 +473,7 @@
 
 CSmspSendQueue* CSmspSendQueue::NewL(MSmsComm& aSmsComm, CSmsSegmentationStore& aSegmentationStore, const TSmsSettings& aSmsSettings, const RMobileSmsMessaging::TMobileSmsCapsV1& aMobileSmsCaps, RMobileSmsMessaging& aSmsMessaging, TInt aPriority, CSmspSetBearer& aSmspSetBearer)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_NEWL_1, "CSmspSendQueue::NewL()");
+	LOGSMSPROT1("CSmspSendQueue::NewL()");
 
 	CSmspSendQueue* self = new (ELeave) CSmspSendQueue(aSmsComm, aPriority);
 	CleanupStack::PushL(self);
@@ -491,7 +485,7 @@
 
 void CSmspSendQueue::Start()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_START_1, "*** CSmspSendQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iMessageQueue.IsEmpty());
+	LOGSMSPROT3("*** CSmspSendQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iMessageQueue.IsEmpty());
 
 	if (!IsActive() && !iMessageQueue.IsEmpty())
 		{
@@ -517,7 +511,7 @@
 
 void CSmspSendQueue::ConstructL(CSmsSegmentationStore& aSegmentationStore, const TSmsSettings& aSmsSettings, const RMobileSmsMessaging::TMobileSmsCapsV1& aMobileSmsCaps, RMobileSmsMessaging& aSmsMessaging, CSmspSetBearer& aSmspSetBearer)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_CONSTRUCTL_1, "CSmspSendQueue::ConstructL()");
+	LOGSMSPROT1("CSmspSendQueue::ConstructL()");
 
 	iSmsMessageSend = CSmsMessageSend::NewL(aSegmentationStore, aSmsSettings, aMobileSmsCaps, aSmsMessaging, Priority(), aSmspSetBearer);
 	} // CSmspSendQueue::ConstructL
@@ -525,7 +519,7 @@
 
 void CSmspSendQueue::CancelRequestIfObserved(MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_CANCELREQUESTIFOBSERVED_1, "CSmspSendQueue::CancelRequestIfObserved()");
+	LOGSMSPROT1("CSmspSendQueue::CancelRequestIfObserved()");
 
 	if (IsActive() && &iMessageQueue.First()->iObserver == &aObserver)
 		{
@@ -536,7 +530,7 @@
 
 void CSmspSendQueue::CompleteObserver(MSmsMessageObserver& aObserver, TInt aError, const CSmsMessage*)
 	{
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_COMPLETEOBSERVER_1, "*** CSmspSendQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", (TUint)&aObserver, aError, IsActive());
+	LOGSMSPROT4("*** CSmspSendQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", &aObserver, aError, IsActive());
 
 	if (iSmsComm.ObserverIsPresent(aObserver))
 		{
@@ -547,7 +541,7 @@
 
 void CSmspSendQueue::Complete(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_COMPLETE_1, "CSmspSendQueue::Complete()");
+	LOGSMSPROT1("CSmspSendQueue::Complete()");
 
 	iSmsComm.MessageSendCompleted(aStatus);
 	} // CSmspSendQueue::Complete
@@ -561,7 +555,7 @@
 
 CSmspWriteQueue* CSmspWriteQueue::NewL(MSmsComm& aSmsComm, const TSmsSettings& aSmsSettings, RMobilePhone& aGsmPhone, CSmsSegmentationStore& aSegmentationStore, TInt aPriority)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_NEWL_1, "CSmspWriteQueue::NewL()");
+	LOGSMSPROT1("CSmspWriteQueue::NewL()");
 
 	CSmspWriteQueue* self = new (ELeave) CSmspWriteQueue(aSmsComm, aPriority);
 	CleanupStack::PushL(self);
@@ -573,7 +567,7 @@
 
 void CSmspWriteQueue::Start()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_START_1, "*** CSmspWriteQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iMessageQueue.IsEmpty());
+	LOGSMSPROT3("*** CSmspWriteQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iMessageQueue.IsEmpty());
 
 	if (!IsActive() && !iMessageQueue.IsEmpty())
 		{
@@ -599,7 +593,7 @@
 
 void CSmspWriteQueue::ConstructL(const TSmsSettings& aSmsSettings, RMobilePhone& aGsmPhone, CSmsSegmentationStore& aSegmentationStore)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_CONSTRUCTL_1, "CSmspWriteQueue::ConstructL()");
+	LOGSMSPROT1("CSmspWriteQueue::ConstructL()");
 
 	iSmsMessageWrite = CSmsMessageWrite::NewL(iSmsComm, aSmsSettings, aGsmPhone, aSegmentationStore);
 	} // CSmspWriteQueue::ConstructL
@@ -607,7 +601,7 @@
 
 void CSmspWriteQueue::CancelRequestIfObserved(MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_CANCELREQUESTIFOBSERVED_1, "CSmspWriteQueue::CancelRequestIfObserved()");
+	LOGSMSPROT1("CSmspWriteQueue::CancelRequestIfObserved()");
 
 	if (IsActive() && &iMessageQueue.First()->iObserver == &aObserver)
 		{
@@ -618,7 +612,7 @@
 
 void CSmspWriteQueue::CompleteObserver(MSmsMessageObserver& aObserver, TInt aError, const CSmsMessage* aSmsMessage)
 	{
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_COMPLETEOBSERVER_1, "*** CSmspWriteQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", (TUint)&aObserver, aError, IsActive());
+	LOGSMSPROT4("*** CSmspWriteQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", &aObserver, aError, IsActive());
 	if (iSmsComm.ObserverIsPresent(aObserver))
 		{
 		aObserver.MessageWriteCompleted(aError, aSmsMessage);
@@ -628,7 +622,7 @@
 
 void CSmspWriteQueue::Complete(TInt)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_COMPLETE_1, "CSmspWriteQueue::Complete()");
+	LOGSMSPROT1("CSmspWriteQueue::Complete()");
 
 	//Do Nothing :o)
 	} // CSmspWriteQueue::Complete