--- a/smsprotocols/smsstack/smsu/src/smsustrm.cpp	Wed Jun 16 15:43:02 2010 +0100
+++ b/smsprotocols/smsstack/smsu/src/smsustrm.cpp	Thu Jul 22 16:45:24 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-2010 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,6 +19,12 @@
  @file
 */
 
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smsustrmTraces.h"
+#endif
+
 #include "smsustrm.h"
 #include "smsumain.h"
 #include <es_sock.h>
@@ -48,7 +54,7 @@
 //Panics if ERead==0
 //
 	{
-	LOGSMSU1("RSmsSocketBuf::UnderflowL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RSMSSOCKETBUF_UNDERFLOWL_1, "RSmsSocketBuf::UnderflowL()");
 
 	__ASSERT_ALWAYS(Avail(ERead)==0,SmsuPanic(KSsmuPanicStreamReadUnavailable));
 	SocketWriteL();
@@ -75,7 +81,7 @@
 void RSmsSocketBuf::OverflowL()
 //Panics if EWrite == 0
 	{
-	LOGSMSU1("RSmsSocketBuf::OverflowL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RSMSSOCKETBUF_OVERFLOWL_1, "RSmsSocketBuf::OverflowL()");
 
 	__ASSERT_ALWAYS(Avail(EWrite)==0,SmsuPanic(KSsmuPanicStreamWriteUnavailable));
 	SetBuf(ERead,iBuffer,iBuffer);
@@ -90,7 +96,7 @@
  */
 void RSmsSocketBuf::DoSynchL()
 	{
-	LOGSMSU1("RSmsSocketBuf::DoSynchL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RSMSSOCKETBUF_DOSYNCHL_1, "RSmsSocketBuf::DoSynchL()");
 
 	SocketWriteL();
 	SetBuf(ERead|EWrite,iBuffer,iBuffer);
@@ -102,7 +108,7 @@
  */
 void RSmsSocketBuf::SocketWriteL()
 	{
-	LOGSMSU1("RSmsSocketBuf::SocketWriteL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RSMSSOCKETBUF_SOCKETWRITEL_1, "RSmsSocketBuf::SocketWriteL()");
 
 	TInt length=Lag(EWrite);
 	if (length==0)
@@ -125,7 +131,7 @@
 	:RReadStream(&iBuf),
 	iBuf(aSocket)
 	{
-	LOGSMSU1("RSmsSocketReadStream::RSmsSocketReadStream()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, RSMSSOCKETREADSTREAM_CTOR_1, "RSmsSocketReadStream::RSmsSocketReadStream()");
 
 	} // RSmsSocketReadStream::RSmsSocketReadStream
 
@@ -140,7 +146,7 @@
 	:RWriteStream(&iBuf),
 	iBuf(aSocket)
 	{
-	LOGSMSU1("RSmsSocketWriteStream::RSmsSocketWriteStream()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, RSMSSOCKETWRITESTREAM_CTOR_1, "RSmsSocketWriteStream::RSmsSocketWriteStream()");
 
 	} // RSmsSocketWriteStream::RSmsSocketWriteStream