diff -r 17af172ffa5f -r 630d2f34d719 telephonyprotocols/csdagt/script/SSCRREAD.CPP --- a/telephonyprotocols/csdagt/script/SSCRREAD.CPP Thu Aug 19 11:03:36 2010 +0300 +++ b/telephonyprotocols/csdagt/script/SSCRREAD.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 Scrread.cpp */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "SSCRREADTraces.h" +#endif + #include "SSCRREAD.H" #include "ND_STD.H" -#include "SLOGGER.H" // TLinePosition definitions @@ -117,8 +122,7 @@ @param aBufferSize is buffer size for script reader. */ { - __FLOG_STMT(_LIT8(logString,"Script:\tCreating Buffer Of Size %d");) - __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue(logString()),aBufferSize); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTREADER_CONSTRUCTL_1,"Script:\tCreating Buffer Of Size %d", aBufferSize); iScriptBuffer=HBufC::NewL(aBufferSize); TPtr temp=iScriptBuffer->Des(); iScript.Set(temp); @@ -214,17 +218,13 @@ iCurrentPosition.iLineCount++; if (iLoggingOn) { - TBuf line; - line.Copy(activeDes.Left(Min(KLogBufferSize,iCurrentPosition.iLineLength))); if (iSkip) { - __FLOG_STMT(_LIT(logString1,"Script Line #%d:\t[Skip] : %S");) - __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue(logString1()),iCurrentPosition.iLineCount,&line); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTREADER_GETCURRENTLINE_1, "Script Line #%d:\t[Skip] : %S", iCurrentPosition.iLineCount,activeDes); } else { - __FLOG_STMT(_LIT(logString2,"Script Line #%d:\t%S");) - __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue(logString2()),iCurrentPosition.iLineCount,&line); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTREADER_GETCURRENTLINE_2, "Script Line #%d:\t%S", iCurrentPosition.iLineCount,activeDes); } } return KErrNone;