diff -r 8ab6687fb94c -r 3adadc800673 telephonyserverplugins/simatktsy/utility/src/ttlv.cpp --- a/telephonyserverplugins/simatktsy/utility/src/ttlv.cpp Thu May 27 14:05:07 2010 +0300 +++ b/telephonyserverplugins/simatktsy/utility/src/ttlv.cpp Fri Jun 11 14:49:29 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -21,8 +21,13 @@ // Include Files + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ttlvTraces.h" +#endif + #include "TTlv.h" // Header of this class -#include "tflogger.h" // For logging // External Data Structures // none @@ -75,7 +80,7 @@ TUint8 aTag ) { - TFLOGSTRING("UTILITY: TTlvBase::Begin"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_BEGIN_1, "UTILITY: TTlvBase::Begin"); iData.Zero(); iData.Append( aTag ); iData.Append( 0 ); @@ -91,7 +96,7 @@ TUint8 aTag ) { - TFLOGSTRING("UTILITY: TTlvBase::AddTag"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_ADDTAG_1, "UTILITY: TTlvBase::AddTag"); iData.Append( aTag ); // tag iData.Append( 0 ); // length iLenIndex = iData.Length() - 1; // index to tag length @@ -107,7 +112,7 @@ TUint8 aValue ) { - TFLOGSTRING("UTILITY: TTlvBase::AddByte"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_ADDBYTE_1, "UTILITY: TTlvBase::AddByte"); iData.Append( aValue ); iData[iLenIndex]++; } @@ -122,7 +127,7 @@ const TDesC8& aValue ) { - TFLOGSTRING("UTILITY: TTlvBase::AddData"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_ADDDATA_1, "UTILITY: TTlvBase::AddData"); iData.Append( aValue ); iData[ iLenIndex ] = static_cast( iData[ iLenIndex ] + aValue.Length() ); @@ -140,7 +145,7 @@ // None ) { - TFLOGSTRING("UTILITY: TTlvBase::End"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_END_1, "UTILITY: TTlvBase::End"); _LIT8( KLenTag, "\x81" ); TInt i( 3 ); // Index to tag length @@ -181,7 +186,7 @@ // None ) { - TFLOGSTRING("UTILITY: TTlvBase::GetDataWithoutTopLevelTag"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_GETDATAWITHOUTTOPLEVELTAG_1, "UTILITY: TTlvBase::GetDataWithoutTopLevelTag"); _LIT8( KLenTag, "\x81" ); TInt i( 1 ); // Index to tag length