--- a/calendarui/controller/eabi/calencontrolleru.def	Thu Aug 19 09:53:43 2010 +0300
+++ b/calendarui/controller/eabi/calencontrolleru.def	Tue Aug 31 15:13:43 2010 +0300
@@ -1,91 +1,44 @@
 EXPORTS
-	_ZN11CCalenIcons19IconIndexFromEntryLER9CCalEntry @ 1 NONAME
-	_ZN16CCalenController11PreviewPaneER5TRect @ 2 NONAME
-	_ZN16CCalenController12NewServicesLEv @ 3 NONAME
-	_ZN16CCalenController13IssueCommandLEi @ 4 NONAME
-	_ZN16CCalenController14OfferMenuPaneLEiP12CEikMenuPane @ 5 NONAME
-	_ZN16CCalenController18CustomPreviewPaneLER5TRect @ 6 NONAME
-	_ZN16CCalenController19CancelNotificationsEP25MCalenNotificationHandler @ 7 NONAME
-	_ZN16CCalenController21BroadcastNotificationE18TCalenNotification @ 8 NONAME
-	_ZN16CCalenController21ReleaseCustomisationsEv @ 9 NONAME
-	_ZN16CCalenController25ProcessCommandParametersLE11TApaCommandR4TBufILi256EERK6TDesC8 @ 10 NONAME
-	_ZN16CCalenController25RegisterForNotificationsLEP25MCalenNotificationHandler18TCalenNotification @ 11 NONAME
-	_ZN16CCalenController25RegisterForNotificationsLEP25MCalenNotificationHandlerR6RArrayI18TCalenNotificationE @ 12 NONAME
-	_ZN16CCalenController4NewLER13CAknViewAppUi @ 13 NONAME
-	_ZN16CCalenController7InfobarERK5TRect @ 14 NONAME
-	_ZN16CCalenController7InfobarEv @ 15 NONAME
-	_ZN16CCalenController7ReleaseEv @ 16 NONAME
-	_ZN16CCalenController9InstanceLEv @ 17 NONAME
-	_ZNK11CCalenIcons21CreateMonthViewIconsLEv @ 18 NONAME
-	_ZNK11CCalenIcons22CreateOutOfRangeIconsLEv @ 19 NONAME
-	_ZNK11CCalenIcons23CreateItemNotShownIconLEv @ 20 NONAME
-	_ZNK11CCalenIcons27CreateDayWeekToDoViewIconsLEv @ 21 NONAME
-	_ZNK11CCalenIcons8GetIconLEN14MCalenServices11TCalenIconsEi @ 22 NONAME
-	_ZTI11CCalenState @ 23 NONAME
-	_ZTI14CCalenActionUi @ 24 NONAME
-	_ZTI14CCalenMapState @ 25 NONAME
-	_ZTI14CCalenNotifier @ 26 NONAME
-	_ZTI15CCalenHelpState @ 27 NONAME
-	_ZTI15CCalenIdleState @ 28 NONAME
-	_ZTI15CDbColorPicture @ 29 NONAME
-	_ZTI16CCalenAlarmState @ 30 NONAME
-	_ZTI16CCalenController @ 31 NONAME
-	_ZTI17CCalenViewManager @ 32 NONAME
-	_ZTI18CCalenAlarmManager @ 33 NONAME
-	_ZTI18CCalenAttachmentUi @ 34 NONAME
-	_ZTI18CCalenEditingState @ 35 NONAME
-	_ZTI18CCalenExitingState @ 36 NONAME
-	_ZTI18CCalenMultipleDbUi @ 37 NONAME
-	_ZTI18CCalenSendingState @ 38 NONAME
-	_ZTI18CCalenStateMachine @ 39 NONAME
-	_ZTI18CCalenViewingState @ 40 NONAME
-	_ZTI19CCalenDeletingState @ 41 NONAME
-	_ZTI19CCalenPrintingState @ 42 NONAME
-	_ZTI19CCalenSettingsState @ 43 NONAME
-	_ZTI19CCalenViewPopulator @ 44 NONAME
-	_ZTI21CCalenAttachmentState @ 45 NONAME
-	_ZTI21CCalenBackgroundState @ 46 NONAME
-	_ZTI21CCalenCmdLineLauncher @ 47 NONAME
-	_ZTI21CCalenPopulationState @ 48 NONAME
-	_ZTI23CCalenAttaListItemArray @ 49 NONAME
-	_ZTI23CCalenMultipleDbManager @ 50 NONAME
-	_ZTI24CCalenAttachmentsListBox @ 51 NONAME
-	_ZTI26CCalenAttachmentItemDrawer @ 52 NONAME
-	_ZTI27CCalenViewAttachmentsDialog @ 53 NONAME
-	_ZTI28CCalenLocationActiveSelector @ 54 NONAME
-	_ZTI32CCalenCurrentLocationAcquisition @ 55 NONAME
-	_ZTV11CCalenState @ 56 NONAME
-	_ZTV14CCalenActionUi @ 57 NONAME
-	_ZTV14CCalenMapState @ 58 NONAME
-	_ZTV14CCalenNotifier @ 59 NONAME
-	_ZTV15CCalenHelpState @ 60 NONAME
-	_ZTV15CCalenIdleState @ 61 NONAME
-	_ZTV15CDbColorPicture @ 62 NONAME
-	_ZTV16CCalenAlarmState @ 63 NONAME
-	_ZTV16CCalenController @ 64 NONAME
-	_ZTV17CCalenViewManager @ 65 NONAME
-	_ZTV18CCalenAlarmManager @ 66 NONAME
-	_ZTV18CCalenAttachmentUi @ 67 NONAME
-	_ZTV18CCalenEditingState @ 68 NONAME
-	_ZTV18CCalenExitingState @ 69 NONAME
-	_ZTV18CCalenMultipleDbUi @ 70 NONAME
-	_ZTV18CCalenSendingState @ 71 NONAME
-	_ZTV18CCalenStateMachine @ 72 NONAME
-	_ZTV18CCalenViewingState @ 73 NONAME
-	_ZTV19CCalenDeletingState @ 74 NONAME
-	_ZTV19CCalenPrintingState @ 75 NONAME
-	_ZTV19CCalenSettingsState @ 76 NONAME
-	_ZTV19CCalenViewPopulator @ 77 NONAME
-	_ZTV21CCalenAttachmentState @ 78 NONAME
-	_ZTV21CCalenBackgroundState @ 79 NONAME
-	_ZTV21CCalenCmdLineLauncher @ 80 NONAME
-	_ZTV21CCalenPopulationState @ 81 NONAME
-	_ZTV23CCalenAttaListItemArray @ 82 NONAME
-	_ZTV23CCalenMultipleDbManager @ 83 NONAME
-	_ZTV24CCalenAttachmentsListBox @ 84 NONAME
-	_ZTV26CCalenAttachmentItemDrawer @ 85 NONAME
-	_ZTV27CCalenViewAttachmentsDialog @ 86 NONAME
-	_ZTV28CCalenLocationActiveSelector @ 87 NONAME
-	_ZTV32CCalenCurrentLocationAcquisition @ 88 NONAME
-	_ZThn4_N16CCalenController12NewServicesLEv @ 89 NONAME
+	_ZN16CCalenController10MainWindowEv @ 1 NONAME
+	_ZN16CCalenController11ViewManagerEv @ 2 NONAME
+	_ZN16CCalenController11eventFilterEP7QObjectP6QEvent @ 3 NONAME
+	_ZN16CCalenController11qt_metacallEN11QMetaObject4CallEiPPv @ 4 NONAME
+	_ZN16CCalenController11qt_metacastEPKc @ 5 NONAME
+	_ZN16CCalenController12InfobarTextLEv @ 6 NONAME
+	_ZN16CCalenController12NewServicesLEv @ 7 NONAME
+	_ZN16CCalenController12getFirstViewEv @ 8 NONAME
+	_ZN16CCalenController13IssueCommandLEi @ 9 NONAME
+	_ZN16CCalenController15agendaInterfaceEv @ 10 NONAME
+	_ZN16CCalenController16staticMetaObjectE @ 11 NONAME DATA 16
+	_ZN16CCalenController17SetDefaultContextEv @ 12 NONAME
+	_ZN16CCalenController18GetCommandHandlerLEi @ 13 NONAME
+	_ZN16CCalenController19CancelNotificationsEP25MCalenNotificationHandler @ 14 NONAME
+	_ZN16CCalenController19constructControllerEv @ 15 NONAME
+	_ZN16CCalenController19getStaticMetaObjectEv @ 16 NONAME
+	_ZN16CCalenController20CustomisationManagerEv @ 17 NONAME
+	_ZN16CCalenController21BroadcastNotificationE18TCalenNotification @ 18 NONAME
+	_ZN16CCalenController21ReleaseCustomisationsEv @ 19 NONAME
+	_ZN16CCalenController21checkMultipleCreationEv @ 20 NONAME
+	_ZN16CCalenController24handleServiceManagerSlotEiRK9QDateTime @ 21 NONAME
+	_ZN16CCalenController25RegisterForNotificationsLEP25MCalenNotificationHandler18TCalenNotification @ 22 NONAME
+	_ZN16CCalenController25RegisterForNotificationsLEP25MCalenNotificationHandlerR6RArrayI18TCalenNotificationE @ 23 NONAME
+	_ZN16CCalenController7InfobarEv @ 24 NONAME
+	_ZN16CCalenController7ReleaseEv @ 25 NONAME
+	_ZN16CCalenController7contextEv @ 26 NONAME
+	_ZN16CCalenController8NotifierEv @ 27 NONAME
+	_ZN16CCalenController8ServicesEv @ 28 NONAME
+	_ZN16CCalenController9InstanceLEv @ 29 NONAME
+	_ZN16CCalenController9OfferMenuEP6HbMenu @ 30 NONAME
+	_ZN16CCalenControllerC1Ev @ 31 NONAME
+	_ZN16CCalenControllerC2Ev @ 32 NONAME
+	_ZN16CCalenControllerD0Ev @ 33 NONAME
+	_ZN16CCalenControllerD1Ev @ 34 NONAME
+	_ZN16CCalenControllerD2Ev @ 35 NONAME
+	_ZNK16CCalenController10metaObjectEv @ 36 NONAME
+	_ZTI16CCalenController @ 37 NONAME
+	_ZTV16CCalenController @ 38 NONAME
+	_ZThn8_N16CCalenController12NewServicesLEv @ 39 NONAME
+	_ZN16CCalenController12emitAppReadyEv @ 40 NONAME
+	_ZN16CCalenController8appReadyEv @ 41 NONAME
+	_ZN16CCalenController11raiseWindowEv @ 42 NONAME