diff -r a3cb48f6c889 -r 1881ad52dc45 calendarui/controller/src/calenviewmanager.cpp --- a/calendarui/controller/src/calenviewmanager.cpp Wed Aug 25 14:02:13 2010 +0530 +++ b/calendarui/controller/src/calenviewmanager.cpp Tue Aug 31 18:15:13 2010 +0530 @@ -258,6 +258,9 @@ Q_ASSERT_X(mCalenMonthView, "calenviewmanager.cpp", "Unable to load calenMonth view"); + // Set the parent to delete the view once will exit the application + mCalenMonthView->setParent(this); + // Setup the month view. mCalenMonthView->setupView(mMonthViewDocLoader); @@ -290,6 +293,9 @@ qFatal("calenviewmanager.cpp : Unable to find agenda view"); } + // Set the parent to delete the view once will exit the application + mCalenAgendaView->setParent(this); + // Setup the agenda view mCalenAgendaView->setupView(mAgendaViewDocLoader); @@ -326,6 +332,9 @@ qFatal("calenviewmanager.cpp : Unable to find day view"); } + // Set the parent to delete the view once will exit the application + mCalenDayView->setParent(this); + // Set up the day view - day view takes the ownership mCalenDayView->setupView(docLoader); } @@ -689,6 +698,9 @@ qFatal("calenviewmanager.cpp : Unable to find alternate agenda view"); } + // Set the parent to delete the view once will exit the application + mCalenAgendaViewAlt->setParent(this); + // Setup the agenda view mCalenAgendaViewAlt->setupView(mAgendaViewAltDocLoader); OstTraceFunctionExit0( CALENVIEWMANAGER_LOADALTERNATEAGENDAVIEW_EXIT ); @@ -952,6 +964,9 @@ else if (mCalenAgendaView && currentview == mCalenAgendaView) { mCalenAgendaView->doPopulation(); } + else if (mCalenDayView && currentview == mCalenDayView) { + mCalenDayView->doPopulation(); + } // Calls the emitAppReady function of CalenController. Need to emit this // signal after the view is fully constructed & populated // with actual data and ready to be used. So entry view & instance view