diff -r 8ab6687fb94c -r 3adadc800673 telephonyprotocols/csdagt/src/ND_SCR.CPP --- a/telephonyprotocols/csdagt/src/ND_SCR.CPP Thu May 27 14:05:07 2010 +0300 +++ b/telephonyprotocols/csdagt/src/ND_SCR.CPP Fri Jun 11 14:49:29 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_scr.cpp */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ND_SCRTraces.h" +#endif + #include "ND_SCR.H" #include "ND_STD.H" -#include "SLOGGER.H" #include "SSCREXEC.H" #include "ND_DBACC.H" @@ -319,8 +324,7 @@ @return error code for OpenPct() request. */ { - __FLOG_STMT(_LIT8(logString,"NetDial:\tOpening PCT");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_OPENPCT_1, "NetDial:\tOpening PCT"); const TInt ret = iDlgPrc->OpenPct(); if (ret == KErrNone) @@ -334,8 +338,7 @@ Call DestroyPctNotification() from dialog processor. */ { - __FLOG_STMT(_LIT8(logString,"NetDial:\tRequesting Destroy PCT Notification");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_DESTROYPCTNOTIFICATION_1, "NetDial:\tRequesting Destroy PCT Notification"); iDlgPrc->DestroyPctNotification(*this); } @@ -348,8 +351,7 @@ @return error code for WritePct() request. */ { - __FLOG_STMT(_LIT8(logString,"NetDial:\tWriting To PCT");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_WRITEPCT_1, "NetDial:\tWriting To PCT"); return iDlgPrc->WritePct(aBuffer); } @@ -361,8 +363,7 @@ @param aBuffer a reference for read data. */ { - __FLOG_STMT(_LIT8(logString,"NetDial:\tReading From PCT");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_READPCT_1, "NetDial:\tReading From PCT"); iDlgPrc->ReadPct(*this,aBuffer); } @@ -375,8 +376,7 @@ { if (iPctOpen) { - __FLOG_STMT(_LIT8(logString,"NetDial:\tClosing PCT");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_CLOSEPCT_1, "NetDial:\tClosing PCT"); iDlgPrc->ClosePct(); iPctOpen = EFalse; @@ -413,8 +413,7 @@ @param aError a error code for completition. */ { - __FLOG_STMT(_LIT8(logString,"NetDial:\tRead PCT Complete with Error %d");) - __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue(logString()),aError); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CNETDIALSCRIPT_MDPOREADPCTCOMPLETE_1,"NetDial:\tRead PCT Complete with Error %d",aError); iScriptExecutor->ReadPctComplete(aError); } void CNetDialScript::MDPODestroyPctComplete(TInt aError) @@ -425,8 +424,7 @@ @param aError a error code for completition. */ { - __FLOG_STMT(_LIT8(logString,"NetDial:\tDestroy PCT Notification Complete with Error %d");) - __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue(logString()),aError); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_MDPODESTROYPCTCOMPLETE_1, "NetDial:\tDestroy PCT Notification Complete with Error %d",aError); iScriptExecutor->DestroyPctNotificationReceived(aError); }