diff -r 630d2f34d719 -r 07a122eea281 smsprotocols/smsstack/gsmu/src/gsmuset.cpp
--- a/smsprotocols/smsstack/gsmu/src/gsmuset.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmuset.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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "gsmusetTraces.h"
-#endif
-
 #include "gsmuset.h"
 #include "smsstacklog.h"
 
@@ -45,7 +39,7 @@
  */
 EXPORT_C TBool TSmsUserDataSettings::TextConcatenated(TBool* aIs16Bit) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSUSERDATASETTINGS_TEXTCONCATENATED_1, "TSmsUserDataSettings::TextConcatenated()");
+	LOGGSMU1("TSmsUserDataSettings::TextConcatenated()");
 
 	if (aIs16Bit!=NULL)
 		*aIs16Bit=iFlags&ESmsFlagConcatenatedUsing16BitReference;
@@ -63,7 +57,7 @@
  */
 EXPORT_C void TSmsUserDataSettings::SetTextConcatenated(TBool aConcatenated,TBool aIs16Bit)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSUSERDATASETTINGS_SETTEXTCONCATENATED_1, "TSmsUserDataSettings::SetTextConcatenated()");
+	LOGGSMU1("TSmsUserDataSettings::SetTextConcatenated()");
 
 	iFlags=aIs16Bit? iFlags|ESmsFlagConcatenatedUsing16BitReference: iFlags&(~ESmsFlagConcatenatedUsing16BitReference);
 	iFlags=aConcatenated? iFlags|ESmsFlagConcatenated: iFlags&(~ESmsFlagConcatenated);