--- a/smsprotocols/smsstack/smsu/src/SmsuAddr.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/SmsuAddr.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"
@@ -19,14 +19,9 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "SmsuAddrTraces.h"
-#endif
-
 #include "smsumain.h"
 #include "smsuaddr.H"
+#include "smsstacklog.h"
 
 
 /**
@@ -47,7 +42,7 @@
  */
 EXPORT_C TSmsAddrFamily TSmsAddr::SmsAddrFamily() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_SMSADDRFAMILY_1, "TSmsAddr::SmsAddrFamily()");
+	LOGSMSU1("TSmsAddr::SmsAddrFamily()");
 
 	return static_cast<TSmsAddrFamily>(Family());
 	} // TSmsAddr::SmsAddrFamily
@@ -61,7 +56,7 @@
  */
 EXPORT_C void TSmsAddr::SetSmsAddrFamily(TSmsAddrFamily aFamily)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_SETSMSADDRFAMILY_1, "TSmsAddr::SetSmsAddrFamily()");
+	LOGSMSU1("TSmsAddr::SetSmsAddrFamily()");
 
 	SetFamily(static_cast<TUint>(aFamily));
 	} // TSmsAddr::SetSmsAddrFamily
@@ -75,7 +70,7 @@
  */
 EXPORT_C TInt TSmsAddr::IdentifierMatch() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_IDENTIFIERMATCH_1, "TSmsAddr::IdentifierMatch()");
+	LOGSMSU1("TSmsAddr::IdentifierMatch()");
 
 	__ASSERT_DEBUG(SmsAddrFamily()==ESmsAddrMatchIEI,SmsuPanic(ESmsuPanicWrongSmsAddressFamily));
 	return (TInt) Port();
@@ -90,7 +85,7 @@
  */
 EXPORT_C void TSmsAddr::SetIdentifierMatch(TInt aIdentifier)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_SETIDENTIFIERMATCH_1, "TSmsAddr::SetIdentifierMatch()");
+	LOGSMSU1("TSmsAddr::SetIdentifierMatch()");
 
 	__ASSERT_DEBUG(SmsAddrFamily()==ESmsAddrMatchIEI,SmsuPanic(ESmsuPanicWrongSmsAddressFamily));
 	SetPort((TUint) aIdentifier);
@@ -105,7 +100,7 @@
  */
 EXPORT_C TPtrC8 TSmsAddr::TextMatch() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_TEXTMATCH_1, "TSmsAddr::TextMatch()");
+	LOGSMSU1("TSmsAddr::TextMatch()");
 
 	__ASSERT_DEBUG(SmsAddrFamily()==ESmsAddrMatchText,SmsuPanic(ESmsuPanicWrongSmsAddressFamily));
 	return TPtrC8(UserPtr(),const_cast<TSmsAddr*>(this)->GetUserLen());
@@ -120,7 +115,7 @@
  */
 EXPORT_C void TSmsAddr::SetTextMatch(const TDesC8& aText)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_SETTEXTMATCH_1, "TSmsAddr::SetTextMatch()");
+	LOGSMSU1("TSmsAddr::SetTextMatch()");
 
 	__ASSERT_DEBUG(SmsAddrFamily()==ESmsAddrMatchText,SmsuPanic(ESmsuPanicWrongSmsAddressFamily));
 	TUint8* target = UserPtr();
@@ -139,7 +134,7 @@
  */
 EXPORT_C TBool TSmsAddr::operator==(const TSmsAddr& aAddr) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_OPERATOR_1, "TSmsAddr::operator=()");
+	LOGSMSU1("TSmsAddr::operator=()");
 
 	TSmsAddrFamily family=aAddr.SmsAddrFamily();
 	TBool same=(SmsAddrFamily()==family);