diff -r 630d2f34d719 -r 07a122eea281 smsprotocols/smsstack/smsu/src/smsuact.cpp
--- a/smsprotocols/smsstack/smsu/src/smsuact.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsuact.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-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 "smsuactTraces.h"
-#endif
-
 #include "smsuact.h"
 #include "SmsuTimer.h"
 #include "smsstacklog.h"
@@ -62,7 +56,7 @@
  */
 EXPORT_C void CSmsuActiveBase::ConstructTimeoutL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_CONSTRUCTTIMEOUTL_1, "CSmsuActiveBase::ConstructTimeoutL()");
+	LOGSMSU1("CSmsuActiveBase::ConstructTimeoutL()");
 
 	iSmsuTimeout = CSmsuTimeout::NewL(*this);
 	} // CSmsuActiveBase::ConstructTimeoutL
@@ -76,7 +70,8 @@
  */
 EXPORT_C void CSmsuActiveBase::TimedSetActive(const TTimeIntervalMicroSeconds32& aTimeIntervalMicroSeconds32)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_TIMEDSETACTIVE_1, "CSmsuActiveBase::TimedSetActive(): aTimeIntervalMicroSeconds32=%d",aTimeIntervalMicroSeconds32.Int());
+	LOGSMSU2("CSmsuActiveBase::TimedSetActive(): aTimeIntervalMicroSeconds32=%d",
+			 aTimeIntervalMicroSeconds32.Int());
 
 	__ASSERT_DEBUG(iSmsuTimeout != NULL, SmsuPanic(ESmsuTimeoutNull));
 	
@@ -96,7 +91,7 @@
  */
 EXPORT_C void CSmsuActiveBase::TimedSetActiveCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_TIMEDSETACTIVECANCEL_1, "CSmsuActiveBase::TimedSetActiveCancel()");
+	LOGSMSU1("CSmsuActiveBase::TimedSetActiveCancel()");
 
 	if (iSmsuTimeout != NULL)
 		{
@@ -112,7 +107,7 @@
  */
 EXPORT_C TBool CSmsuActiveBase::TimedOut() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_TIMEDOUT_1, "CSmsuActiveBase::TimedOut()");
+	LOGSMSU1("CSmsuActiveBase::TimedOut()");
 
 	if (iSmsuTimeout != NULL)
 		{
@@ -131,7 +126,7 @@
  */
 EXPORT_C void CSmsuActiveBase::Queue(TRequestStatus& aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_QUEUE_1, "CSmsuActiveBase::Queue()");
+	LOGSMSU1("CSmsuActiveBase::Queue()");
 
 	__ASSERT_DEBUG(iReport==NULL, SmsuPanic(ESmsuAlreadyActive));
 
@@ -149,7 +144,7 @@
  */
 EXPORT_C void CSmsuActiveBase::RunL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_RUNL_1, "CSmsuActiveBase::RunL()");
+	LOGSMSU1("CSmsuActiveBase::RunL()");
 
 	if (iSmsuTimeout != NULL)
 		{
@@ -179,7 +174,7 @@
  */
 EXPORT_C void CSmsuActiveBase::Complete(TInt aStatus)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_COMPLETE_1, "CSmsuActiveBase::Complete(): aStatus=%d", aStatus);
+	LOGSMSU2("CSmsuActiveBase::Complete(): aStatus=%d", aStatus);
 
 	if (iReport)
 		{
@@ -201,7 +196,7 @@
  */
 EXPORT_C TInt CSmsuActiveBase::RunError(TInt aError)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_RUNERROR_1, "CSmsuActiveBase::RunError(): aError=%d", aError);
+	LOGSMSU2("CSmsuActiveBase::RunError(): aError=%d", aError);
 
 	__ASSERT_DEBUG(!IsActive(), User::Invariant());
 
@@ -222,7 +217,8 @@
     {
     // Ignore in code coverage - not used within the SMS stack.
     BULLSEYE_OFF
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_COMPLETEMYSELF_1, "CSmsuActiveBase::CompleteMyself(): aStatus=%d, aSetActive=%d",aStatus, aSetActive);
+    LOGSMSU3("CSmsuActiveBase::CompleteMyself(): aStatus=%d, aSetActive=%d",
+             aStatus, aSetActive);
     
     // Initialise iStatus with a pending request...
     iStatus = KRequestPending;
@@ -258,7 +254,7 @@
  */
 EXPORT_C void CSmsuActiveBase::CompleteMyselfAfterTimeout(TInt aStatus)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_COMPLETEMYSELFAFTERTIMEOUT_1, "CSmsuActiveBase::CompleteMyselfAfterTimeout(): aStatus=%d", aStatus);
+	LOGSMSU2("CSmsuActiveBase::CompleteMyselfAfterTimeout(): aStatus=%d", aStatus);
 
 	__ASSERT_DEBUG(iSmsuTimeout != NULL, SmsuPanic(ESmsuTimeoutNull));