diff -r 630d2f34d719 -r 07a122eea281 smsprotocols/smsstack/gsmu/src/gsmuieoperations.cpp --- a/smsprotocols/smsstack/gsmu/src/gsmuieoperations.cpp Tue Aug 31 16:23:08 2010 +0300 +++ b/smsprotocols/smsstack/gsmu/src/gsmuieoperations.cpp Wed Sep 01 12:40:21 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1999-2009 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,12 +13,6 @@ // Description: // - -#include "OstTraceDefinitions.h" -#ifdef OST_TRACE_COMPILER_IN_USE -#include "gsmuieoperationsTraces.h" -#endif - #include "Gsmumain.h" #include "gsmuieoperations.h" #include "Gsmumsg.h" @@ -46,7 +40,7 @@ */ CSmsIEOperation* CSmsIEOperation::NewL(CSmsInformationElement::TSmsInformationElementIdentifier aId, CSmsMessage& aMessage, CCnvCharacterSetConverter& aCharacterSetConverter, RFs& aFs) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSIEOPERATION_NEWL_1, "CSmsIEOperation::NewL()"); + LOGGSMU1("CSmsIEOperation::NewL()"); CSmsIEOperation* iEOperation = NULL; @@ -88,7 +82,7 @@ */ EXPORT_C CSmsInformationElement::TSmsInformationElementIdentifier CSmsIEOperation::Id() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSIEOPERATION_ID_1, "CSmsIEOperation::Id()"); + LOGGSMU1("CSmsIEOperation::Id()"); return iId; } // CSmsInformationElement::TSmsInformationElementIdentifier @@ -103,7 +97,7 @@ */ TBool CSmsIEOperation::MessageTypeSupported() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSIEOPERATION_MESSAGETYPESUPPORTED_1, "CSmsIEOperation::MessageTypeSupported()"); + LOGGSMU1("CSmsIEOperation::MessageTypeSupported()"); CSmsPDU::TSmsPDUType type = iMessage.Type(); @@ -130,7 +124,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSIEOPERATION_OPERATOR_1, "CSmsIEOperation::operator="); + LOGGSMU1("CSmsIEOperation::operator="); Panic(KGsmuPanicMethodBodyNotImplemented1); BULLSEYE_RESTORE } @@ -147,7 +141,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSIEOPERATION_OPERATOR1_1, "CSmsIEOperation::operator=="); + LOGGSMU1("CSmsIEOperation::operator=="); Panic(KGsmuPanicMethodBodyNotImplemented1); return EFalse; BULLSEYE_RESTORE @@ -165,7 +159,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCTRLOPERATION_OPERATOR_1, "CSmsCtrlOperation::operator="); + LOGGSMU1("CSmsCtrlOperation::operator="); Panic(KGsmuPanicMethodBodyNotImplemented1); BULLSEYE_RESTORE } @@ -182,7 +176,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCTRLOPERATION_OPERATOR1_1, "CSmsCtrlOperation::operator=="); + LOGGSMU1("CSmsCtrlOperation::operator=="); Panic(KGsmuPanicMethodBodyNotImplemented1); return EFalse; BULLSEYE_RESTORE @@ -202,7 +196,7 @@ void CSmsIEOperation::ConstructL() { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSIEOPERATION_CONSTRUCTL_1, "CSmsIEOperation::ConstructL()"); + LOGGSMU1("CSmsIEOperation::ConstructL()"); } // CSmsIEOperation::ConstructL @@ -218,7 +212,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSHYPERLINKOPERATIONS_OPERATOR_1, "CSmsHyperLinkOperations::operator="); + LOGGSMU1("CSmsHyperLinkOperations::operator="); Panic(KGsmuPanicMethodBodyNotImplemented1); BULLSEYE_RESTORE } @@ -235,7 +229,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSHYPERLINKOPERATIONS_OPERATOR1_1, "CSmsHyperLinkOperations::operator=="); + LOGGSMU1("CSmsHyperLinkOperations::operator=="); Panic(KGsmuPanicMethodBodyNotImplemented1); return EFalse; BULLSEYE_RESTORE @@ -251,17 +245,17 @@ */ void CSmsHyperLinkOperations::ValidateOperationL() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_1, "CSmsHyperLinkOperations::ValidateOperationL()"); + LOGGSMU1("CSmsHyperLinkOperations::ValidateOperationL()"); if (iMessage.Version() < CSmsMessage::ESmsMessageV1) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_2, "CSmsHyperLinkOperations::AddHyperLinkL, Operation not supported, Msg Version %d", iMessage.Version()); + LOGGSMU2("CSmsHyperLinkOperations::AddHyperLinkL, Operation not supported, Msg Version %d", iMessage.Version()); User::Leave(KErrNotSupported); } if (!MessageTypeSupported()) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_3, "CSmsHyperLinkOperations::AddHyperLinkL, Operation not supported by this PDU type, type = %d", iMessage.Type()); + LOGGSMU2("CSmsHyperLinkOperations::AddHyperLinkL, Operation not supported by this PDU type, type = %d", iMessage.Type()); User::Leave(KErrNotSupported); } } // CSmsHyperLinkOperations::ValidateOperationL @@ -284,7 +278,7 @@ */ EXPORT_C void CSmsHyperLinkOperations::AddHyperLinkL(TUint aPosition, TUint8 aTitleLength, TUint8 aURLLength) const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSHYPERLINKOPERATIONS_ADDHYPERLINKL_1, "CSmsHyperLinkOperations::AddHyperLinkL()"); + LOGGSMU1("CSmsHyperLinkOperations::AddHyperLinkL()"); ValidateOperationL(); @@ -316,7 +310,7 @@ */ EXPORT_C TUint CSmsHyperLinkOperations::NumberOfHyperLinksL() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSHYPERLINKOPERATIONS_NUMBEROFHYPERLINKSL_1, "CSmsHyperLinkOperations::NumberOfHyperLinks"); + LOGGSMU1("CSmsHyperLinkOperations::NumberOfHyperLinks"); ValidateOperationL(); @@ -373,7 +367,7 @@ */ EXPORT_C void CSmsHyperLinkOperations::CopyHyperLinkAtIndexL(TUint aIndex, TUint& aPosition, TUint8& aTitleLength, TUint8& aURLLength) const { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSHYPERLINKOPERATIONS_COPYHYPERLINKATINDEXL_1, "CSmsHyperLinkOperations::CopyHyperLinkAtIndexL(): aIndex=%d", aIndex); + LOGGSMU2("CSmsHyperLinkOperations::CopyHyperLinkAtIndexL(): aIndex=%d", aIndex); ValidateOperationL(); @@ -425,7 +419,7 @@ */ EXPORT_C void CSmsHyperLinkOperations::RemoveAllHyperLinksL() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSHYPERLINKOPERATIONS_REMOVEALLHYPERLINKSL_1, "CSmsHyperLinkOperations::RemoveAllHyperLinks"); + LOGGSMU1("CSmsHyperLinkOperations::RemoveAllHyperLinks"); ValidateOperationL(); @@ -470,7 +464,7 @@ */ EXPORT_C void CSmsHyperLinkOperations::RemoveHyperLinkL(TUint aIndex) const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSHYPERLINKOPERATIONS_REMOVEHYPERLINKL_1, "CSmsHyperLinkOperations::RemoveHyperLink"); + LOGGSMU1("CSmsHyperLinkOperations::RemoveHyperLink"); ValidateOperationL(); @@ -520,7 +514,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREPLYADDRESSOPERATIONS_OPERATOR_1, "CSmsReplyAddressOperations::operator="); + LOGGSMU1("CSmsReplyAddressOperations::operator="); Panic(KGsmuPanicMethodBodyNotImplemented1); BULLSEYE_RESTORE } @@ -537,7 +531,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREPLYADDRESSOPERATIONS_OPERATOR1_1, "CSmsReplyAddressOperations::operator=="); + LOGGSMU1("CSmsReplyAddressOperations::operator=="); Panic(KGsmuPanicMethodBodyNotImplemented1); return EFalse; BULLSEYE_RESTORE @@ -553,17 +547,17 @@ */ void CSmsReplyAddressOperations::ValidateOperationL() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_1, "CSmsReplyAddressOperations::ValidateOperationL()"); + LOGGSMU1("CSmsReplyAddressOperations::ValidateOperationL()"); if (iMessage.Version() < CSmsMessage::ESmsMessageV1) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_2, "CSmsReplyAddressOperations::AddReplyAddressL, Operation not supported, Msg Version %d", iMessage.Version()); + LOGGSMU2("CSmsReplyAddressOperations::AddReplyAddressL, Operation not supported, Msg Version %d", iMessage.Version()); User::Leave(KErrNotSupported); } if (!MessageTypeSupported()) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_3, "CSmsReplyAddressOperations::AddReplyAddressL, Operation not supported by this PDU type, type = %d", iMessage.Type()); + LOGGSMU2("CSmsReplyAddressOperations::AddReplyAddressL, Operation not supported by this PDU type, type = %d", iMessage.Type()); User::Leave(KErrNotSupported); } } // CSmsReplyAddressOperations::ValidateOperationL @@ -584,13 +578,13 @@ */ EXPORT_C void CSmsReplyAddressOperations::AddReplyAddressL(const TDesC& aAddress) const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_1, "CSmsReplyAddressOperations::AddReplyAddressL()"); + LOGGSMU1("CSmsReplyAddressOperations::AddReplyAddressL()"); ValidateOperationL(); if (ContainsReplyAddressIEL()) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_2, "CSmsReplyAddressOperations::AddReplyAddressL, Already Exists"); + LOGGSMU1("CSmsReplyAddressOperations::AddReplyAddressL, Already Exists"); User::Leave(KErrAlreadyExists); } @@ -630,13 +624,13 @@ */ EXPORT_C void CSmsReplyAddressOperations::AddParsedReplyAddressL(const TGsmSmsTelNumber& aParsedAddress) const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_1, "CSmsReplyAddressOperations::AddParsedReplyAddressL"); + LOGGSMU1("CSmsReplyAddressOperations::AddParsedReplyAddressL"); ValidateOperationL(); if (ContainsReplyAddressIEL()) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_2, "CSmsReplyAddressOperations::AddParsedReplyAddressL, Already Exists"); + LOGGSMU1("CSmsReplyAddressOperations::AddParsedReplyAddressL, Already Exists"); User::Leave(KErrAlreadyExists); } @@ -675,7 +669,7 @@ */ EXPORT_C TBool CSmsReplyAddressOperations::ContainsReplyAddressIEL() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_CONTAINSREPLYADDRESSIEL_1, "CSmsReplyAddressOperations::ContainsReplyAddressIEL()"); + LOGGSMU1("CSmsReplyAddressOperations::ContainsReplyAddressIEL()"); TBool rc = EFalse; @@ -726,7 +720,7 @@ */ EXPORT_C HBufC* CSmsReplyAddressOperations::GetReplyAddressL() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_GETREPLYADDRESSL_1, "CSmsReplyAddressOperations::GetReplyAddressL"); + LOGGSMU1("CSmsReplyAddressOperations::GetReplyAddressL"); ValidateOperationL(); @@ -802,7 +796,7 @@ */ EXPORT_C TInt CSmsReplyAddressOperations::GetParsedReplyAddressL(TGsmSmsTelNumber& aParsedAddress) const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_GETPARSEDREPLYADDRESSL_1, "CSmsReplyAddressOperations::GetParsedReplyAddressL"); + LOGGSMU1("CSmsReplyAddressOperations::GetParsedReplyAddressL"); ValidateOperationL(); @@ -876,7 +870,7 @@ */ EXPORT_C void CSmsReplyAddressOperations::RemoveReplyAddressL() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_REMOVEREPLYADDRESSL_1, "CSmsReplyAddressOperations::RemoveReplyAddress"); + LOGGSMU1("CSmsReplyAddressOperations::RemoveReplyAddress"); ValidateOperationL(); @@ -924,17 +918,17 @@ */ void CSmsSpecialSMSMessageOperations::ValidateOperationL() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_1, "CSmsSpecialSMSMessageOperations::ValidateOperationL()"); + LOGGSMU1("CSmsSpecialSMSMessageOperations::ValidateOperationL()"); if (iMessage.Version() < CSmsMessage::ESmsMessageV1) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_2, "CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL, Operation not supported, version %d", iMessage.Version()); + LOGGSMU2("CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL, Operation not supported, version %d", iMessage.Version()); User::Leave(KErrNotSupported); } if (!MessageTypeSupported()) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_3, "CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL, Operation not supported by this PDU type, type = %d", iMessage.Type()); + LOGGSMU2("CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL, Operation not supported by this PDU type, type = %d", iMessage.Type()); User::Leave(KErrNotSupported); } } // CSmsSpecialSMSMessageOperations::ValidateOperationL @@ -952,7 +946,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR_1, "CSmsSpecialSMSMessageOperations::operator="); + LOGGSMU1("CSmsSpecialSMSMessageOperations::operator="); Panic(KGsmuPanicMethodBodyNotImplemented1); BULLSEYE_RESTORE } @@ -967,7 +961,7 @@ */ TBool CSmsSpecialSMSMessageOperations::operator==(const CSmsSpecialSMSMessageOperations&) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR1_1, "CSmsSpecialSMSMessageOperations::operator=="); + LOGGSMU1("CSmsSpecialSMSMessageOperations::operator=="); Panic(KGsmuPanicMethodBodyNotImplemented1); return EFalse; } // CSmsSpecialSMSMessageOperations::operator @@ -998,7 +992,7 @@ TSmsMessageProfileType aProfile, TUint8 aMessageCount) const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSPECIALSMSMESSAGEOPERATIONS_ADDSPECIALMESSAGEINDICATIONL_1, "CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL"); + LOGGSMU1("CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL"); ValidateOperationL(); @@ -1055,7 +1049,7 @@ */ EXPORT_C TUint CSmsSpecialSMSMessageOperations::GetCountOfSpecialMessageIndicationsL() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSPECIALSMSMESSAGEOPERATIONS_GETCOUNTOFSPECIALMESSAGEINDICATIONSL_1, "CSmsSpecialSMSMessageOperations::GetCountOfSpecialMessageIndicationsL()"); + LOGGSMU1("CSmsSpecialSMSMessageOperations::GetCountOfSpecialMessageIndicationsL()"); ValidateOperationL(); @@ -1101,7 +1095,7 @@ TSmsMessageProfileType& aProfile, TUint8& aMessageCount) const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSPECIALSMSMESSAGEOPERATIONS_GETMESSAGEINDICATIONIEL_1, "CSmsSpecialSMSMessageOperations::GetMessageIndicationIEL()"); + LOGGSMU1("CSmsSpecialSMSMessageOperations::GetMessageIndicationIEL()"); ValidateOperationL(); @@ -1145,7 +1139,7 @@ */ EXPORT_C void CSmsSpecialSMSMessageOperations::RemoveSpecialMessageIndicationL(TSmsMessageIndicationType aMessageIndicationType, TExtendedSmsIndicationType aExtendedType) const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVESPECIALMESSAGEINDICATIONL_1, "CSmsSpecialSMSMessageOperations::RemoveAllSpecialMessageIndications"); + LOGGSMU1("CSmsSpecialSMSMessageOperations::RemoveAllSpecialMessageIndications"); ValidateOperationL(); @@ -1187,7 +1181,7 @@ */ EXPORT_C void CSmsSpecialSMSMessageOperations::RemoveAllSpecialMessageIndicationsL() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVEALLSPECIALMESSAGEINDICATIONSL_1, "CSmsSpecialSMSMessageOperations::RemoveAllSpecialMessageIndicationsL"); + LOGGSMU1("CSmsSpecialSMSMessageOperations::RemoveAllSpecialMessageIndicationsL"); ValidateOperationL(); @@ -1226,7 +1220,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR_1, "CSmsEnhancedVoiceMailOperations::operator="); + LOGGSMU1("CSmsEnhancedVoiceMailOperations::operator="); Panic(KGsmuPanicMethodBodyNotImplemented1); BULLSEYE_RESTORE } @@ -1243,7 +1237,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR1_1, "CSmsEnhancedVoiceMailOperations::operator=="); + LOGGSMU1("CSmsEnhancedVoiceMailOperations::operator=="); Panic(KGsmuPanicMethodBodyNotImplemented1); return EFalse; BULLSEYE_RESTORE @@ -1259,17 +1253,17 @@ */ void CSmsEnhancedVoiceMailOperations::ValidateOperationL() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_1, "CSmsEnhancedVoiceMailOperations::ValidateOperationL()"); + LOGGSMU1("CSmsEnhancedVoiceMailOperations::ValidateOperationL()"); if (iMessage.Version() < CSmsMessage::ESmsMessageV1) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_2, "CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL, Operation not supported, Msg Version %d", iMessage.Version()); + LOGGSMU2("CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL, Operation not supported, Msg Version %d", iMessage.Version()); User::Leave(KErrNotSupported); } if (!MessageTypeSupported()) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_3, "CSmsSpecialSMSMessageOperations::AddEnhancedVoiceMailIEL, Operation not supported by this PDU type, type = %d", iMessage.Type()); + LOGGSMU2("CSmsSpecialSMSMessageOperations::AddEnhancedVoiceMailIEL, Operation not supported by this PDU type, type = %d", iMessage.Type()); User::Leave(KErrNotSupported); } } // CSmsEnhancedVoiceMailOperations::ValidateOperationL @@ -1295,13 +1289,13 @@ */ EXPORT_C void CSmsEnhancedVoiceMailOperations::AddEnhancedVoiceMailIEL(const CEnhancedVoiceMailBoxInformation& aEVMI) const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_1, "CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL"); + LOGGSMU1("CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL"); ValidateOperationL(); if (ContainsEnhancedVoiceMailIEL()) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_2, "CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL, Already Exists"); + LOGGSMU1("CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL, Already Exists"); User::Leave(KErrAlreadyExists); } @@ -1339,7 +1333,7 @@ */ EXPORT_C CEnhancedVoiceMailBoxInformation* CSmsEnhancedVoiceMailOperations::RemoveEnhancedVoiceMailIEL() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSENHANCEDVOICEMAILOPERATIONS_REMOVEENHANCEDVOICEMAILIEL_1, "CSmsEnhancedVoiceMailInformation::RemoveEnhancedVoiceMailIE"); + LOGGSMU1("CSmsEnhancedVoiceMailInformation::RemoveEnhancedVoiceMailIE"); ValidateOperationL(); @@ -1366,7 +1360,7 @@ */ EXPORT_C CEnhancedVoiceMailBoxInformation* CSmsEnhancedVoiceMailOperations::CopyEnhancedVoiceMailIEL() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSENHANCEDVOICEMAILOPERATIONS_COPYENHANCEDVOICEMAILIEL_1, "CSmsEnhancedVoiceMailInformation::CopyEnhancedVoiceMailIEL"); + LOGGSMU1("CSmsEnhancedVoiceMailInformation::CopyEnhancedVoiceMailIEL"); ValidateOperationL(); @@ -1392,7 +1386,7 @@ */ CEnhancedVoiceMailBoxInformation* CSmsEnhancedVoiceMailOperations::GetEnhancedVoiceMailIEL(TBool aRemove) const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_GETENHANCEDVOICEMAILIEL_1, "CSmsEnhancedVoiceMailOperations::GetEnhancedVoiceMailIEL()"); + LOGGSMU1("CSmsEnhancedVoiceMailOperations::GetEnhancedVoiceMailIEL()"); TBool found = EFalse; @@ -1461,7 +1455,7 @@ */ EXPORT_C TBool CSmsEnhancedVoiceMailOperations::ContainsEnhancedVoiceMailIEL() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSENHANCEDVOICEMAILOPERATIONS_CONTAINSENHANCEDVOICEMAILIEL_1, "CSmsEnhancedVoiceMailInformation::ContainsEnhancedVoiceMailIEL"); + LOGGSMU1("CSmsEnhancedVoiceMailInformation::ContainsEnhancedVoiceMailIEL"); ValidateOperationL(); @@ -1529,7 +1523,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR_1, "CSmsSMSCCtrlParameterOperations::operator="); + LOGGSMU1("CSmsSMSCCtrlParameterOperations::operator="); Panic(KGsmuPanicMethodBodyNotImplemented1); BULLSEYE_RESTORE } @@ -1546,7 +1540,7 @@ { // Ignore in code coverage - not intended to be used BULLSEYE_OFF - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR1_1, "CSmsSMSCCtrlParameterOperations::operator=="); + LOGGSMU1("CSmsSMSCCtrlParameterOperations::operator=="); Panic(KGsmuPanicMethodBodyNotImplemented1); return EFalse; BULLSEYE_RESTORE @@ -1564,13 +1558,13 @@ { if (iMessage.Version() < CSmsMessage::ESmsMessageV2) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_1, "CSmsSMSCCtrlParameterOperations Operation not supported, Msg Version %d", iMessage.Version()); + LOGGSMU2("CSmsSMSCCtrlParameterOperations Operation not supported, Msg Version %d", iMessage.Version()); User::Leave(KErrNotSupported); } if (!MessageTypeSupported()) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_2, "CSmsSMSCCtrlParameterOperations Operation not supported by this PDU type, type = %d", iMessage.Type()); + LOGGSMU2("CSmsSMSCCtrlParameterOperations Operation not supported by this PDU type, type = %d", iMessage.Type()); User::Leave(KErrNotSupported); } } // CSmsSMSCCtrlParameterOperations::ValidateOperationL()