FCL/sf/app/commonemail: comparison emailservices/emailclientapi/src/emailfolder.cpp

equal deleted inserted replaced

-:d189ee25cf9d
+:3533d4323edc
 /*
-* Copyright (c)2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c)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"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include "emailfolder.h"
 #include "emailmailbox.h"
 #include "emailapiutils.h"
 #include "messageiterator.h"
 #include "emailsorting.h"
-#include "CFSMailFolder.h"
+#include "cfsmailfolder.h"
-#include "CFSMailPlugin.h"
+#include "cfsmailplugin.h"
 #include "emailclientapi.hrh"
 #include "emailclientapiimpldefs.h"
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 CEmailFolder* CEmailFolder::NewLC(
 CPluginData& aPluginData,
 const TFolderId& aFolderId,
 CFSMailFolder *aFolder )
 {
 CEmailFolder* self = CEmailFolder::NewLC( aPluginData, aFolderId, aFolder);
-CleanupStack::Pop( self );
+CleanupStack::Pop(); // self
 return self;
 }
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 void CEmailFolder::ConstructL()
 {
 iPlugin = iPluginData.ClaimInstance();
-User::LeaveIfNull( iFolder );
 const TFSFolderType fsType = iFolder->GetFolderType();
 switch ( fsType )
 {
 case EFSInbox:
 iFolderType = EInbox;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 TPtrC CEmailFolder::Name() const
 {
-if ( !iFolder )
+return TPtrC (iFolder->GetFolderName());
-return KNullDesC();
-return TPtrC ( iFolder->GetFolderName() );
 }
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 TInt CEmailFolder::GetSubfoldersL( RFolderArray& aSubfolders ) const
 {
-User::LeaveIfNull( iFolder );
 RPointerArray<CFSMailFolder> folders;
 CleanupResetAndDestroy<RPointerArray<CFSMailFolder> >::PushL( folders );
-iFolder->GetSubFoldersL( folders );
+iFolder->GetSubFoldersL(folders);
 TInt res( folders.Count() );
 for ( TInt i = 0; i < res; i++ )
 {
 const CFSMailFolder* fsfolder = folders[i];
 const TEntryId id = fsfolder->GetFolderId().Id();
 const TFolderId folderId( id, iFolderId.iMailboxId.iId );
-MEmailFolder* folder = CEmailFolder::NewL( iPluginData, folderId, folders[i] );
+MEmailFolder* folder = CEmailFolder::NewLC( iPluginData, folderId, folders[i]);
 aSubfolders.AppendL( folder );
+CleanupStack::Pop( folder ); // asubfolders took ownership
+folders[i] = NULL;
 }
-CleanupStack::Pop( &folders );
+CleanupStack::Pop( &folders );    // folders
-folders.Close();
+folders.Close(); // aSubfolders took ownership
 return res;
 }
 // -----------------------------------------------------------------------------
 //  CEmailFolder::MessagesL
 // -----------------------------------------------------------------------------
 MMessageIterator* CEmailFolder::MessagesL(
 const RSortCriteriaArray& aCriteria )
 {
 RArray<TFSMailSortCriteria> sortCriterias;
-CleanupClosePushL( sortCriterias );
 CEmailFolder::ToFsSortCriteriaL( aCriteria, sortCriterias );
-MFSMailIterator* fsIter = iFolder->ListMessagesL( EFSMsgDataEnvelope, sortCriterias );
+MFSMailIterator* fsIter = iFolder->ListMessagesL(EFSMsgDataEnvelope, sortCriterias);
 TUint count = iFolder->GetMessageCount();
-CleanupStack::PopAndDestroy( &sortCriterias );
 CMessageIterator* iter = CMessageIterator::NewL(
 fsIter, iPluginData, count );
+sortCriterias.Reset();
 return iter;
 }
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 void CEmailFolder::DeleteMessagesL( const REmailMessageIdArray& aMessageIds )
 for ( TInt i = 0; i < count; i++ )
 {
 TMessageId msgId = aMessageIds[i];
 if ( iFolderId != msgId.iFolderId )
 {
-// not all messages in the same folder, plugin API doesn't accept this.
+// not all messages in the same folder, plugin API doesn't accept
+// this!
 User::Leave( KErrArgument );
 }
 fsArray.AppendL( FsMsgId( iPluginData, msgId ) );
 }
 iPlugin->DeleteMessagesByUidL(
 FsMsgId( iPluginData, iFolderId.iMailboxId ),
 FsMsgId( iPluginData, iFolderId ),
 fsArray );
-CleanupStack::PopAndDestroy( &fsArray );
+CleanupStack::PopAndDestroy(); // fsArray
 }
 // -----------------------------------------------------------------------------
 // Maps email api sort criteria to sort criteria type that protocol plugin
 // accepts.
 EFSMailSortByPriority,
 EFSMailSortByFlagStatus,
 EFSMailSortByUnread,
 EFSMailSortBySize,
 EFSMailSortByAttachment };
 for ( TInt i=0; i < aSortCriteria.Count(); i++ )
 {
 const TEmailSortCriteria& criteria  = aSortCriteria[i];
 __ASSERT_ALWAYS( criteria.iField < sizeof( fieldValues ) / sizeof (fieldValues [i] ),
 Panic( EMailPanicSortMapIndexOutOfBounds ) );
 fsCriteria.iOrder = EFSMailDescending;
 }
 aFsCriteria.AppendL( fsCriteria );
 }
 }
-// End of file
+// End of file.

branch	RCL_3
changeset 64	3533d4323edc
parent 63	d189ee25cf9d