--- a/telephonyprotocols/psdagt/src/PSDAGTBase.cpp	Wed Jun 16 15:43:02 2010 +0100
+++ b/telephonyprotocols/psdagt/src/PSDAGTBase.cpp	Thu Jul 22 16:45:24 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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,8 +19,13 @@
  @file PSDAGTBase.cpp
 */
 
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "PSDAGTBaseTraces.h"
+#endif
+
 #include "PSDAGTBase.h"
-#include "debuglogger.h"
 #include "psdagt.h"
 
 /**
@@ -120,20 +125,16 @@
 @exception Panics if connection direction is unknown.
 */
 	{
-	__FLOG_STMT(_LIT8(logString1,"GPRS:\tCreating a new PSD state machine - %s");)
-	
 	if (aDirection==ECommDbConnectionDirectionOutgoing)
 		{
-		__FLOG_STMT(const TText8 direction[] = "Outbound";)
-		__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&direction);
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDAGENT_CREATEAGENTSML_1,"GPRS:\tCreating a new PSD state machine - Outbound");
 		return CPsdOutSM::NewL(aObserver,aDlgPrc,aDb);
 		}
 	else 
 		{
 #ifndef INCOMING_NOT_SUPORTED
 		__ASSERT_ALWAYS(aDirection==ECommDbConnectionDirectionIncoming, PanicAgx(EPsdBadDirection));
-		__FLOG_STMT(const TText8 direction[] = "Inbound";)
-		__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&direction);
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDAGENT_CREATEAGENTSML_2,"GPRS:\tCreating a new PSD state machine - Inbound");
 		return CPsdInSM::NewL(aObserver,aDlgPrc,aDb);
 #else
 		User::Leave(KErrNotSupported);