diff -r 630d2f34d719 -r 07a122eea281 smsprotocols/smsstack/gsmu/src/gsmupriv.cpp
--- a/smsprotocols/smsstack/gsmu/src/gsmupriv.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmupriv.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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 "gsmuprivTraces.h"
-#endif
-
 #include "gsmupriv.h"
 #include "Gsmumain.h"
 #include <exterror.h>
@@ -48,7 +42,7 @@
  */
 TInt TSmsAlphabetPacker::PackL(TDes8& aOut,const TDesC8& aIn)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_PACKL_1, "TSmsAlphabetPacker::PackL()");
+	LOGGSMU1("TSmsAlphabetPacker::PackL()");
 
 	// Ensure we've got the right length
 	TInt packedOctetsRequired=PackedOctetsRequiredL(aIn.Length());
@@ -96,7 +90,7 @@
  */
 TInt TSmsAlphabetPacker::UnpackL(const TDesC8& aIn,TDes8& aOut,TInt aNumUDUnits)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_UNPACKL_1, "TSmsAlphabetPacker::UnpackL()");
+	LOGGSMU1("TSmsAlphabetPacker::UnpackL()");
 
 	TInt length=aNumUDUnits;
 	// Ensure we've got enough input and output buffer
@@ -148,7 +142,7 @@
  */
 TInt TSmsAlphabetPacker::ConvertAndPackL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs,TDes8& aOut,const TDesC& aIn,TInt& aConvertedNumUDUnits)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_CONVERTANDPACKL_1, "TSmsAlphabetPacker::ConvertAndPackL()");
+	LOGGSMU1("TSmsAlphabetPacker::ConvertAndPackL()");
 
 	// Do the conversion
 	// VEP Fix for defect EXT-568BMW, when length of alphanumeric destination address
@@ -170,7 +164,7 @@
  */
 TInt TSmsAlphabetPacker::UnpackAndConvertL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs,const TDesC8& aIn,TDes& aOut,TInt aNumUDUnits)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_UNPACKANDCONVERTL_1, "TSmsAlphabetPacker::UnpackAndConvertL()");
+	LOGGSMU1("TSmsAlphabetPacker::UnpackAndConvertL()");
 
 	// Unpack first
 	HBufC8* unpackedBuffer=HBufC8::NewLC(aNumUDUnits);
@@ -193,7 +187,7 @@
  */
 TInt TSmsAlphabetPacker::PackedOctetsRequiredL(TInt aNumUDUnits) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_PACKEDOCTETSREQUIREDL_1, "TSmsAlphabetPacker::PackedOctetsRequiredL()");
+	LOGGSMU1("TSmsAlphabetPacker::PackedOctetsRequiredL()");
 
 	TInt octetsRequired=0;
 	TInt elementSizeInBits=ElementSizeInBitsL();
@@ -224,7 +218,7 @@
  */
 TInt TSmsAlphabetPacker::ElementSizeInBitsL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_ELEMENTSIZEINBITSL_1, "TSmsAlphabetPacker::ElementSizeInBitsL()");
+	LOGGSMU1("TSmsAlphabetPacker::ElementSizeInBitsL()");
 
     TInt ret = 8;