--- a/telephonyprotocols/csdagt/src/Nd_dlinStates.cpp	Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyprotocols/csdagt/src/Nd_dlinStates.cpp	Tue Aug 31 16:23:08 2010 +0300
@@ -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,9 +19,14 @@
  @file Nd_dlinstates.cpp 
 */
 
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "Nd_dlinStatesTraces.h"
+#endif
+
 #include "ND_DLIN.H"
 #include "Nd_dlinStates.h"
-#include "SLOGGER.H"
 #include <comms-infras/eventlogger.h>
 #include <csdprog.h>
 #include "ND_DBACC.H"
@@ -257,8 +262,7 @@
 	
 	if(iStatus!=KErrNone)
 		{
-		__FLOG_STMT(_LIT(logString3,"Answering");)
-		__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLINANSWERING_RUNL_1, "NetDial:\tCompleted Phase Answering with Error %d", iStatus.Int());
 		}
 	else
 		{
@@ -388,8 +392,7 @@
 Call ConnectionComplete() with EConnectionOpen and iStatus.Int().
 */
 	{
-	__FLOG_STMT(_LIT8(logString,"NetDial:\tConnection Open");)
-	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLINOPEN_RUNL_1, "NetDial:\tConnection Open");
 	iSMObserver->ConnectionComplete(ECsdConnectionOpen,iStatus.Int());
 	}
 
@@ -478,8 +481,7 @@
 Call DisconnectComplete().
 */
 	{
-	__FLOG_STMT(_LIT8(logString,"NetDial:\tDisconnect Complete");)
-	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLINDISCONNECT_RUNL_1, "NetDial:\tDisconnect Complete");
 	
 	iSMObserver->DisconnectComplete();
 	}
@@ -610,8 +612,7 @@
 	iNdEnv->Logger()->LogDataUpdateEvent(R_LOG_CON_DISCONNECTED, KLogDataEventTypeUid);
 	if(iStatus!=KErrNone)
 		{
-		__FLOG_STMT(_LIT(logString3,"Hanging Up");)
-		__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLINHANGUP_RUNL_1, "NetDial:\tCompleted Phase Hanging Up with Error %d",iStatus.Int());
 		}
 	iSMObserver->UpdateProgress(ECsdFinishedHangUp,KErrNone);
 	(iNdEnv->BaseEnv())->CompleteState(iStatus.Int());