diff -r 630d2f34d719 -r 07a122eea281 smsprotocols/smsstack/wapprot/Src/ws_obsvr.cpp
--- a/smsprotocols/smsstack/wapprot/Src/ws_obsvr.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/ws_obsvr.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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 "ws_obsvrTraces.h"
-#endif
-
 #include "ws_obsvr.h"
 
 #include <commsdattypesv1_1.h>
@@ -89,7 +83,7 @@
  */
 CWapSapMessageSender* CWapSapMessageSender::NewL(CSmsProtocol* aSmsProtocol, CWapSmsProvider* aWapSap)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_NEWL_1, "CWapSapMessageSender::NewL");
+	LOGWAPPROT1("CWapSapMessageSender::NewL");
 
 	CWapSapMessageSender* msgSender = new(ELeave) CWapSapMessageSender(aSmsProtocol,aWapSap);
 	CleanupStack::PushL(msgSender);
@@ -108,7 +102,7 @@
  */
 void CWapSapMessageSender::SendDatagramL(CWapDatagram* aMsg)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_SENDDATAGRAML_1, "CWapSapMessageSender::SendDatagramL");
+	LOGWAPPROT1("CWapSapMessageSender::SendDatagramL");
 
 	__ASSERT_DEBUG(iSmsMsgArray->Count()==0,Panic(EWapSmsSapMessageSenderBusy));
 
@@ -124,7 +118,7 @@
  */
 void CWapSapMessageSender::SendNextSms()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_SENDNEXTSMS_1, "CWapSapMessageSender::SendNextSms");
+	LOGWAPPROT1("CWapSapMessageSender::SendNextSms");
 
 	__ASSERT_DEBUG(iSmsMsgArray->Count()>0,Panic(EWapSmsSapMessageSenderNothingToSend));
 	CSmsMessage* smsMsg = iSmsMsgArray->At(0);
@@ -145,7 +139,7 @@
  */
 void CWapSapMessageSender::SetSmsMessageSettingsL(CSmsMessage* aSmsMessage)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_SETSMSMESSAGESETTINGSL_1, "CWapSapMessageSender::SetSmsMessageSettingsL");
+	LOGWAPPROT1("CWapSapMessageSender::SetSmsMessageSettingsL");
 
 	TBuf<KCommsDbSvrMaxFieldLength> msgCenterNumberValue;
 	TUint32 msgValidityPeriodValue = KWapSmsMessageValidityPeriod;
@@ -283,7 +277,7 @@
  */
 void CWapSapMessageSender::MessageSendCompleted(TInt aStatus)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_MESSAGESENDCOMPLETED_1, "CWapSapMessageSender::MessageSendCompleted [aStatus=%d]", aStatus);
+	LOGWAPPROT2("CWapSapMessageSender::MessageSendCompleted [aStatus=%d]", aStatus);
 
 	if (aStatus!=KErrNone)
 		iSmsMsgArray->ResetAndDestroy();
@@ -302,7 +296,7 @@
  */
 const TSmsAddr& CWapSapMessageSender::GetLocalAddress() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_GETLOCALADDRESS_1, "CWapSapMessageSender::GetLocalAddress()");
+	LOGWAPPROT1("CWapSapMessageSender::GetLocalAddress()");
 
 	return iSmsAddr;
 	} // CWapSapMessageSender::GetLocalAddress
@@ -313,7 +307,7 @@
  */
 void CWapSapMessageSender::SetLocalAddress(const TSmsAddr& aSmsAddr)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_SETLOCALADDRESS_1, "CWapSapMessageSender::SetLocalAddress()");
+	LOGWAPPROT1("CWapSapMessageSender::SetLocalAddress()");
 
 	iSmsAddr = aSmsAddr;
 	} // CWapSapMessageSender::SetLocalAddress
@@ -328,7 +322,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_MODEMNOTIFICATIONCOMPLETED_1, "CWapSapMessageSender::ModemNotificationCompleted()");
+    LOGWAPPROT1("CWapSapMessageSender::ModemNotificationCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -341,7 +335,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_ENUMERATEPHONECOMPLETED_1, "CWapSapMessageSender::EnumeratePhoneCompleted()");
+    LOGWAPPROT1("CWapSapMessageSender::EnumeratePhoneCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -354,7 +348,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_MESSAGERECEIVED_1, "CWapSapMessageSender::MessageReceived");
+    LOGWAPPROT1("CWapSapMessageSender::MessageReceived");
     __ASSERT_DEBUG(EFalse,Panic(EWapSmsReceiveOnMessageSender));
     return KErrNone;
     BULLSEYE_RESTORE
@@ -368,7 +362,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_CLIENTCONFIRMSMESSAGE_1, "CWapSapMessageSender::ClientConfirmsMessage");
+    LOGWAPPROT1("CWapSapMessageSender::ClientConfirmsMessage");
     __ASSERT_DEBUG(EFalse,Panic(EWapSmsReceiveOnMessageSender));
     return ETrue;
     BULLSEYE_RESTORE
@@ -379,7 +373,7 @@
  */
 TInt CWapSapMessageSender::SmsAddrIsDuplicate(const MSmsMessageObserver* /*aObserver*/,const TSmsAddr& /*aAddr*/)const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_SMSADDRISDUPLICATE_1, "CWapSapMessageSender::SmsAddrIsDuplicate()");
+	LOGWAPPROT1("CWapSapMessageSender::SmsAddrIsDuplicate()");
 
 	return EFalse;
 	} // CWapSapMessageSender::SmsAddrIsDuplicate
@@ -394,7 +388,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_MESSAGEWRITECOMPLETED_1, "CWapSapMessageSender::MessageWriteCompleted()");
+    LOGWAPPROT1("CWapSapMessageSender::MessageWriteCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -407,7 +401,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_MESSAGEDELETECOMPLETED_1, "CWapSapMessageSender::MessageDeleteCompleted()");
+    LOGWAPPROT1("CWapSapMessageSender::MessageDeleteCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -420,7 +414,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_READSMSPARAMSCOMPLETED_1, "CWapSapMessageSender::ReadSmsParamsCompleted()");
+    LOGWAPPROT1("CWapSapMessageSender::ReadSmsParamsCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -433,7 +427,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_WRITESMSPARAMSCOMPLETED_1, "CWapSapMessageSender::WriteSmsParamsCompleted()");
+    LOGWAPPROT1("CWapSapMessageSender::WriteSmsParamsCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -450,7 +444,7 @@
  */
 CWapProtocolObserver* CWapProtocolObserver::NewL(CWapSmsProtocol* aProtocol)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_NEWL_1, "CWapProtocolObserver::NewL()");
+	LOGWAPPROT1("CWapProtocolObserver::NewL()");
 
 	CWapProtocolObserver* prot = new(ELeave) CWapProtocolObserver;
 	prot->iWapSmsProtocol=aProtocol;
@@ -463,7 +457,7 @@
  */
 const TSmsAddr& CWapProtocolObserver::GetLocalAddress() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_GETLOCALADDRESS_1, "CWapProtocolObserver::GetLocalAddress()");
+	LOGWAPPROT1("CWapProtocolObserver::GetLocalAddress()");
 
 	return iSmsAddr;
 	} // CWapProtocolObserver::GetLocalAddress
@@ -474,7 +468,7 @@
  */
 void CWapProtocolObserver::SetLocalAddress(const TSmsAddr& aSmsAddr)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_SETLOCALADDRESS_1, "CWapProtocolObserver::SetLocalAddress()");
+	LOGWAPPROT1("CWapProtocolObserver::SetLocalAddress()");
 
 	iSmsAddr = aSmsAddr;
 	} // CWapProtocolObserver::SetLocalAddress
@@ -486,7 +480,7 @@
  */
 void CWapProtocolObserver::ModemNotificationCompleted(TInt /*aStatus*/)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_MODEMNOTIFICATIONCOMPLETED_1, "CWapProtocolObserver::ModemNotificationCompleted()");
+	LOGWAPPROT1("CWapProtocolObserver::ModemNotificationCompleted()");
 
 	} // CWapProtocolObserver::ModemNotificationCompleted
 
@@ -500,7 +494,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_MESSAGESENDCOMPLETED_1, "CWapProtocolObserver::MessageSendCompleted()");
+    LOGWAPPROT1("CWapProtocolObserver::MessageSendCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -509,7 +503,7 @@
  */
 TBool CWapProtocolObserver::ClientConfirmsMessage()const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_CLIENTCONFIRMSMESSAGE_1, "CWapProtocolObserver::ClientConfirmsMessage()");
+	LOGWAPPROT1("CWapProtocolObserver::ClientConfirmsMessage()");
 
 	return EFalse;
 	} // CWapProtocolObserver::ClientConfirmsMessage
@@ -520,7 +514,7 @@
  */
 TInt CWapProtocolObserver::SmsAddrIsDuplicate(const MSmsMessageObserver* aObserver,const TSmsAddr& aAddr)const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_SMSADDRISDUPLICATE_1, "CWapProtocolObserver::SmsAddrIsDuplicate()");
+	LOGWAPPROT1("CWapProtocolObserver::SmsAddrIsDuplicate()");
 
 	if(this == aObserver)return EFalse;
 	if(aAddr.SmsAddrFamily() == ESmsAddrApplication8BitPort || ( aAddr.SmsAddrFamily() == ESmsAddrApplication16BitPort && aAddr.Port() > 255))
@@ -539,7 +533,7 @@
  */
 TInt CWapProtocolObserver::MessageReceived(const CSmsMessage& aSmsMessage,TDes& /*aDes*/)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_MESSAGERECEIVED_1, "CWapProtocolObserver::MessageReceived");
+	LOGWAPPROT1("CWapProtocolObserver::MessageReceived");
 
 	TRAPD(ret, iWapSmsProtocol->ProcessSmsL(aSmsMessage) );
 	return ret;
@@ -555,7 +549,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_ENUMERATEPHONECOMPLETED_1, "CWapProtocolObserver::EnumeratePhoneCompleted()");
+    LOGWAPPROT1("CWapProtocolObserver::EnumeratePhoneCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -568,7 +562,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_MESSAGEWRITECOMPLETED_1, "CWapProtocolObserver::MessageWriteCompleted()");
+    LOGWAPPROT1("CWapProtocolObserver::MessageWriteCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -581,7 +575,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_MESSAGEDELETECOMPLETED_1, "CWapProtocolObserver::MessageDeleteCompleted()");
+    LOGWAPPROT1("CWapProtocolObserver::MessageDeleteCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -594,7 +588,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_READSMSPARAMSCOMPLETED_1, "CWapProtocolObserver::ReadSmsParamsCompleted()");
+    LOGWAPPROT1("CWapProtocolObserver::ReadSmsParamsCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -607,6 +601,6 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_WRITESMSPARAMSCOMPLETED_1, "CWapProtocolObserver::WriteSmsParamsCompleted()");
+    LOGWAPPROT1("CWapProtocolObserver::WriteSmsParamsCompleted()");
     BULLSEYE_RESTORE
     }