diff -r 96907930389d -r 12af337248b1 calendarui/globaldata/BWINS/calenglobaldatau.def
--- a/calendarui/globaldata/BWINS/calenglobaldatau.def	Thu Aug 19 09:53:43 2010 +0300
+++ b/calendarui/globaldata/BWINS/calenglobaldatau.def	Tue Aug 31 15:13:43 2010 +0300
@@ -1,38 +1,6 @@
 EXPORTS
-	?EntryViewL@CCalenGlobalData@@QAEPAVCCalEntryView@@E@Z @ 1 NONAME ; class CCalEntryView * CCalenGlobalData::EntryViewL(unsigned char)
-	?IsMessagingEditorOpen@CCalenSend@@QAEHXZ @ 2 NONAME ; int CCalenSend::IsMessagingEditorOpen(void)
-	?CalSessionL@CCalenGlobalData@@QAEAAVCCalSession@@ABVTDesC16@@@Z @ 3 NONAME ; class CCalSession & CCalenGlobalData::CalSessionL(class TDesC16 const &)
-	?MRMailboxUtilsL@CCalenGlobalData@@QAEAAVCMRMailboxUtils@@XZ @ 4 NONAME ; class CMRMailboxUtils & CCalenGlobalData::MRMailboxUtilsL(void)
-	?ConstructFileMappingL@CCalenGlobalData@@AAEHXZ @ 5 NONAME ; int CCalenGlobalData::ConstructFileMappingL(void)
-	?InstanceL@CCalenGlobalData@@SAPAV1@XZ @ 6 NONAME ; class CCalenGlobalData * CCalenGlobalData::InstanceL(void)
-	?NewL@CCalenSend@@SAPAV1@HAAVCCalSession@@@Z @ 7 NONAME ; class CCalenSend * CCalenSend::NewL(int, class CCalSession &)
-	?RemoveCalendarL@CCalenGlobalData@@QAEXABVTDesC16@@@Z @ 8 NONAME ; void CCalenGlobalData::RemoveCalendarL(class TDesC16 const &)
-	?QueueKeyEvent@CCalenGlobalData@@QAEHABUTKeyEvent@@W4TEventCode@@@Z @ 9 NONAME ; int CCalenGlobalData::QueueKeyEvent(struct TKeyEvent const &, enum TEventCode)
-	?InstanceViewL@CCalenGlobalData@@QAEPAVCCalInstanceView@@ABV?$RArray@H@@@Z @ 10 NONAME ; class CCalInstanceView * CCalenGlobalData::InstanceViewL(class RArray<int> const &)
-	?CalSessionL@CCalenGlobalData@@QAEAAVCCalSession@@XZ @ 11 NONAME ; class CCalSession & CCalenGlobalData::CalSessionL(void)
-	?InstanceL@CCalenGlobalData@@SAPAV1@AAVCCalSession@@@Z @ 12 NONAME ; class CCalenGlobalData * CCalenGlobalData::InstanceL(class CCalSession &)
-	?InterimUtilsL@CCalenGlobalData@@QAEAAVCCalenInterimUtils2@@XZ @ 13 NONAME ; class CCalenInterimUtils2 & CCalenGlobalData::InterimUtilsL(void)
-	?DisplaySendCascadeMenuL@CCalenSend@@QAEXXZ @ 14 NONAME ; void CCalenSend::DisplaySendCascadeMenuL(void)
-	?RemoveDeadCalendarsL@CCalenGlobalData@@QAEXXZ @ 15 NONAME ; void CCalenGlobalData::RemoveDeadCalendarsL(void)
-	?UpdateCalendarL@CCalenGlobalData@@QAEXPAVCCalCalendarInfo@@@Z @ 16 NONAME ; void CCalenGlobalData::UpdateCalendarL(class CCalCalendarInfo *)
-	?Context@CCalenGlobalData@@QAEAAVMCalenContext@@XZ @ 17 NONAME ; class MCalenContext & CCalenGlobalData::Context(void)
-	?InstanceViewL@CCalenGlobalData@@QAEPAVCCalInstanceView@@XZ @ 18 NONAME ; class CCalInstanceView * CCalenGlobalData::InstanceViewL(void)
-	?InitializeGlobalDataL@CCalenGlobalData@@QAEXXZ @ 19 NONAME ; void CCalenGlobalData::InitializeGlobalDataL(void)
-	??1CCalenSend@@UAE@XZ @ 20 NONAME ; CCalenSend::~CCalenSend(void)
-	?DisplaySendMenuItemL@CCalenSend@@QAEXAAVCEikMenuPane@@H@Z @ 21 NONAME ; void CCalenSend::DisplaySendMenuItemL(class CEikMenuPane &, int)
-	?ResetKeyEventQueue@CCalenGlobalData@@QAEXXZ @ 22 NONAME ; void CCalenGlobalData::ResetKeyEventQueue(void)
-	?GetQueuedKeyEvent@CCalenGlobalData@@QAEHAAUTKeyEvent@@AAW4TEventCode@@@Z @ 23 NONAME ; int CCalenGlobalData::GetQueuedKeyEvent(struct TKeyEvent &, enum TEventCode &)
-	?CalenSendL@CCalenGlobalData@@QAEAAVCCalenSend@@XZ @ 24 NONAME ; class CCalenSend & CCalenGlobalData::CalenSendL(void)
-	?NewL@CCalenGlobalData@@SAPAV1@AAVMCalProgressCallBack@@PAVMCalenContextChangeObserver@@PAVMCalenDBChangeObserver@@@Z @ 25 NONAME ; class CCalenGlobalData * CCalenGlobalData::NewL(class MCalProgressCallBack &, class MCalenContextChangeObserver *, class MCalenDBChangeObserver *)
-	?EntryViewExists@CCalenGlobalData@@QAEHXZ @ 26 NONAME ; int CCalenGlobalData::EntryViewExists(void)
-	?AttemptToRetrieveDefaultMailboxL@CCalenGlobalData@@QAEHAAUTMailboxInfo@CMRMailboxUtils@@@Z @ 27 NONAME ; int CCalenGlobalData::AttemptToRetrieveDefaultMailboxL(struct CMRMailboxUtils::TMailboxInfo &)
-	?GetAllCalendarInfoL@CCalenGlobalData@@QAEXAAV?$RPointerArray@VCCalCalendarInfo@@@@@Z @ 28 NONAME ; void CCalenGlobalData::GetAllCalendarInfoL(class RPointerArray<class CCalCalendarInfo> &)
-	?MeetingRequestUtilsL@CCalenGlobalData@@QAEAAVCMRUtils@@XZ @ 29 NONAME ; class CMRUtils & CCalenGlobalData::MeetingRequestUtilsL(void)
-	?SendAsVCalendarL@CCalenSend@@QAEXHAAVCCalEntry@@@Z @ 30 NONAME ; void CCalenSend::SendAsVCalendarL(int, class CCalEntry &)
-	?GetCalFileNameForCollectionId@CCalenGlobalData@@QAEABVTDesC16@@E@Z @ 31 NONAME ; class TDesC16 const & CCalenGlobalData::GetCalFileNameForCollectionId(unsigned char)
-	?Instance@CCalenGlobalData@@SAPAV1@XZ @ 32 NONAME ; class CCalenGlobalData * CCalenGlobalData::Instance(void)
-	?EntryViewL@CCalenGlobalData@@QAEPAVCCalEntryView@@XZ @ 33 NONAME ; class CCalEntryView * CCalenGlobalData::EntryViewL(void)
-	?Release@CCalenGlobalData@@QAEXXZ @ 34 NONAME ; void CCalenGlobalData::Release(void)
-	?AddCalendarL@CCalenGlobalData@@QAEXPAVCCalCalendarInfo@@@Z @ 35 NONAME ; void CCalenGlobalData::AddCalendarL(class CCalCalendarInfo *)
-	?CanSendL@CCalenSend@@QAEHH@Z @ 36 NONAME ; int CCalenSend::CanSendL(int)
+	??0CalenContextImpl@@QAE@XZ @ 1 NONAME ; CalenContextImpl::CalenContextImpl(void)
+	??1CalenContextImpl@@QAE@XZ @ 2 NONAME ; CalenContextImpl::~CalenContextImpl(void)
+	??0CalenContextImpl@@QAE@PAVMCalenContextChangeObserver@@@Z @ 3 NONAME ; CalenContextImpl::CalenContextImpl(class MCalenContextChangeObserver *)
+	??0CalenContextImpl@@QAE@ABV0@@Z @ 4 NONAME ; CalenContextImpl::CalenContextImpl(class CalenContextImpl const &)