diff -r 139d4b7b2938 -r 99bcbff212ad emailservices/emailframework/src/CFSMailBrand.cpp
--- a/emailservices/emailframework/src/CFSMailBrand.cpp Mon May 24 21:02:02 2010 +0300
+++ b/emailservices/emailframework/src/CFSMailBrand.cpp Fri May 28 13:56:43 2010 +0300
@@ -15,11 +15,12 @@
*
*/
+#include "emailtrace.h"
+
//
#include
//
-#include "emailtrace.h"
#include
// Commented out in Qmail
//#include
@@ -45,7 +46,8 @@
// -----------------------------------------------------------------------------
CFSMailBrand* CFSMailBrand::NewL( TResourceReader& aReader, TBool aIsWhiteLabel )
{
- FUNC_LOG;
+ NM_FUNCTION;
+
CFSMailBrand* brManager = CFSMailBrand::NewLC(aReader, aIsWhiteLabel);
CleanupStack:: Pop(brManager);
return brManager;
@@ -56,7 +58,8 @@
// -----------------------------------------------------------------------------
CFSMailBrand* CFSMailBrand::NewLC( TResourceReader& aReader, TBool aIsWhiteLabel )
{
- FUNC_LOG;
+ NM_FUNCTION;
+
CFSMailBrand* self = new ( ELeave ) CFSMailBrand();
CleanupStack::PushL( self );
if ( aIsWhiteLabel )
@@ -76,7 +79,7 @@
// -----------------------------------------------------------------------------
void CFSMailBrand::ConstructFromCenrepL( )
{
- FUNC_LOG;
+ NM_FUNCTION;
/*
TBuf tBuf; // Temporary buffer
@@ -144,7 +147,7 @@
// -----------------------------------------------------------------------------
void CFSMailBrand::ConstructFromResourceL( TResourceReader& aReader )
{
- FUNC_LOG;
+ NM_FUNCTION;
// read icon filepath
iIconFilePath = aReader.ReadHBufCL();
@@ -206,7 +209,8 @@
// -----------------------------------------------------------------------------
CFSMailBrand::~CFSMailBrand()
{
- FUNC_LOG;
+ NM_FUNCTION;
+
iBrandMatchStrings.ResetAndDestroy();
delete iIconFilePath;
delete iGraphicElements;
@@ -221,7 +225,8 @@
// -----------------------------------------------------------------------------
CFSMailBrand::CFSMailBrand()
{
- FUNC_LOG;
+ NM_FUNCTION;
+
// prepare null empty descriptor
iEmpty = HBufC::New(1);
iEmpty->Des().Copy(KNullDesC());
@@ -233,7 +238,7 @@
// -----------------------------------------------------------------------------
TBool CFSMailBrand::IsMatching( const TDesC& aBrandId )
{
- FUNC_LOG;
+ NM_FUNCTION;
TInt count = iBrandMatchStrings.Count();
for(TInt i=0;iCount() );
for ( TInt i( 0 ); i < textCount; i++ )
@@ -270,7 +276,8 @@
// -----------------------------------------------------------------------------
TInt CFSMailBrand::GetColor( TFSBrandElement aElementId, TRgb& aColor )
{
- FUNC_LOG;
+ NM_FUNCTION;
+
TInt colorCount( iColorElements->Count() );
for ( TInt i( 0 ); i < colorCount; i++ )
@@ -290,7 +297,8 @@
// -----------------------------------------------------------------------------
CGulIcon* CFSMailBrand::GetGraphicL( TFSBrandElement aElementId )
{
- FUNC_LOG;
+ NM_FUNCTION;
+
TInt graphicsCount( iGraphicElements->Count() );
for ( TInt i( 0 ); i < graphicsCount; i++ )
@@ -340,7 +348,7 @@
TInt CFSMailBrand::GetGraphicIdsL( TFSBrandElement aElementId,
TDes& aIconIds)
{
- FUNC_LOG;
+ NM_FUNCTION;
aIconIds.Zero();
TInt graphicsCount( iGraphicElements->Count() );