--- a/smsprotocols/smsstack/smsprot/Src/smsprecvmode.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smsprecvmode.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 "smsprecvmodeTraces.h"
-#endif
-
 #include <commsdattypesv1_1.h>
 #include <cdbcols.h>
 
@@ -67,7 +61,7 @@
  */
 CSmspReceiveMode* CSmspReceiveMode::NewL(const TSmsSettings& aSmsSettings, RMobileSmsMessaging& aSmsMessaging, const RMobileSmsMessaging::TMobileSmsCapsV1& aSmsCaps, TInt aPriority)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_NEWL_1, "CSmspReceiveMode::NewL()");
+	LOGSMSPROT1("CSmspReceiveMode::NewL()");
 
 	CSmspReceiveMode* self = new (ELeave) CSmspReceiveMode(aSmsSettings, aSmsMessaging, aSmsCaps, aPriority);
 	CleanupStack::PushL(self);
@@ -79,7 +73,7 @@
 
 void CSmspReceiveMode::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_CONSTRUCTL_1, "CSmspReceiveMode::ConstructL()");
+	LOGSMSPROT1("CSmspReceiveMode::ConstructL()");
 
 	CSmspCommDbEvent::ConstructL();
 	User::LeaveIfError(iCommDbRetryTimer.CreateLocal());
@@ -92,7 +86,7 @@
  */
 void CSmspReceiveMode::Start(TRequestStatus& aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_START_1, "CSmspReceiveMode::Start()");
+	LOGSMSPROT1("CSmspReceiveMode::Start()");
 
 	Cancel();
 	Queue(aStatus);
@@ -127,7 +121,7 @@
  */
 void CSmspReceiveMode::NotifyOnEvent()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_NOTIFYONEVENT_1, "CSmspReceiveMode::NotifyOnEvent()");
+	LOGSMSPROT1("CSmspReceiveMode::NotifyOnEvent()");
 
 	iState = ESmspReceiveModeNotifyOnEvent;
 	CSmspCommDbEvent::NotifyOnEvent();
@@ -141,7 +135,7 @@
  */
 void CSmspReceiveMode::SetReceiveMode(RMobileSmsMessaging::TMobileSmsReceiveMode aReceiveMode)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_SETRECEIVEMODE_1, "CSmspReceiveMode::SetReceiveMode()");
+	LOGSMSPROT1("CSmspReceiveMode::SetReceiveMode()");
 
 	aReceiveMode = SelectReceiveMode(aReceiveMode);
 	iSmsReceiveModeLastSet = aReceiveMode;
@@ -154,7 +148,7 @@
 
 void CSmspReceiveMode::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_DOCANCEL_1, "CSmspReceiveMode::DoCancel()");
+	LOGSMSPROT1("CSmspReceiveMode::DoCancel()");
 
 	TimedSetActiveCancel();
 	switch (iState)
@@ -213,7 +207,7 @@
  */
 void CSmspReceiveMode::GetCommDbReceiveModeL(RMobileSmsMessaging::TMobileSmsReceiveMode& aReceiveMode)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_GETCOMMDBRECEIVEMODEL_1, "CSmspReceiveMode::GetCommDbReceiveModeL()");
+	LOGSMSPROT1("CSmspReceiveMode::GetCommDbReceiveModeL()");
 
 #ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
 	CMDBSession* sess = CMDBSession::NewL(KCDVersion1_2);
@@ -236,7 +230,7 @@
 
 void CSmspReceiveMode::DoRunL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_DORUNL_1, "CSmspReceiveMode::DoRunL()");
+	LOGSMSPROT1("CSmspReceiveMode::DoRunL()");
 
 	switch (iState)
 		{
@@ -269,7 +263,7 @@
 				else
 					{
 					// Failed to read CommDB even after retries. Set the receive mode to the last known setting
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_DORUNL_2, "CSmspReceiveMode::DoRunL in ESmspReceiveModeRetryCommDb state, failed to read CommDb, using mode #%d", iSmsReceiveModeLastSet );
+					LOGSMSPROT2("CSmspReceiveMode::DoRunL in ESmspReceiveModeRetryCommDb state, failed to read CommDb, using mode #%d", iSmsReceiveModeLastSet );
 					SetReceiveMode(iSmsReceiveModeLastSet);
 					}
 				}
@@ -314,7 +308,7 @@
  */
 RMobileSmsMessaging::TMobileSmsReceiveMode CSmspReceiveMode::SelectReceiveMode() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_SELECTRECEIVEMODE_1, "CSmspReceiveMode::SelectReceiveMode()");
+	LOGSMSPROT1("CSmspReceiveMode::SelectReceiveMode()");
 
 	const TUint32 smsControl = iSmsCaps.iSmsControl;
 	RMobileSmsMessaging::TMobileSmsReceiveMode recvMode = RMobileSmsMessaging::EReceiveModeUnspecified;
@@ -348,7 +342,7 @@
  */
 RMobileSmsMessaging::TMobileSmsReceiveMode CSmspReceiveMode::SelectReceiveMode(RMobileSmsMessaging::TMobileSmsReceiveMode aPreferredMode) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_SELECTRECEIVEMODE1_1, "CSmspReceiveMode::SelectReceiveMode()");
+	LOGSMSPROT1("CSmspReceiveMode::SelectReceiveMode()");
 
 	const TUint32 smsControl = iSmsCaps.iSmsControl;
 	TBool usePreferred = EFalse;