diff -r 8ab6687fb94c -r 3adadc800673 smsprotocols/smsstack/gsmu/src/gsmunonieoperations.cpp --- a/smsprotocols/smsstack/gsmu/src/gsmunonieoperations.cpp Thu May 27 14:05:07 2010 +0300 +++ b/smsprotocols/smsstack/gsmu/src/gsmunonieoperations.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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "gsmunonieoperationsTraces.h" +#endif + #include "Gsmumain.h" #include "gsmunonieoperations.h" #include "Gsmumsg.h" @@ -101,7 +107,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - LOGGSMU1("CSmsNonIEOperation::operator="); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSNONIEOPERATION_OPERATOR_1, "CSmsNonIEOperation::operator="); Panic(KGsmuPanicMethodBodyNotImplemented1); BULLSEYE_RESTORE } @@ -118,7 +124,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - LOGGSMU1("CSmsNonIEOperation::operator=="); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSNONIEOPERATION_OPERATOR1_1, "CSmsNonIEOperation::operator=="); Panic(KGsmuPanicMethodBodyNotImplemented1); return EFalse; BULLSEYE_RESTORE @@ -136,7 +142,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - LOGGSMU1("CSmsCtrlNonIEOperation::operator="); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCTRLNONIEOPERATION_OPERATOR_1, "CSmsCtrlNonIEOperation::operator="); Panic(KGsmuPanicMethodBodyNotImplemented1); BULLSEYE_RESTORE } @@ -153,7 +159,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - LOGGSMU1("CSmsCtrlNonIEOperation::operator=="); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCTRLNONIEOPERATION_OPERATOR1_1, "CSmsCtrlNonIEOperation::operator=="); Panic(KGsmuPanicMethodBodyNotImplemented1); return EFalse; BULLSEYE_RESTORE @@ -194,7 +200,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - LOGGSMU1("CSmsTPSRROperations::operator="); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_OPERATOR_1, "CSmsTPSRROperations::operator="); Panic(KGsmuPanicMethodBodyNotImplemented1); BULLSEYE_RESTORE } @@ -211,7 +217,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - LOGGSMU1("CSmsTPSRROperations::operator=="); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_OPERATOR1_1, "CSmsTPSRROperations::operator=="); Panic(KGsmuPanicMethodBodyNotImplemented1); return EFalse; BULLSEYE_RESTORE @@ -228,13 +234,13 @@ { if (iMessage.Version() < CSmsMessage::ESmsMessageV2) { - LOGGSMU2("CSmsTPSRROperations Operation not supported, Msg Version %d", iMessage.Version()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_1, "CSmsTPSRROperations Operation not supported, Msg Version %d", iMessage.Version()); User::Leave(KErrNotSupported); } if (!MessageTypeSupported()) { - LOGGSMU2("CSmsTPSRROperations Operation not supported by this PDU type, type = %d", iMessage.Type()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_2, "CSmsTPSRROperations Operation not supported by this PDU type, type = %d", iMessage.Type()); User::Leave(KErrNotSupported); } } @@ -547,7 +553,7 @@ CIncompleteClass0MessageInfo::CIncompleteClass0MessageInfo(TSmsNonIEIdentifier aId, CSmsMessage& aMessage) : CSmsNonIEOperation(aId, aMessage) { - LOGGSMU1("CIncompleteClass0MessageInfo constructor"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_CTOR_1, "CIncompleteClass0MessageInfo constructor"); } /** @@ -564,7 +570,7 @@ */ EXPORT_C void CIncompleteClass0MessageInfo::GetIncompleteMessageInfoL(TInt& aStartPos, TInt& aEndPos, TBool& aIsLastIncompleteMessage) { - LOGGSMU1("CIncompleteClass0MessageInfo::GetIncompleteMessageInfoL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CINCOMPLETECLASS0MESSAGEINFO_GETINCOMPLETEMESSAGEINFOL_1, "CIncompleteClass0MessageInfo::GetIncompleteMessageInfoL"); ValidateOperationL(); aStartPos = iStartPos; aEndPos = iEndPos; @@ -585,7 +591,7 @@ */ EXPORT_C void CIncompleteClass0MessageInfo::SetIncompleteMessageInfoL(TInt aStartPos, TInt aEndPos, TBool aIsLastIncompleteMessage) { - LOGGSMU1("CIncompleteClass0MessageInfo::SetIncompleteMessageInfoL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CINCOMPLETECLASS0MESSAGEINFO_SETINCOMPLETEMESSAGEINFOL_1, "CIncompleteClass0MessageInfo::SetIncompleteMessageInfoL"); ValidateOperationL(); iStartPos = aStartPos; iEndPos = aEndPos; @@ -604,7 +610,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - LOGGSMU1("CIncompleteClass0MessageInfo::operator="); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_OPERATOR_1, "CIncompleteClass0MessageInfo::operator="); Panic(KGsmuPanicMethodBodyNotImplemented1); BULLSEYE_RESTORE } @@ -621,7 +627,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - LOGGSMU1("CIncompleteClass0MessageInfo::operator=="); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_OPERATOR1_1, "CIncompleteClass0MessageInfo::operator=="); Panic(KGsmuPanicMethodBodyNotImplemented1); return EFalse; BULLSEYE_RESTORE @@ -636,7 +642,7 @@ */ TBool CIncompleteClass0MessageInfo::MessageTypeSupported() const { - LOGGSMU1("CIncompleteClass0MessageInfo::MessageTypeSupported"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_MESSAGETYPESUPPORTED_1, "CIncompleteClass0MessageInfo::MessageTypeSupported"); CSmsPDU::TSmsPDUType type = iMessage.Type(); return (type == CSmsPDU::ESmsDeliver); } @@ -650,17 +656,17 @@ */ void CIncompleteClass0MessageInfo::ValidateOperationL() const { - LOGGSMU1("CIncompleteClass0MessageInfo::ValidateOperationL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_1, "CIncompleteClass0MessageInfo::ValidateOperationL"); if (iMessage.Version() != CSmsMessage::ESmsIncompleteClass0MessageV) { - LOGGSMU2("CIncompleteClass0MessageInfo Operation not supported, Msg Version %d", iMessage.Version()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_2, "CIncompleteClass0MessageInfo Operation not supported, Msg Version %d", iMessage.Version()); User::Leave(KErrNotSupported); } if (!MessageTypeSupported()) { - LOGGSMU2("CIncompleteClass0MessageInfo Operation not supported by this PDU type, type = %d", iMessage.Type()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_3, "CIncompleteClass0MessageInfo Operation not supported by this PDU type, type = %d", iMessage.Type()); User::Leave(KErrNotSupported); } } @@ -675,7 +681,7 @@ // class, no need to check the version. Expected to be used if // a new version of the class is added BULLSEYE_OFF - LOGGSMU1("CIncompleteClass0MessageInfo::Version()"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VERSION_1, "CIncompleteClass0MessageInfo::Version()"); return iVersion; BULLSEYE_RESTORE } @@ -689,7 +695,7 @@ */ void CIncompleteClass0MessageInfo::SetVersion(TInt aVersion) { - LOGGSMU2("CIncompleteClass0MessageInfo::SetVersion()", aVersion); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_SETVERSION_1, "CIncompleteClass0MessageInfo::SetVersion() version:%d", aVersion); __ASSERT_DEBUG((aVersion