FCL/sf/app/commonemail: comparison emailservices/emailcommon/src/CFSMailBoxBase.cpp

equal deleted inserted replaced

-:578830873419
+:ecc8def7944a
 /*
 * Copyright (c) 2007-2008 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"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Description:  common base mailbox object
 *
 */
+// <qmail>
 #include <nmcommonheaders.h>
+// </qmail>
 #include "emailtrace.h"
 #include "CFSMailBoxBase.h"
 // <qmail>
 #include "CFSMailAddress.h"
 #include "mmrinfoprocessor.h"
 // </qmail>
 #include "nmmailbox.h"
+//<qmail> Cmail fix task applied using QString methods (AknTextUtils n/a in 10.1)
+const int KCharCount = 5;
+static const QChar KCharsToReplace[KCharCount] = { '\r','\n','\t',0x2028,0x2029 };
+//</qmail>
 // ================= MEMBER FUNCTIONS ==========================================
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::NewLC
 // -----------------------------------------------------------------------------
-EXPORT_C CFSMailBoxBase* CFSMailBoxBase::NewLC( TFSMailMsgId aMailBoxId )
+EXPORT_C CFSMailBoxBase* CFSMailBoxBase::NewLC(TFSMailMsgId aMailBoxId)
 {
 FUNC_LOG;
 CFSMailBoxBase* api = new (ELeave) CFSMailBoxBase();
 CleanupStack:: PushL(api);
 api->ConstructL(aMailBoxId);
 return api;
 }
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::NewL
 // -----------------------------------------------------------------------------
-EXPORT_C CFSMailBoxBase* CFSMailBoxBase::NewL( TFSMailMsgId aMailBoxId )
+EXPORT_C CFSMailBoxBase* CFSMailBoxBase::NewL(TFSMailMsgId aMailBoxId)
 {
 FUNC_LOG;
 CFSMailBoxBase* api =  CFSMailBoxBase::NewLC(aMailBoxId);
 CleanupStack:: Pop(api);
 return api;
 }
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::CFSMailBoxBase
 // -----------------------------------------------------------------------------
-CFSMailBoxBase::CFSMailBoxBase()
+CFSMailBoxBase::CFSMailBoxBase() : CExtendableEmail()
 {
 FUNC_LOG;
 }
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::~CFSMailBoxBase
 // -----------------------------------------------------------------------------
 EXPORT_C CFSMailBoxBase::~CFSMailBoxBase()
 {
 FUNC_LOG;
 if( iMailBoxName )
 {
-delete iMailBoxName;
+		delete iMailBoxName;
 }
-iMailBoxName = NULL;
+	iMailBoxName = NULL;
 if( iBrId )
 {
-delete iBrId;
+		delete iBrId;
 }
-iBrId = NULL;
+	iBrId = NULL;
 if( iOwnMailAddress )
 {
-delete iOwnMailAddress;
+		delete iOwnMailAddress;
 }
-iOwnMailAddress = NULL;
+	iOwnMailAddress = NULL;
 if( iMRInfoProcessor )
 {
 delete iMRInfoProcessor;
 }
 }
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::ConstructL
 // -----------------------------------------------------------------------------
-void CFSMailBoxBase::ConstructL( const TFSMailMsgId aMailBoxId )
+void CFSMailBoxBase::ConstructL(const TFSMailMsgId aMailBoxId)
 {
 FUNC_LOG;
-	// <qmail> Removed iMailboxId </qmail>
+// <qmail> Removed iMailboxId </qmail>
 // prepare null empty descriptor
 iMailBoxName = HBufC::NewL(1);
 iMailBoxName->Des().Copy(KNullDesC());
 iBrId = HBufC::NewL(1);
 iBrId->Des().Copy(KNullDesC());
 // <qmail>
 // Creating QT side object of the mailbox class.
 iNmPrivateMailbox = new NmMailboxPrivate();
 // Initialize QT data: pluginId and id. These need conversions between QT
 // and Symbian data types. Name not set here as it is null.
 // -> Assumption: iUid should never contain negative value.
 iNmPrivateMailbox->mId.setId32( aMailBoxId.Id() );
 // typedef unsigned int TUint -> typedef unsigned int quint32
 iNmPrivateMailbox->mId.setPluginId32((unsigned int)aMailBoxId.PluginId().iUid);
 // </qmail>
 }
-// <qmail>
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::GetId
 // -----------------------------------------------------------------------------
 EXPORT_C TFSMailMsgId CFSMailBoxBase::GetId() const
 {
 FUNC_LOG;
+// <qmail>
 return TFSMailMsgId(iNmPrivateMailbox->mId);
+// </qmail>
 }
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::GetName
 // -----------------------------------------------------------------------------
 EXPORT_C TDesC& CFSMailBoxBase::GetName()const
 {
 FUNC_LOG;
+// <qmail>
 iTextPtr.Set(
 reinterpret_cast<const TUint16*> (iNmPrivateMailbox->mName.utf16()),
 iNmPrivateMailbox->mName.length());
 return iTextPtr;
+// </qmail>
 }
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::SetName
 // -----------------------------------------------------------------------------
 EXPORT_C void CFSMailBoxBase::SetName( const TDesC& aMailBoxName )
 {
 FUNC_LOG;
+// <qmail>
 QString qtName = QString::fromUtf16(aMailBoxName.Ptr(), aMailBoxName.Length());
+// Fix from Cmail 9.2 rewritten with QString methods
+for (int i = 0; i < KCharCount; i++) {
+QChar chr = KCharsToReplace[i];
+qtName = qtName.replace(chr, ' ');
+}
 iNmPrivateMailbox->mName = qtName;
-}
+// </qmail>
-// <qmail>
+}
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::GetStatus
 // -----------------------------------------------------------------------------
 EXPORT_C TFSMailBoxStatus CFSMailBoxBase::GetStatus( ) const
 {
 FUNC_LOG;
-return EFSMailBoxOffline;
+	return EFSMailBoxOffline;
 }
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::SetStatus
 // -----------------------------------------------------------------------------
 EXPORT_C void CFSMailBoxBase::SetStatus( const TFSMailBoxStatus /*aStatus*/ )
 {
 FUNC_LOG;
 }
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::GetRCLInfo
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailBoxBase::GetRCLInfo( TUid& aProtocolUid, TUint& aAccountUid )
+EXPORT_C void CFSMailBoxBase::GetRCLInfo(TUid& aProtocolUid, TUint& aAccountUid)
 {
 FUNC_LOG;
-aProtocolUid = iProtocolUid;
+	aProtocolUid = iProtocolUid;
-aAccountUid = iAccountUid;
+	aAccountUid = iAccountUid;
 }
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::SetRCLInfo
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailBoxBase::SetRCLInfo( const TUid aProtocolUid, const TUint aAccountUid )
+EXPORT_C void CFSMailBoxBase::SetRCLInfo(const TUid aProtocolUid, const TUint aAccountUid)
 {
 FUNC_LOG;
-iProtocolUid = aProtocolUid;
+	iProtocolUid = aProtocolUid;
-iAccountUid = aAccountUid;
+	iAccountUid = aAccountUid;
 }
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::GetSettingsUid
 // -----------------------------------------------------------------------------
 EXPORT_C const TUid CFSMailBoxBase::GetSettingsUid()
-{
+	{
 FUNC_LOG;
-return iSettingsUid;
+	return iSettingsUid;
-}
+	}
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::SetSettingsUid
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailBoxBase::SetSettingsUid( const TUid aUid )
+EXPORT_C void CFSMailBoxBase::SetSettingsUid(const TUid aUid)
-{
+	{
 FUNC_LOG;
-iSettingsUid = aUid;
+		iSettingsUid = aUid;
-}
+	}
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::MRInfoProcessorL
 // -----------------------------------------------------------------------------
 EXPORT_C MMRInfoProcessor& CFSMailBoxBase::MRInfoProcessorL()
-{
+	{
 FUNC_LOG;
-return *iMRInfoProcessor;
+	return *iMRInfoProcessor;
-}
+	}
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::IsMRInfoProcessorSet
 // -----------------------------------------------------------------------------
 EXPORT_C TBool CFSMailBoxBase::IsMRInfoProcessorSet()
-{
+	{
 FUNC_LOG;
-if(iMRInfoProcessor)
+	if(iMRInfoProcessor)
-{
+		{
-return ETrue;
+		return ETrue;
-}
+		}
-else
+	else
-{
+		{
-return EFalse;
+		return EFalse;
-}
+		}
-}
+	}
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::SetMRInfoProcessorL
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailBoxBase::SetMRInfoProcessorL( MMRInfoProcessor* aMRInfoProcessor )
+EXPORT_C void CFSMailBoxBase::SetMRInfoProcessorL(MMRInfoProcessor* aMRInfoProcessor)
-{
+	{
 FUNC_LOG;
-if(iMRInfoProcessor)
+	if(iMRInfoProcessor)
-{
+	{
-delete iMRInfoProcessor;
+		delete iMRInfoProcessor;
-}
+	}
-iMRInfoProcessor = aMRInfoProcessor;
+	iMRInfoProcessor = aMRInfoProcessor;
-}
+	}
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::OwnMailAddress
 // -----------------------------------------------------------------------------
 EXPORT_C CFSMailAddress& CFSMailBoxBase::OwnMailAddress( )
 {
 FUNC_LOG;
-return *iOwnMailAddress;
+	return *iOwnMailAddress;
 }
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::SetOwnMailAddress
 // -----------------------------------------------------------------------------
-EXPORT_C void CFSMailBoxBase::SetOwnMailAddressL( CFSMailAddress* aOwnMailAddress )
+EXPORT_C void CFSMailBoxBase::SetOwnMailAddressL( CFSMailAddress* aOwnMailAddress)
 {
 FUNC_LOG;
-if(iOwnMailAddress)
+	if(iOwnMailAddress)
-{
+		{
-delete iOwnMailAddress;
+		delete iOwnMailAddress;
-}
+		}
-iOwnMailAddress = aOwnMailAddress;
+	iOwnMailAddress = aOwnMailAddress;
-// set also branding id based on domain name
+	// set also branding id based on domain name
 TPtrC ptr = OwnMailAddress().GetEmailAddress();
 TInt index = ptr.Locate('@') + 1;
 if(index > 0 && ptr.Length() > 0)
 {
 if(iBrId)
 {
 delete iBrId;
 iBrId = NULL;
 }
 ptr.Set( ptr.Right( ptr.Length() - index ) );
 iBrId = HBufC::New(ptr.Length());
 iBrId->Des().Copy(ptr);
 }
+// <qmail>
 iNmPrivateMailbox->mAddress = aOwnMailAddress->GetNmAddress();
+// </qmail>
 }
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::BrandingId
 // -----------------------------------------------------------------------------
 return *iBrId;
 }
 // <qmail> Removed SetMailBoxId </qmail>
+// <qmail>
 // -----------------------------------------------------------------------------
 // CFSMailBoxBase::GetNmMailbox
 // -----------------------------------------------------------------------------
-// <qmail>
 EXPORT_C NmMailbox* CFSMailBoxBase::GetNmMailbox()
 {
 NmMailbox* nmmailbox = new NmMailbox(iNmPrivateMailbox);
 return nmmailbox;
 }

changeset 20	ecc8def7944a
parent 18	578830873419
child 30	759dc5235cdb