--- a/emailservices/emailclientapi/inc/emailmailbox.h Tue Aug 31 15:04:17 2010 +0300
+++ b/emailservices/emailclientapi/inc/emailmailbox.h Wed Sep 01 12:28:57 2010 +0100
@@ -1,5 +1,5 @@
/*
-* 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"
@@ -18,10 +18,10 @@
#ifndef EMAILMAILBOX_H
#define EMAILMAILBOX_H
-#include "CFSMailCommon.h"
+#include "cfsmailcommon.h"
#include <memailmailbox.h>
-#include "MFSMailEventObserver.h"
-#include "MFSMailRequestObserver.h"
+#include "mfsmaileventobserver.h"
+#include "mfsmailrequestobserver.h"
#include "mmailboxcontentobserver.h"
using namespace EmailInterface;
@@ -45,62 +45,62 @@
~CEmailMailbox();
public: // from MEmailInterface
- TEmailTypeId InterfaceId() const;
+ virtual TEmailTypeId InterfaceId() const;
- void Release();
+ virtual void Release();
public: // from MEmailMailbox
/**@see MEmailMailbox */
- TMailboxId MailboxId() const;
+ virtual TMailboxId MailboxId() const;
/**@see MEmailMailbox */
- MEmailAddress* AddressL() const;
+ virtual MEmailAddress* AddressL() const;
/**@see MEmailMailbox */
- TPtrC MailboxName() const;
+ virtual TPtrC MailboxName() const;
/**@see MEmailMailbox */
- TInt GetFoldersL( RFolderArray& aFolders ) const;
+ virtual TInt GetFoldersL( RFolderArray& aFolders ) const;
/**@see MEmailMailbox */
- MEmailFolder* FolderL( const TFolderId& aFolderId ) const;
+ virtual MEmailFolder* FolderL( const TFolderId& aFolderId ) const;
/**@see MEmailMailbox */
- MEmailFolder* FolderByTypeL(
+ virtual MEmailFolder* FolderByTypeL(
const TFolderType aFolderType ) const;
/**@see MEmailMailbox */
- MEmailMessage* MessageL( const TMessageId& aMessageId );
+ virtual MEmailMessage* MessageL( const TMessageId& aMessageId );
/**@see MEmailMailbox */
- MEmailMessage* CreateDraftMessageL() const;
+ virtual MEmailMessage* CreateDraftMessageL() const;
/**@see MEmailMailbox */
- MEmailMessage* CreateReplyMessageL( const TMessageId& aMessageId, const TBool aReplyToAll = ETrue ) const;
+ virtual MEmailMessage* CreateReplyMessageL( const TMessageId& aMessageId, const TBool aReplyToAll = ETrue ) const;
/**@see MEmailMailbox */
- MEmailMessage* CreateForwardMessageL( const TMessageId& aMessageId ) const;
+ virtual MEmailMessage* CreateForwardMessageL( const TMessageId& aMessageId ) const;
/**@see MEmailMailbox */
- void SynchroniseL( MMailboxSyncObserver& aObserver );
+ virtual void SynchroniseL( MMailboxSyncObserver& aObserver );
/**@see MEmailMailbox */
- void CancelSynchronise();
+ virtual void CancelSynchronise();
/**@see MEmailMailbox */
- void RegisterObserverL( MMailboxContentObserver& aObserver );
+ virtual void RegisterObserverL( MMailboxContentObserver& aObserver );
/**@see MEmailMailbox */
- void UnregisterObserver( MMailboxContentObserver& aObserver );
+ virtual void UnregisterObserver( MMailboxContentObserver& aObserver );
/**@see MEmailMailbox */
- MEmailMessageSearchAsync* MessageSearchL();
+ virtual MEmailMessageSearchAsync* MessageSearchL();
/**@see MEmailMailbox */
- void ShowInboxL();
+ virtual void ShowInboxL();
/**@see MEmailMailbox */
- void EditNewMessageL();
+ virtual void EditNewMessageL();
public: // new methods
@@ -122,26 +122,27 @@
void AddObserverL( MMailboxContentObserver& aObserver );
void RemoveObserver( MMailboxContentObserver& aObserver );
public: // from MFSMailEventObserver
- virtual void EventL( TFSMailEvent aEvent, TFSMailMsgId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
- typedef void ( CEmailMailbox::TObserverEventMapper::*TEventMapFunc)( TMailboxId, TAny*, TAny*, TAny* );
+ virtual void EventL(TFSMailEvent aEvent, TFSMailMsgId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+ typedef void (CEmailMailbox::TObserverEventMapper::*TEventMapFunc)( TMailboxId, TAny*, TAny*, TAny* );
private: // mappers, so say we all!
void ConvertParamsL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, REmailMessageIdArray& aMessageIds, TFolderId& aFolderId );
- void IgnoreEventL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
- void NewMessageL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
- void MessageChangedL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
- void MessageDeletedL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
- void MessageMoved( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
- void MessageCopiedL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
- void NewFolderL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
- void FolderChangeL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
- void FoldersDeletedL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
- void FoldersMovedL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
- void ExceptionL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+ void IgnoreEventL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+ void NewMessageL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+ void MessageChangedL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+ void MessageDeletedL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+ void MessageMoved( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+ void MessageCopiedL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+ void NewFolderL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+ void FolderChangeL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+ void FoldersDeletedL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+ void FoldersMovedL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
+ void ExceptionL( TMailboxId aMailbox, TAny* aParam1, TAny* aParam2, TAny* aParam3 );
private:
static TBool Equals( const MMailboxContentObserver& a1, const MMailboxContentObserver& a2 );
private:
CFSMailPlugin* iPlugin;
+ //const TUid iUid;
TFSMailMsgId iFsMailboxId;
RPointerArray<MMailboxContentObserver> iClientObservers;
};
@@ -151,7 +152,7 @@
public:
CEmailRequestObserver();
- void RequestResponseL( TFSProgress aEvent, TInt aRequestId );
+ virtual void RequestResponseL( TFSProgress aEvent, TInt aRequestId );
void SetObserverL( MMailboxSyncObserver* aObserver );
private:
MMailboxSyncObserver* iObserver;